Browse Source

Merge remote-tracking branch 'upstream/master'

Netuttki 2 years ago
parent
commit
662a23427e

+ 1 - 0
glife.qproj

@@ -780,6 +780,7 @@
 		<Location name="city_library"/>
 		<Location name="fit"/>
 		<Location name="talent_agency"/>
+		<Location name="casting"/>
 		<Location name="tatiana_lab"/>
 		<Location name="tatiana_missions"/>
 		<Location name="alexandriaHome"/>

+ 12 - 7
locations/city_market.qsrc

@@ -248,19 +248,24 @@ if $ARGS[0] = 'tailor':
 			'"So <<$pcs_nickname>>. Do you need any clothing adjusted?"'
 
 			if money >= 500:
-				act 'Take in the clothes you are wearing (500 <b>₽</b>)':
-					cla
-					*clr
-					minut += 15
+				act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
+					*clr & cla
+					minut += 10
 					if CloStyle = 5 or $clothingworntype = 'danilovich_outfits':
-						'"What are you wasting my time for? This does not need to be resized!"'
+						'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
+					elseif dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') = pcs_hips:
+						'The tailor is looking irritatingly at you, "Is this joke? Your clothes could not fit you better if they had been made for you. I have no time for such foolishness."'
+					elseif (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') > pcs_hips + 4) or (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') < pcs_hips - 4):
+						'The tailor is looking irritatingly at you, "Why are you wasting my time? Your clothing does not need to be resized. It might not be perfect but it is still fine."'
 					else
 						money -= 500
 						dynamic '<<$clothingworntype>>_b[<<clothingwornnumber>>] = pcs_hips'
-						'You undress and give your clothes to Jacob. Fifteen minutes pass before he returns.'
+						'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment.'
+						'Jacob quickly measures your waist and hips, then only takes a few minutes to adjust your outfit.'
+						'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
 					end
 
-					act 'Leave': minut += 10 & gt 'city_residential'
+					act 'Continue': minut += 10 & gt 'city_market', 'tailor'
 				end
 
 				act 'Take in different clothes':gt 'clothing', 'view_clothing_list', 'resize'

+ 1 - 0
locations/city_nightclub.qsrc

@@ -172,6 +172,7 @@ if $ARGS[0] = 'inside':
 
 	if (hour < 1 or hour >= 18) and clubwork = 1:
 		act 'Find Erik for work':
+			menu_off = 1
 			*clr & cla
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'

+ 1 - 1
locations/clothing_descriptions.qsrc

@@ -174,7 +174,7 @@ elseif CloSkirtShortness > 0:
 	elseif CloSkirtShortness = 2:
 		$description += ' and a knee-length skirt.'
 	elseif CloSkirtShortness = 3:
-		$description += ' and a fairly standard skirt.'
+		$description += ' and an above knee length skirt.'
 	elseif CloSkirtShortness = 4:
 		$description += ' and a rather short skirt.'
 	elseif CloSkirtShortness = 5:

+ 1 - 1
locations/cum_call.qsrc

@@ -4,7 +4,7 @@
 'labia' - 'pantyfront' - 'anus' - 'butt' - 'pantyrear' - 'clothes_hidden' - 'clothes' - 'back' - 'legs'
 'arms' - 'face' - 'mouth' - 'hands' - 'stomach' - 'breasts' - 'hair' - 'internalcondom' - 'precum' - 'mouth_swallow'
 	'precum' - is for whenever Sveta has unprotected vaginal sex. It will automatically set the volume to 1.
-	'mouth_swallow' does the same as mouth but increaments swallow for the cum eater trait
+	'mouth_swallow' does the same as mouth but increments swallow for the cum eater trait
 	'feet' redirects to 'legs'
 	'anal' redirects to 'anus' (prevents further errors)
 $ARGS[1] is for the name of the sexual partner

+ 67 - 65
locations/din_bad.qsrc

@@ -1,81 +1,83 @@
 # din_bad
 !2021/05/02
 $mobile_check = {
-	gs 'stat'
-	if vladimirday ! daystart and hour >= 15 and hour <= 17:
-		if vladimirQW = 20:
-			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
-			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-		elseif vladimirQW = 25 and week = 6:
+	if menu_off = 0:
+		gs 'stat'
+		if vladimirday ! daystart and hour >= 15 and hour <= 17:
+			if vladimirQW = 20:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			elseif vladimirQW = 25 and week = 6:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			elseif vladimirQW = 35 and week = 6:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			end
+		end
+
+		if leonidSlaveDay = daystart and hour >= 6 and hour <= 10 and leonidVisit = 0:
 			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
+			$caller = 'Leonid Vostov'
+			$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-		elseif vladimirQW = 35 and week = 6:
+			pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+		end
+
+		if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
 			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
+			$caller = 'Margaret'
+			$callerid = ''
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:qwdogiventday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 		end
-	end
 
-	if leonidSlaveDay = daystart and hour >= 6 and hour <= 10 and leonidVisit = 0:
-		'<b><font color="red">Your phone is ringing</font></b>'
-		$caller = 'Leonid Vostov'
-		$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
-		gs 'telefon','phone_ring'
-		pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-	end
-
-	if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
-		'<b><font color="red">Your phone is ringing</font></b>'
-		$caller = 'Margaret'
-		$callerid = ''
-		gs 'telefon','phone_ring'
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:qwdogiventday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-	end
-
-	!! iterating all lovers
-	lover_number = 0
-	:loverloop
-	if pcs_lovers[lover_number] = 1 and loverday[lover_number] ! daystart and hour > 5 and hour < 20 and ringA = 0 and rand(1,7) > 5:
-		if pcs_apprnc < vneshlover[lover_number]:
-			loverrelation[lover_number] -= 1
-			if loverrelation[lover_number] = 0:
-				'<b><font color="red">Your lover hasn''t been calling you lately, they''ve probably grown tired of you.</font></b>'
+		!! iterating all lovers
+		lover_number = 0
+		:loverloop
+		if pcs_lovers[lover_number] = 1 and loverday[lover_number] ! daystart and hour > 5 and hour < 20 and ringA = 0 and rand(1,7) > 5:
+			if pcs_apprnc < vneshlover[lover_number]:
+				loverrelation[lover_number] -= 1
+				if loverrelation[lover_number] = 0:
+					'<b><font color="red">Your lover hasn''t been calling you lately, they''ve probably grown tired of you.</font></b>'
+				else
+					'Your lover <<$loverdesc[lover_number]>> has not called you.'
+				end
 			else
-				'Your lover <<$loverdesc[lover_number]>> has not called you.'
+				ring = 1
+				ringA = 1
+				'<b><font color="red">Your phone is ringing</font></b>'
+				PLAY 'sound/old_phone.mp3',30
+				$caller = '<<$loverdesc[lover_number]>>'
+				$callerid = 'images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 			end
-		else
-			ring = 1
-			ringA = 1
-			'<b><font color="red">Your phone is ringing</font></b>'
-			PLAY 'sound/old_phone.mp3',30
-			$caller = '<<$loverdesc[lover_number]>>'
-			$callerid = 'images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg'
-			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 		end
-	end
-	lover_number += 1
-	if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
+		lover_number += 1
+		if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
 
-	killvar 'lover_number'
+		killvar 'lover_number'
+	end
 }
 
 $d_salf = {

+ 3 - 2
locations/gschool_events1.qsrc

@@ -199,6 +199,7 @@ if $ARGS[0] = 'butt_grab':
 				act 'Take his cock out of his pants': gt 'gschool_sex', 'rand_bj'
 			end
 			act 'Take him to the old school building':
+				*clr & cla
 				grupvalue[1] -= 5
 				grupvalue[2] -= 5
 				grupvalue[3] -= 5
@@ -218,7 +219,7 @@ if $ARGS[0] = 'butt_grab':
 					grupvalue[4] -= 1
 					gs 'fame', 'pav', 'sex', 5
 					gs 'npc_relationship', 'modify', 'A8', 'love'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/kiss.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
 					'You remember the back room that Katja showed you. When you tell Svyatoslav about it, he takes your hand and tells you to take him there. As soon as you close the door behind you, Svyatoslav pounces on you and begins to kiss you.'
 					gs 'arousal', 'kiss', 2
 					gs 'stat'
@@ -371,7 +372,7 @@ if $ARGS[0] = 'butt_grab':
 					grupvalue[3] -= 5
 					gs 'fame', 'pav', 'sex', 5
 					gs 'npc_relationship', 'modify', 'A6', 'like'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/kiss.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss.jpg"></center>'
 					'You remember the back room that Katja showed you. You take Petka by the hand and lead him off, you can feel his sweaty palm, you can tell he is nervous. As soon as you close the door you turn towards him and start to kiss him. He shy and awkward at first but then starts to get into it, though he isn''t a very good kisser.'
 					gs 'arousal', 'kiss', 2
 					gs 'stat'

+ 3 - 5
locations/gschool_grounds.qsrc

@@ -349,11 +349,9 @@ if $ARGS[0] = 'sports':
 		act 'Go for a run (1 hour)':
 			*clr & cla
 			menu_off = 1
-			minut += 60
-			schoolrunday = daystart
-			fat -= rand(2, 7)
-			run_exp += rand(0, 2)
-			gs 'sweat', 'add', 20
+			gs 'exercise', 'tier1', 60, 'run_exp'
+			fat -= rand(0,4)
+			gs 'sweat', 'add', 5
 			gs 'stat'
 			if month > 2 and month < 9:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/runsummer.jpg"></center>'

+ 50 - 61
locations/gschool_sex.qsrc

@@ -119,85 +119,74 @@ if $ARGS[0] = 'afterschool':
 	menu_off = 1
 	gs 'boyStat', 'A3'
 	ivan_afterschool = 0
-	pcs_horny += 10
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/afterschool.jpg"></center>'
-	'You go back to where you and Katja made out with Ivan and find both of them already there talking. As soon as they see you, they both stop talking.'
-	'Katja has a suspicious grin on her face while you can already see the bulge of Ivan''s cock straining against his pants as he looks at you hungrily.'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan0.jpg"></center>'
+	'As school end you go and find Katja and the two of you head to the English classroom you told Ivan to meet you in. Once inside you close the door and take seats at the some of the desks and the two you start talking as you wait for Ivan to show up. As you wait Katja pulls out a small bottle of lube from her purse, which makes you both giggle.'
+	'It doesn''t take to long until the door opens and there is Ivan. He see''s the two of you and grins, he closes the door and strides over to the two of you. You can already see the bulge of Ivan''s cock straining against his pants as he looks at you both hungrily.'
 	*nl
-	'You can tell by Katja''s look that she planned something with Ivan and you find yourself eager to find out what it is as Katja waves you over. "Well what took you? We''ve been waiting for a few minutes, come on." Before you can even respond, she takes you both by the hand and leads you down the least used wing of the school to one of the classrooms that barely sees any activity.'
-	*nl
-	'Katja pulls you into the room as Ivan stops for a moment and looks back down the hall before coming in and closing the door.' 
+	'"Well what took you? We''ve been waiting for a few minutes, come on." Katja says to him.' 
 	act 'Continue':
 		*clr & cla
-		pcs_horny += 10
 		if dick > npc_throat['A14']: npc_throat['A14'] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/doublebj.jpg"></center>'
-		'You and Katja begin kissing and pulling each other''s clothes off and within moments, you''re both naked. Breaking your kiss, you both look at Ivan, cheek to cheek. He stands there with his <<dick>>cm <<$dick_girth>> cock in his hand, stroking it as he watches the two of you.'
-		*nl
-		'Katja wastes no time. She walks over to him, pulling you along, and drops to her knees in front of him. She pulls his pants the rest of the way off as you kneel down beside her.'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan1.jpg"></center>'
+		'Katja gets out of the desk as Ivan stops next to the two of you, she drops down to her knees and starts unzipping his pants. You quickly join her, just in time to see his <<dick>>cm <<$dick_girth>> cock spring free, Katja starts stroking it once, as he looks down at the two of you.'
 		*nl
-		'She pulls his hand away and takes his <<dick>>cm <<$dick_girth>> cock into her mouth. He moans at once, even louder once she starts sucking him off, quickly offering you a turn. Licking your lips, you take Ivan''s cock into your mouth as well.'
-		'The two of you trade his cock back and forth between you.'
-		gs 'arousal', 'bj', 10, 'group'
-		act 'Katja wants more':
+		'She takes his cock into her mouth. He moans at once, even louder once she starts sucking him off, quickly offering you a turn. Licking your lips, you take Ivan''s cock into your mouth as well. The two of you trade his cock back and forth between you.'
+		gs 'arousal', 'bj', 3, 'group'
+		gs 'stat'
+		act 'Ivan fucks you':
 			*clr & cla
-			pcs_horny += 10
-			if npc_vag['A14'] < dick: npc_vag['A14'] += 1
-			if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/cowgirlmissionary.jpg"></center>'
-			'Pulling away from Ivan, Katja lays down on her back. She pulls you on top of her and you are straddling her face, looking down towards her legs. Her tongue immediately begins to lap at your pussy and you feel yourself getting wet.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan2.jpg"></center>'
+			'Pulling away from Ivan, Katja lays down on her back on the teachers desk, with her legs spread wide. Ivan gets the idea and pulls you up, shoving your face in her pussy. Your tongue immediately begins to lap at her pussy and you feel her getting wet.'
 			*nl
-			'She spreads and lifts her legs up, inviting Ivan in and he wastes no time. Lowering himself between her legs, he slides his <<dick>>cm <<$dick_girth>> dick into her pussy and starts fucking her. You and Ivan start kissing while he fucks Katja and her tongue teases your wet pussy.'
-			'You and Katja are both moaning in pleasure as Ivan looks into your eyes and says "I want to fuck you now."'
-			gs 'arousal', 'cuni', 10, 'group'
-			act 'Ivan fucks you':
+			'Ivan grabs the bottle of lube, lubing up his dick and rubbing some of it on your asshole, as you keep eating Katja out. He rubs the tip of his lubed dick against your butthole making it slippery, then he slides his <<dick>>cm <<$dick_girth>> dick into your ass and starts fucking your butt. Several minutes of this goes by, Ivan isn''t to rough, he adjust his speed and depth based on your moans, making it feel good the whole time. You and Katja are both moaning in pleasure as she looks into his eyes and says "I want you to fuck me now."'
+			gs 'arousal', 'cuni_give', 3, 'group', 'lesbian'
+			gs 'arousal', 'anal', -3, 'group'
+			gs 'stat'
+			act 'Ivan fucks Katja':
 				*clr & cla
-				pcs_horny += 10
+				if npc_ass['A14'] < dick: npc_ass['A14'] += 1
+				if npc_ass['A14']*2 < dick: npc_ass['A14'] += 1
+				if katjaQW['anal_quest'] = 2: katjaQW['anal_quest'] = 3
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/69doggy.jpg"></center>'
-				'Ivan pulls out of Katja and gets up. You lean forward and begin to lick Katja''s soaking wet pussy, your tongue easily sliding inside her in place of Ivan''s dick. Ivan walks around and kneels down behind you, near Katja''s head.'
-				'Within seconds, you feel Ivan''s <<dick>>cm <<$dick_girth>> cock slide inside your wet pussy and he starts pounding you balls deep as Katja sucks his balls. Ivan fucks you for several more minutes while you eat Katja out. Her body begins to convulse as she starts having an orgasm.'
-				'Hearing her cum, Ivan beings to grunt and pick up the pace.'
-				gs 'arousal', 'cuni_give', 10, 'group'
-				gs 'arousal', 'vaginal', 10, 'group'
-				minut -= 10
-				act 'Surprise':
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan3.jpg"></center>'
+				'Ivan pulls out of you and pulls you from Katja, then he slides her off the desk as he flips her over effortlessly, until she is facing away bent over the desk. You kneel down next to them and hold Katja''s butt cheeks apart as Ivan lubes up her butt, then wasting no time he slides his dick up her ass as well. She hisses a bit and then moans deeply in pleasure. He fucks her butt for several more minutes before he pulls out and says. "Both of you up on the desk, lay on your backs."'
+				gs 'arousal', 'voyeur_sex', 3, 'group'
+				gs 'stat'
+				act 'Get on the desk':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/anal.jpg"></center>'
-					'After her orgasm, Katja slides under you. You''re face to face and laying on her stomach, your breasts squeezed together, as she begins to kiss you.'
-					*nl
-					'Ivan starts to pant. It sounds like he is starting to get close himself. Katja reaches up with both her hands and grabs your ass, pulling your cheeks as far apart as she can. Grunting as he fucks you, Ivan understands the invitation.'
-				    'Pulling out of your pussy and slipping his <<dick>>cm <<$dick_girth>> cock into your ass, he hardly misses a beat. In a single stroke, he plunges his <<dick>>cm <<$dick_girth>> dick balls deep into your ass. You gasp and moan in a mixture of surprise, pain and pleasure.'
-					*nl
-					'Looking down at Katja, your eyes lock and you realize now this is what she and Ivan had been talking about when you approached them earlier. You begin to pant while rubbing your clit.'
-					'Katja slides out from under you, kneels down next to you and watches Ivan roughly hammer your ass. You begin to cry out as your body spasms in an intense orgasm.'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan4.jpg"></center>'
+					'You both climb on the desk laying on your backs side by side with your legs spread wide for Ivan. He walks up and you feel his <<dick>>cm <<$dick_girth>> cock slide back into your ass, he picks up the pace and starts fucking you a little harder and faster this time. You glance over and see Katja staring at him as he fucks your ass and rubbing her own clit. Ivan keeps looking to her as she plays with herself.'
 					anal_slip += 4
-					gs 'arousal', 'anal', 10, 'group'
-					gs 'arousal', 'vaginal', 10, 'group'
-					minut -= 10
+					gs 'arousal', 'anal', 3, 'group'
 					act 'Happy ending':
 						*clr & cla
-						katjaQW['slut'] += 2
-						katjaQW['Horny'] = 0
-						sexpartkno = 1
-						spafinloc = 12
-						gs 'cum_manage'
-						orgasm += 1
-						gs 'arousal', 'end'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan5.jpg"></center>'
+						'He suddenly pulls out of you, leaving your ass filling empty suddenly. Within seconds, Ivan''s shoves cock slide inside Katja''s gapping asshole, she moans loudly as he starts fucking her again. You reach over and start rubbing her clit as he keeps fucking her. Ivan fucks her for several more minutes while you rub Katja''s clit. Her body begins to convulse as she starts having an orgasm.'
+						'Hearing her cum, Ivan beings to grunt and pick up the pace. Ivan starts to pant. It sounds like he is starting to get close himself. Katja reaches up with both her hands and grabs your ass, pulling your cheeks as far apart as she can. Grunting as he fucks you, Ivan understands the invitation.'
+						gs 'arousal', 'voyeur_sex', 3, 'group'
+						gs 'arousal', 'vaginal_finger_give', -3, 'group', 'lesbian'
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katjacumkiss.jpg"></center>'
-						'Feeling you orgasm, Ivan redoubles his efforts and within minutes, he pulls out of you and begins shooting spurts of cum all over your ass and Katja''s face.'
-						'Ivan sits back on his heels, sweating as he catches his breath and watches Katja lick all his cum off your ass. Once she is done, you sit up next to her. Seeing the cum running down her face, you lean over and lick it up. You then kiss each other with your cum coated tongues, sharing Ivan''s sperm between you.'
-						'Watching this, Ivan only says one word. "Damn!"'
-						*nl
-						'You all start getting dressed and Ivan looks at the two of you. "Girls, we''ve got to do this again some time! What do you say?"'
-						'You look at each other and start giggling before Katja turns to look at him. "If you''re a good boy maybe. We''ll see." You both give him a look that promises, right or wrong, you want another go as badly as he does.'
-						'"I''m always good." he says with a laugh. He quickly finishes dressing and leaves, likely late for practice. Once he is gone, you and Katja look at each other and giggle, then leave as well.'
-						act 'Leave': gt 'gschool_grounds', 'main'
+						act 'Happy ending':
+							*clr & cla
+							katjaQW['slut'] += 2
+							katjaQW['Horny'] = 0
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/katja_ivan6.jpg"></center>'
+							'Ivan redoubles his efforts and within minutes, he pulls out of her ass. Katja slides off the desk first, you follow suit as he starts jerking off, soon you are both kneeling in front of him, just as he begins shooting spurts of cum all over your Katja''s tits and your own.'
+							'Once he finishes cumming Ivan sits in the teachers chair, sweating as he catches his breath and watches the two of you. Ivan only says one word. "Damn!"'
+							*nl
+							'You all start getting dressed and Ivan looks at the two of you. "Girls, we''ve got to do this again some time! What do you say?"'
+							'You look at each other and start giggling before Katja turns to look at him. "If you''re a good boy maybe. We''ll see." You both give him a look that promises, right or wrong, you want another go as badly as he does.'
+							'"I''m always good." he says with a laugh. He quickly finishes dressing and leaves, likely late for practice. Once he is gone, you and Katja look at each other and giggle, then leave as well.'
+							gs 'cum_call', 'breasts', 'A3', 1
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Leave': gt 'gschool_grounds', 'main'
+						end
 					end
 				end
 			end

+ 1 - 1
locations/intro_city.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = 'start':
 	pcs_sleep = 100
 	willpowermax = 100
 
-	gs 'set_home', 1 & gt 'korr'
+	gs 'set_home', 1
 	
 	gt 'intro_city', 'city_intro'
 end

+ 40 - 31
locations/intro_customization.qsrc

@@ -156,14 +156,14 @@ if $ARGS[0] = 'modrel_setup2':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
 	dynamic 'x = <<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 100 & gt ''intro_customization'', $loc_arg">100</a></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 100 & gt ''intro_customization'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modrel_setup3':
 	dynamic 'if <<$ARGS[1]>> < 50: <<$ARGS[1]>> = 50'
 	dynamic 'if <<$ARGS[1]>> > 200: <<$ARGS[1]>> = 200'
 	dynamic 'x = <<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/200)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 200 & gt ''intro_customization'', $loc_arg">200</a></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/200)</TD><TD><a href="exec:<<$ARGS[1]>> = 0 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> -= 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  += 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 200 & gt ''intro_customization'', $locM_arg">200</a></TD>'
 end
 
 !!Values reversed just for inhib use
@@ -171,31 +171,31 @@ if $ARGS[0] = 'modrel_setup4':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
 	dynamic 'x = 100-<<$ARGS[1]>>'
-	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''intro_customization'', $loc_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''intro_customization'', $loc_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $loc_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $loc_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''intro_customization'', $loc_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''intro_customization'', $loc_arg">100</a></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''intro_customization'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''intro_customization'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''intro_customization'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''intro_customization'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''intro_customization'', $locM_arg">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''intro_customization'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modite_cos':
-	$loc_arg = 'modite_cos'
+	$locM_arg = 'modite_cos'
 	'<center><b>Cosmetic items</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'kosmetica', 'Cosmetics'
 	gs 'intro_customization', 'modrel_setup2', 'stanok', 'Razors (number of shaves)'
 	gs 'intro_customization', 'modrel_setup2', 'krem', 'Sunblock'
 	gs 'intro_customization', 'modrel_setup2', 'hscrunch', 'Hair scrunchies'
 	gs 'intro_customization', 'modrel_setup2', 'hpingrip', 'Hair pins'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	!act 'Shampoo (<<shampoo>>/100)': gs 'intro_customization','setval3' & shampoo = nstat & gt 'intro_customization','modite_cos'
 	act 'Return': gt'intro_customization','modite'
 end
 
 if $ARGS[0] = 'modite_pha':
-	$loc_arg = 'modite_pha'
+	$locM_arg = 'modite_pha'
 	'<center><b>Pharmaceutical items</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'prezik', 'Condoms'
 	gs 'intro_customization', 'modrel_setup2', 'pregtest', 'Pregnancy tests'
 	gs 'intro_customization', 'modrel_setup2', 'tabletki', 'Birth control pills'
@@ -208,19 +208,22 @@ if $ARGS[0] = 'modite_pha':
 	gs 'intro_customization', 'modrel_setup2', 'fatdel', 'Weight loss pills'
 	gs 'intro_customization', 'modrel_setup2', 'tampon', 'Tampons'
 	gs 'intro_customization', 'modrel_setup2', 'sanpad', 'Sanitary napkins'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt'intro_customization','modite'
 end
 
 if $ARGS[0] = 'modite_mis':
-	$loc_arg = 'modite_mis'
+	$locM_arg = 'modite_mis'
 	'<center><b>Misc items</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'siga', 'Cigarettes'
 	gs 'intro_customization', 'modrel_setup2', 'dur', 'Cocaine'
 	gs 'intro_customization', 'modrel_setup2', 'pranik', 'Tea Biscuits'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_customization','modite'
 end
@@ -403,12 +406,10 @@ end
 
 if $ARGS[0] = 'modatt':
 	*clr & cla
-	$loc_arg = 'modatt'
+	$locM_arg = 'modatt'
 	'<center><b>Attributes</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
-	gs 'intro_customization', 'modrel_setup3', 'willpowermax', 'Willpower'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_stren', 'Strength'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_agil', 'Agility'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_vital', 'Endurance'
@@ -421,6 +422,9 @@ if $ARGS[0] = 'modatt':
 	gs 'intro_customization', 'modrel_setup2', 'pcs_grades', 'Grades'
 	gs 'intro_customization', 'modrel_setup4', 'pcs_inhib', 'Inhibition'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_heels', 'Heels'
+	gs 'intro_customization', 'modrel_setup3', 'willpowermax', 'Willpower'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -441,15 +445,16 @@ end
 
 if $ARGS[0] = 'modskl_men':
 	*clr & cla
-	$loc_arg = 'modskl_men'
+	$locM_arg = 'modskl_men'
 	'<center><b>Mental Skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	if MagikDostup = 0: gs 'intro_customization', 'modrel_setup2', 'pcs_splcstng', 'Spell Casting'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_humint', 'People skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_persuas', 'Persuasion'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_observ', 'Observation'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -460,11 +465,10 @@ end
 
 if $ARGS[0] = 'modskl_spo':
 	*clr & cla
-	$loc_arg = 'modskl_spo'
+	$locM_arg = 'modskl_spo'
 	'<center><b>Sport Skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_jab', 'Jabs'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_punch', 'Power Strikes'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_kick', 'Kicks'
@@ -478,6 +482,8 @@ if $ARGS[0] = 'modskl_spo':
 	gs 'intro_customization', 'modrel_setup2', 'pcs_chess', 'Chess'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_icesktng', 'Ice Skating'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_gaming', 'Gaming'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -488,17 +494,18 @@ end
 
 if $ARGS[0] = 'modskl_bea':
 	*clr & cla
-	$loc_arg = 'modskl_bea'
+	$locM_arg = 'modskl_bea'
 	'<center><b>Beauty skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_makupskl', 'Makeup Skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_danc', 'Modern Dancing'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_dancero', 'Erotic Dancing'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_dancpol', 'Pole Dancing'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_cheer', 'Cheerleading'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_mdlng', 'Modelling'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -509,16 +516,17 @@ end
 
 if $ARGS[0] = 'modskl_art':
 	*clr & cla
-	$loc_arg = 'modskl_art'
+	$locM_arg = 'modskl_art'
 	'<center><b>Artistic Skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_vokal', 'Singing'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_instrmusic', 'Instrumental Music'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_photoskl', 'Photography'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_artskls', 'Artistic Skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_perform', 'Performance'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 
@@ -529,17 +537,18 @@ end
 
 if $ARGS[0] = 'modskl_job':
 	*clr & cla
-	$loc_arg = 'modskl_job'
+	$locM_arg = 'modskl_job'
 	'<center><b>Job Skills</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_compskl', 'Computer Skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_comphckng', 'Hacking'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_hndiwrk', 'Handy-work'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_sewng', 'Tailoring'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_servng', 'Serving'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_medcn', 'Medicine'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display
 	'</table></center>'
 	nl
 

+ 33 - 27
locations/intro_sg_select_custom.qsrc

@@ -274,15 +274,14 @@ end
 if $ARGS[0] = 'modrel_setup':
 	if npc_rel['<<$ARGS[1]>>'] < 0: npc_rel['<<$ARGS[1]>>'] = 0
 	if npc_rel['<<$ARGS[1]>>'] > 100: npc_rel['<<$ARGS[1]>>'] = 100
-	'<TR bgcolor=#ffffff><TD><<$npc_firstname[''<<$ARGS[1]>>'']>> <<$npc_lastname[''<<$ARGS[1]>>'']>>: <<npc_rel[''<<$ARGS[1]>>'']>></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 0 & gt ''intro_sg_select_custom'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 10 & gt ''intro_sg_select_custom'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 5 & gt ''intro_sg_select_custom'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 5 & gt ''intro_sg_select_custom'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 10 & gt ''intro_sg_select_custom'', $locM_arg">plus 10</a></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 100 & gt ''intro_sg_select_custom'', $locM_arg">100</a></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD><<$npc_firstname[''<<$ARGS[1]>>'']>> <<$npc_lastname[''<<$ARGS[1]>>'']>>: <<npc_rel[''<<$ARGS[1]>>'']>></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 0 & gt ''intro_sg_select_custom'', $locM_arg">zero</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 10 & gt ''intro_sg_select_custom'', $locM_arg">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:npc_rel[''<<$ARGS[1]>>''] -= 5 & gt ''intro_sg_select_custom'', $locM_arg">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 5 & gt ''intro_sg_select_custom'', $locM_arg">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:npc_rel[''<<$ARGS[1]>>''] += 10 & gt ''intro_sg_select_custom'', $locM_arg">plus 10</a></TD><TD><a href="exec:npc_rel[''<<$ARGS[1]>>''] = 100 & gt ''intro_sg_select_custom'', $locM_arg">100</a></TD>'
 end
 
 if $ARGS[0] = 'modrel_pop':
 	$locM_arg = 'modrel_pop'
 	'<center><b>Popular kids relationship levels</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A1'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A4'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A14'
@@ -295,8 +294,10 @@ if $ARGS[0] = 'modrel_pop':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A25'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A139'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A140'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 1, nstat & gt ''intro_sg_select_custom'',''modrel_pop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 1, nstat & gt ''intro_sg_select_custom'',''modrel_pop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 1, nstat & gt ''intro_sg_select_custom'',''modrel_pop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 1, nstat & gt ''intro_sg_select_custom'',''modrel_pop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
 end
@@ -305,8 +306,7 @@ if $ARGS[0] = 'modrel_ath':
 	$locM_arg = 'modrel_ath'
 	'<center><b>Jocks relationship levels</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A3'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A5'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A8'
@@ -317,8 +317,10 @@ if $ARGS[0] = 'modrel_ath':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A149'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A150'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A141'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 2, nstat & gt ''intro_sg_select_custom'',''modrel_ath''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 2, nstat & gt ''intro_sg_select_custom'',''modrel_ath''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 2, nstat & gt ''intro_sg_select_custom'',''modrel_ath''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 2, nstat & gt ''intro_sg_select_custom'',''modrel_ath''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
 end
@@ -327,8 +329,7 @@ if $ARGS[0] = 'modrel_ner':
 	$locM_arg = 'modrel_ner'
 	'<center><b>Nerds relationship levels</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A2'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A6'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A12'
@@ -337,8 +338,10 @@ if $ARGS[0] = 'modrel_ner':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A152'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A153'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A142'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 3, nstat & gt ''intro_sg_select_custom'',''modrel_ner''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 3, nstat & gt ''intro_sg_select_custom'',''modrel_ner''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 3, nstat & gt ''intro_sg_select_custom'',''modrel_ner''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 3, nstat & gt ''intro_sg_select_custom'',''modrel_ner''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
 end
@@ -347,8 +350,7 @@ if $ARGS[0] = 'modrel_gop':
 	$locM_arg = 'modrel_gop'
 	'<center><b>Gopnik kids relationship levels</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A9'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A10'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A11'
@@ -363,8 +365,10 @@ if $ARGS[0] = 'modrel_gop':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A143'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A144'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A145'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 4, nstat & gt ''intro_sg_select_custom'',''modrel_gop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 4, nstat & gt ''intro_sg_select_custom'',''modrel_gop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 4, nstat & gt ''intro_sg_select_custom'',''modrel_gop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 4, nstat & gt ''intro_sg_select_custom'',''modrel_gop''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
 end
@@ -374,12 +378,13 @@ if $ARGS[0] = 'modrel_out':
 	$locM_arg = 'modrel_out'
 	'<center><b>Outcast kids relationship levels</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A7'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A159'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 5, nstat & gt ''intro_sg_select_custom'',''modrel_out''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-!!	'<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 5, nstat & gt ''intro_sg_select_custom'',''modrel_out''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all boys in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 5, nstat & gt ''intro_sg_select_custom'',''modrel_out''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+!!	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all girls in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 5, nstat & gt ''intro_sg_select_custom'',''modrel_out''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
 end
@@ -388,8 +393,7 @@ if $ARGS[0] = 'modrel_tea':
 	$locM_arg = 'modrel_tea'
 	'<center><b>Teacher relationship levels</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A26'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A128'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A129'
@@ -402,8 +406,10 @@ if $ARGS[0] = 'modrel_tea':
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A136'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A137'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A138'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all men in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 6, nstat & gt ''intro_sg_select_custom'',''modrel_tea''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
-	'<TR bgcolor=#ffffff><TD>Set relationship level for all women in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 6, nstat & gt ''intro_sg_select_custom'',''modrel_tea''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all men in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 0, 6, nstat & gt ''intro_sg_select_custom'',''modrel_tea''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display += '<TR bgcolor=#ffffff><TD>Set relationship level for all women in this group</TD><TD><a href="exec: gs ''intro_sg_select_custom'',''setval2'' & gs ''intro_sg_select_custom'', ''pol_grup_set'', 1, 6, nstat & gt ''intro_sg_select_custom'',''modrel_tea''">set value</a></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
+	$table_display
 	'</table></center>'
 	act 'Return': gt 'intro_sg_select_custom','modrel'
 end
@@ -412,10 +418,10 @@ if $ARGS[0] = 'modrel_oth':
 	$locM_arg = 'modrel_oth'
 	'<center><b>Others relationship levels</b></center>'
 	*nl
-	*nl
-	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
+	killvar '$table_display'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A69'
 	gs 'intro_sg_select_custom', 'modrel_setup', 'A112'
+	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
 	'</table></center>'
 	!!Volleyball Coach is here because it wasnt being controlled by grup6 the teachers/coaches.
 	act 'Return': gt 'intro_sg_select_custom','modrel'

+ 5 - 4
locations/intro_sg_tg.qsrc

@@ -461,15 +461,16 @@ if $ARGS[0] = 'intro_9':
 	fcolor = rgb (255, 255, 255)
 	
 	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/11.jpg"></center>'
-	'...'
+	'<center>...</center>'
 	wait 1500
 	*nl
-	'...'
+	'<center>...</center>'
 	wait 1500
 	*nl
-	'...'
+	'<center>...</center>'
 	wait 1500
-	'...'
+	*nl
+	'<center>...</center>'
 	wait 1500
 	*nl
 	'Darkness consumes your thoughts for some time. Eventually, images begin to form in your mind and you soon find yourself in the middle of a dream. The strange amulet stands before you and out of it comes a ghost of some sort. Before you even realize what you are doing, you find yourself staring deep into the ghost''s eyes, which turn into two Earths.'

+ 1 - 1
locations/katjaEvDin.qsrc

@@ -762,7 +762,7 @@ if $ARGS[0] = 'moron':
 		'Ivan shrugged, looking a little embarrassed. But it was obvious, he was pleased.'
 		act 'Thank Ivan':
 			*clr & cla
-			if npc_sex['A3'] = 1 and $loc ! 'pav_disco':
+			if npc_sex['A3'] > 0 and npc_sex['A14'] > 0 and $loc ! 'pav_disco' and katjaQW['slut'] >= 40 and katjaQW['Horny'] >= 40:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/whisper.jpg"></center>'
 				'Approaching Ivan, you raised up on tiptoe, and, clasping her arms round his neck, and kissed, and then whispered. "Like kissing girls?" Ivan only replied with a dumbfounded nodded, "Well, then we can show you our appreciation, right Katja?"'
 				'Katja, nods only half paying attention. Then it hit her what you said, she looked at Ivan, at you and her eyes lit up with lustful fire, "Right."'

+ 23 - 21
locations/katja_sex.qsrc

@@ -164,7 +164,7 @@ if $ARGS[0] = 'prohorov_sex':
 		'You pull Katja close and you begin to kiss each other, your tongues exploring each other''s mouths as your hands roam over each other''s bodies. You completely ignore Ivan.'
 		gs 'arousal', 'kiss', 1, 'lesbian'
 		gs 'stat'
-		if katjaQW['Horny'] >= 50:
+		if katjaQW['Horny'] >= 50 and katjaQW['slut'] >= 50:
 			act 'Kissing and more':
 				cls
 				katjaQW['Horny'] += 5
@@ -175,7 +175,7 @@ if $ARGS[0] = 'prohorov_sex':
 				gs 'arousal', 'foreplay_give', 2, 'lesbian'
 				minut -= 2
 				gs 'stat'
-				if katjaQW['Horny'] >= 60 and npc_sex['A14'] > 0:
+				if katjaQW['Horny'] >= 60 and katjaQW['slut'] >= 60:
 					act 'It''s getting hot':
 						katjaQW['Horny'] += 5
 						cla & *clr
@@ -191,7 +191,7 @@ if $ARGS[0] = 'prohorov_sex':
 								'You pull her face up to yours and the two of you start kissing again. While your hands caress each other''s breasts, Katja hooks one of her legs around yours and you become intertwined. You''re so distracted that you don''t even notice the heavy breathing coming from Ivan as he continues to watch.'
 								gs 'arousal', 'kiss', 1, 'lesbian'
 								gs 'stat'
-								if katjaQW['Horny'] >= 80 and katjaQW['QWstage'] = 6 and katjaQW['anal_quest'] = 2:
+								if katjaQW['Horny'] >= 80:
 									act 'Lift skirt':
 										cla
 										*clr
@@ -202,7 +202,7 @@ if $ARGS[0] = 'prohorov_sex':
 										gs 'stat'
 										
 										gs 'willpower', 'sex', 'resist', 'hard'
-										if will_cost <= pcs_willpwr:
+										if katjaQW['anal_quest'] < 2 or will_cost <= pcs_willpwr:
 											act 'Tell Ivan to just watch (<<will_cost>> Willpower)':
 												cla & *clr
 												gs 'willpower', 'pay', 'self'
@@ -219,24 +219,26 @@ if $ARGS[0] = 'prohorov_sex':
 											act 'Tell Ivan to just watch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end	
 										
-										act 'Encourage Ivan':
-											cls
-											ivan_afterschool = 1
-											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/letshavefun.jpg"></center>'
-											'Feeling Ivan''s finger rubbing your asshole, you reach back and put your hand on his ass, giving it a squeeze before pulling him up against you. You turn your head and begin to kiss him.'
-											'Katja quickly joins you and soon all three of you are kissing and fondling each other. At your encouragement, Ivan slips his finger into your ass, eliciting a moan of pleasure from you.'
-											'A few seconds later, the bell rings and you all break apart. "Meet me after school so we can continue this?" Ivan pleads as you and Katja get dressed.'
-											'You look at Ivan for a second and bite your lower lip in consideration. Turning to look at Katja, you find her looking at you and enthusiastically nodding. You can''t help but grin at her eagerness and nod as well.'
-											'Katja walks up to Ivan. "Meet us here after school and we''ll rock your world..." she says in a seductive tone and you watch as the biggest grin appears on his face. You turn to Katja and you both laugh as you all rush to class.'
+										if katjaQW['anal_quest'] > 1:
+											act 'Encourage Ivan':
+												cls
+												ivan_afterschool = 1
+												gs 'stat'
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/letshavefun.jpg"></center>'
+												'Feeling Ivan''s finger rubbing your asshole, you reach back and put your hand on his ass, giving it a squeeze before pulling him up against you. You turn your head and begin to kiss him.'
+												'Katja quickly joins you and soon all three of you are kissing and fondling each other. At your encouragement, Ivan slips his finger into your ass, eliciting a moan of pleasure from you.'
+												'A few seconds later, the bell rings and you all break apart. "Meet me after school so we can continue this?" Ivan pleads as you and Katja get dressed.'
+												'You look at Ivan for a second and bite your lower lip in consideration. Turning to look at Katja, you find her looking at you and enthusiastically nodding. You can''t help but grin at her eagerness and nod as well.'
+												'"Meet us in the English classroom after school" you tel Ivan.'+iif(katjaQW['anal_quest']  >= 3 and katjaQW['slut']  >= 100,  ' Katja walks up to Ivan. "Meet us here after school and we''ll rock your world..." she says in a seductive tone and you watch as the biggest grin appears on his face. You turn to Katja and you both laugh as you all rush to class.', ' You noticed that Katja''s face is getting completely red before you all rush to class.')
 											
-											gs 'arousal', 'anal_finger', 3
-											gs 'arousal', 'kiss', 3, 'lesbian'
-											gs 'arousal', 'kiss', 3
-											minut -= 3
-											gs 'arousal', 'end'
-											gs 'stat'
-											act 'Continue': gt 'gschool_lessons', 'short_break'
+												gs 'arousal', 'anal_finger', 3
+												gs 'arousal', 'kiss', 3, 'lesbian'
+												gs 'arousal', 'kiss', 3
+												minut -= 3
+												gs 'arousal', 'end'
+												gs 'stat'
+												act 'Continue': gt 'gschool_lessons', 'short_break'
+											end
 										end
 									end
 								else

+ 5 - 4
locations/pav_factory.qsrc

@@ -21,21 +21,22 @@ if $ARGS[0] = 'tailor':
 	if money >= 500:
 		act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
 			*clr & cla
-			minut += 15
+			minut += 10
 			if CloStyle = 5 or $clothingworntype = 'danilovich_outfits':
 				'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
 			elseif dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') = pcs_hips:
 				'The tailor is looking irritatingly at you, "Is this joke? Your clothes could not fit you better if they had been made for you. I have no time for such foolishness."'
-			elseif (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') > pcs_hips + 8) or (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') < pcs_hips - 8):
+			elseif (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') > pcs_hips + 4) or (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') < pcs_hips - 4):
 				'The tailor is looking irritatingly at you, "Why are you wasting my time? Your clothing does not need to be resized. It might not be perfect but it is still fine."'
 			else
 				money -= 500
 				dynamic '<<$clothingworntype>>_b[<<clothingwornnumber>>] = pcs_hips'
-				'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment. The tailor is fast and only takes fifteen minutes until your clothes are ready.'
+				'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment.'
+				'He quickly measures your waist and hips, then only takes a few minutes to adjust your outfit.'
 				'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
 			end
 
-			act 'Leave': minut += 5 & gt 'pav_industrial'
+			act 'Continue': gt 'pav_factory', 'tailor'
 		end
 
 		act 'Resize your other clothes':gt 'clothing', 'view_clothing_list', 'resize'

+ 2 - 2
locations/portnoi2.qsrc

@@ -430,9 +430,9 @@ elseif money >= poshvalldrop:
 end
 
 if $loc = 'pav_factory':
-	act 'Leave': gt 'pav_industrial'
+	act 'Continue': gt 'pav_factory', 'tailor'
 else
-	act 'Leave' :gt 'city_market', 'tailor'
+	act 'Continue' :gt 'city_market', 'tailor'
 end
 
 --- portnoi2 ---------------------------------

+ 1 - 1
locations/shop_nerdvana.qsrc

@@ -243,7 +243,7 @@ if $ARGS[0] = 'purses':
 	:loopnerdvana_purses
 		if nerdvana_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''purses2''"><img src="images/pc/items/nerdvana/purses/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 20:jump 'loopnerdvana_purses'
+	if i <= 40:jump 'loopnerdvana_purses'
 end
 
 if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'nerdvana',i, 2000

+ 1 - 1
locations/tobiQW.qsrc

@@ -148,7 +148,7 @@ if $ARGS[0] = '10':
 
 	if mid($start_type,1,4) = 'city':
 		act 'Get out of bed':gt 'bedr'
-	elseif mid($start_type,1,3) = 'uni':
+	elseif mid($start_type,1,3) = 'sg':
 		act 'Get out of bed':gt 'bedrPar'
 	else
 		act 'Get out of bed':gt 'uni_dorm', 'dorm_room'

+ 2 - 2
locations/traits.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'menu':
 	if trt_cumeater = 0 and cumeater_cheat = 0:
 		'You do not have this trait.'
 		'To gain this trait, you must swallow cum 10 times.'
-		'You have swallowed cum <<swallow>> times.'
+		'You have swallowed cum <<stat[''swallow'']>> times.'
 	elseif trt_cumeater = 0 and cumeater_cheat = 1:
 		'You do not have this trait.'
 	else
@@ -178,7 +178,7 @@ if $ARGS[0] = 'menu':
 end
 
 if $ARGS[0] = 'hourly':
-	if swallow >= 10 and trt_cumeater = 0 and cumeater_cheat = 0:
+	if stat['swallow'] >= 10 and trt_cumeater = 0 and cumeater_cheat = 0:
 		trt_cumeater = 1
 		msg 'You have gained the trait "Cumeater"'
 	end