Quellcode durchsuchen

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

bgkjdgbizgblzdgbr vor 2 Jahren
Ursprung
Commit
5982de1682

+ 67 - 7
locations/anushkachat.qsrc

@@ -150,12 +150,12 @@ if $ARGS[0] = 'chat':
 	if OluQW['tell'] = 1 and OluQW['nush_inv'] = 0:
 		act 'Invite to see Olu': gt 'anushkachat', 'invite_olu'
 	end
-	if npc_sex['A82'] > 0 and OluQW['tell'] = 1 and DjibrilQW['nush_inv'] = 0 and DjibrilQW['tell'] = 0:
-		act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril'
-	end
-!!check I did these correct
-	if npc_sex['A82'] > 0 and DjibrilQW['invite'] = 1 and DjibrilQW['tell'] = 0:
-		act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril'
+	if npc_sex['A82'] > 0 and DjibrilQW['invite'] = 0 and DjibrilQW['tell'] = 0:
+		if OluQW['tell'] = 1:
+			act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril'
+		else
+			act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril1'
+		end
 	end
 	if DjibrilQW['tell'] = 1 and DjibrilQW['nush_inv'] = 0:
 		act 'Invite to see Djibril': gt 'anushkachat', 'invite_djibril'
@@ -892,7 +892,7 @@ if $ARGS[0] = 'tell_about_djibril':
 	'She shoves you slightly. "Spill already, what about him?"'
 	'You shove her back slightly and grin. "Well I had sex with him too, he isn''t as big as his uncle. But lets just say, big dicks run in the family."'
 	'She bites her lower lip. "Damn black college boy with a big dick, I am so jealous right now, come on dish with the details."'
-	act 'Tell her about sex with him.':
+	act 'Tell her about sex with him':
 		*clr & cla
 		minut += 3
 		pcs_horny += 20
@@ -941,6 +941,66 @@ if $ARGS[0] = 'tell_about_djibril':
 	end
 end
 
+if $ARGS[0] = 'tell_about_djibril1':
+	*clr & cla
+	minut += 3
+	DjibrilQW['tell'] = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+	'You smile as you look at her like you have a big secret, which perks her interest. "Remember when I told you about Olu, my aunts boyfriend?" you tell her and she nods to that, arching a brow slightly, obviously curious where you are going with this.'
+	'"Well he has a nephew at the university in the city." You tell her, dragging this out.'
+	'She shoves you slightly. "Spill already, what about him?"'
+	'You shove her back slightly and grin. "Well I had sex with him and he has one of the biggest dicks I have ever seen, I mean just massive." Holding up your hands to show her roughly how big it is.'
+	'She bites her lower lip. "Damn black college boy with a big dick, I am so jealous right now, come on dish with the details."'
+	act 'Tell her about sex with him':
+		*clr & cla
+		minut += 3
+		pcs_horny += 20
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+		'You tell her about hooking up with him, she asks a few questions and you get pretty graphic and fairly worked up by your story, you can tell she does as well.'
+		'"Afterwards he game me a open invitation to come visit him in his dorm room." You tell her with a sly smile.'
+		'She grins. "Well have you?"'
+		if DjibrilQW['dorm_sex'] = 1:
+			act 'Yes':
+				*clr & cla
+				minut += 10
+				pcs_horny += 20
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+				'You nod your head. "Yeah, I did and ..."'
+				'"And what? Don''t leave me hanging." She says.'
+				'You laugh and blush a bit. "We hung out for a little while and then we started kissing..."'
+				'She looks like she is about to strangle you, when you keep trailing off. "And then?"'
+				*nl
+				'You tell her about it and get into some pretty graphic details at times. After you tell her about it you are feeling more than a bit turned on and you can see she is as well. Maybe you could invite her to come with you to his dorm room, you doubt Djibril would mind.'
+				act 'Hang out in her room': gt 'anushapt','anushroom'
+				act 'Talk about something else': gt 'anushapt', 'bed'
+				if DjibrilQW['nush_inv'] = 0:
+					act 'Ask her if she wants join in': gt 'anushkachat', 'invite_djibril'
+				end
+			end
+		end
+		act 'No':
+			*clr & cla
+			minut += 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
+			if npc_sex['A82'] > 0:
+				'You shake your head no. "No not yet, I want to... I think."'
+				'She rolls her eyes. "You think? You already hooked up with him, when you are in the city and feeling the itch go see him girl."'
+				'You nod. "Yeah I think I will." A thought occurs to you, maybe you could invite her to come with you, you are sure Djibril wouldn''t mind.'
+			else
+				'You shake your head no. "No not yet, I want to... I think."'
+				'She rolls her eyes. "You think? You find him attractive don''t you?" You nod your head, he is attractive. "Then what is there to think about? Next time you are in the city and are feeling the itch go see him girl. Go see him and let him scratch it for you."'
+				'You nod. "Yeah I think I will." You tell her.'
+			end
+			act 'Hang out in her room': gt 'anushapt','anushroom'
+			act 'Talk about something else': gt 'anushapt', 'bed'
+		end
+	end
+end
+
 if $ARGS[0] = 'invite_djibril':
 	*clr & cla
 	DjibrilQW['nush_inv'] = 1

+ 8 - 1
locations/arousal.qsrc

@@ -329,6 +329,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if temp_unaware = 0 or count['vaginal'] > 0:
 			if pcs_vag < dick:pcs_vag += 1
 			if pcs_vag*2 < dick:pcs_vag += 1
+		else
+			if pcs_vag < dick:pcs_hidden_vag += 1
+			if pcs_vag*2 < dick:pcs_hidden_vag += 1
 		end 
 		!! length and girth abilities of vagina are not separated , but I suppose that they are related
 		!! we can estimate difference in girth and length vaginal_girth_difference and vaginal_lenght_difference - names are shortened
@@ -365,7 +368,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 70
 		if pcs_vag + vaginal_slip < 30:
 			!! same as for 'vaginal'
-			if temp_unaware = 0 or count['vaginal'] > 0:pcs_vag += 3
+			if temp_unaware = 0 or count['vaginal'] > 0:
+				pcs_vag += 3
+			else
+				pcs_hidden_vag += 3
+			end
 			gs 'pain', 3 - vgape, 'vaginal', 'stretch'
 			if vgape < 3:vgape = 3
 		end

+ 30 - 27
locations/autosalonF.qsrc

@@ -11,34 +11,37 @@ if $ARGS[0] = 'start':
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
 	nl
-	'<b><center>List of vehicles for sale</center></b>'
+	'<b><center>Vehicles for sale, all brand new</center></b>'
 	nl
-	'<center><table border=0><TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> New. Price: 400,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''7''">WHA PRIORA</a>.</TD><TD> - </TD><TD> New. Price: 450,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''8''">Chevrolet NIVA</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''9''">UAZ HUNTER</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''10''">UAZ Patriot</a>.</TD><TD> - </TD><TD> New. Price: 600,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''13''">Ford Focus 2</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''102''">Renault LOGAN</a>.</TD><TD> - </TD><TD> New. Price: 700,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''110''">Ford Mondeo</a>.</TD><TD> - </TD><TD> New. Price: 850,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''104''">Toyota Celica</a>.</TD><TD> - </TD><TD> New. Price: 1,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''95''">Mitsubishi l200</a>.</TD><TD> - </TD><TD> New. Price: 1,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''103''">Toyota Corolla</a>.</TD><TD> - </TD><TD> New. Price: 1,100,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''105''">Mazda 6</a>.</TD><TD> - </TD><TD> New. Price: 1,200,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''106''">Mercedes-Benz E 212</a>.</TD><TD> - </TD><TD> New. Price: 1,700,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''109''">Audi A6</a>.</TD><TD> - </TD><TD> New. Price: 1,900,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''97''">Cadillac Escalade</a>.</TD><TD> - </TD><TD> New. Price: 2,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''101''">BMW Z4</a>.</TD><TD> - </TD><TD> New. Price: 3,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''107''">BMW M5</a>.</TD><TD> - </TD><TD> New. Price: 4,500,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''99''">BMW X6</a>.</TD><TD> - </TD><TD> New. Price: 4,500,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''96''">Audi Q7</a>.</TD><TD> - </TD><TD> New. Price: 5,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> New. Price: 5,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''108''">Jaguar XKR-S</a>.</TD><TD> - </TD><TD> New. Price: 7,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''100''">Mercedes-Benz S 600</a>.</TD><TD> - </TD><TD> New. Price: 8,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental gt</a>.</TD><TD> - </TD><TD> New. Price: 10,000,000 <b>₽</b></TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> New. Price: 20,000,000 <b>₽</b></TD></TR>'
-	'</TR></table>'
+	$car_table = '<center><table border=0>'
+	$car_table += '<TH>Car</TH><TH></TH><TH>Price in <b>₽</b></TH>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> 400,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''7''">WHA PRIORA</a>.</TD><TD> - </TD><TD> 450,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''8''">Chevrolet NIVA</a>.</TD><TD> - </TD><TD> 500,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''9''">UAZ HUNTER</a>.</TD><TD> - </TD><TD> 500,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''10''">UAZ Patriot</a>.</TD><TD> - </TD><TD> 600,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''13''">Ford Focus 2</a>.</TD><TD> - </TD><TD> 500,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''102''">Renault LOGAN</a>.</TD><TD> - </TD><TD> 700,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''110''">Ford Mondeo</a>.</TD><TD> - </TD><TD> 850,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''104''">Toyota Celica</a>.</TD><TD> - </TD><TD> 1,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''95''">Mitsubishi l200</a>.</TD><TD> - </TD><TD> 1,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''103''">Toyota Corolla</a>.</TD><TD> - </TD><TD> 1,100,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''105''">Mazda 6</a>.</TD><TD> - </TD><TD> 1,200,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''106''">Mercedes-Benz E 212</a>.</TD><TD> - </TD><TD> 1,700,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''109''">Audi A6</a>.</TD><TD> - </TD><TD> 1,900,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''97''">Cadillac Escalade</a>.</TD><TD> - </TD><TD> 2,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''101''">BMW Z4</a>.</TD><TD> - </TD><TD> 3,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''107''">BMW M5</a>.</TD><TD> - </TD><TD> 4,500,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''99''">BMW X6</a>.</TD><TD> - </TD><TD> 4,500,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''96''">Audi Q7</a>.</TD><TD> - </TD><TD> 5,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> 5,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''108''">Jaguar XKR-S</a>.</TD><TD> - </TD><TD> 7,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''100''">Mercedes-Benz S 600</a>.</TD><TD> - </TD><TD> 8,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental gt</a>.</TD><TD> - </TD><TD> 10,000,000 </TD>'
+	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> 20,000,000 </TD>'
+	$car_table += '</table></center>'
+	
+	$car_table
 
 	act 'Talk to the manager': gt 'autosalonF', 'manager1'
 	act 'Return': gt 'autotraidF', 'start'

+ 8 - 0
locations/body.qsrc

@@ -535,15 +535,23 @@ if $ARGS[0] = '':
 		end
 		if pcs_butt <= 4:
 			buttpic = 1
+			$pcs_butt_adj1 = 'flat ass'
+			$pcs_butt_adj2 = 'flat butt'
 			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank. It can be considered very masculine looking and isn''t very impressive.'
 		elseif pcs_butt <= 8: 
 			buttpic = 2
+			$pcs_butt_adj1 = 'ass'
+			$pcs_butt_adj2 = 'butt'
 			$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>. While it''s not flat, it''s nothing special either.'
 		elseif pcs_butt <= 12: 
 			buttpic = 3
+			$pcs_butt_adj1 = 'tight ass'
+			$pcs_butt_adj2 = 'nice ass'
 			$pcs_butt = 'Your tight <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is a little bigger, rounder and firmer than average. You often draw the stares of guys around you.'
 		elseif pcs_butt <= 16: 
 			buttpic = 4
+			$pcs_butt_adj1 = 'fat ass'
+			$pcs_butt_adj2 = 'bubble butt'
 			$pcs_butt = 'You have a large and natural bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk. Guys hungrily fixate on you with their tongues hanging out and other girls are often envious of your booty.'
         end
 		if silicone_butt > 0:

+ 2 - 2
locations/city_apt_building.qsrc

@@ -189,8 +189,8 @@ if $ARGS[0] = 'roof':
 					$lastwornpantytype['swim'] = $pantyworntype
 					lastwornpantynumber['swim'] = pantywornnumber
 					$lastwornbratype['swim'] = $braworntype
-					lastwornbranumber['swim'] = brawornnumbergs
-					'clothing', 'strip_all'
+					lastwornbranumber['swim'] = brawornnumber
+					gs 'clothing', 'strip_all'
 				else
 					gs 'clothing', 'strip_all'
 				end

+ 3 - 1
locations/clothing.qsrc

@@ -409,7 +409,9 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
+		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
+		end
 
 		i = 1
 		:loopschool

+ 2 - 2
locations/din_van.qsrc

@@ -72,7 +72,7 @@ $shower = {
 		menu_off = 1
 		*clr & cla
 		minut += 15
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or hotelShampoo = 1: noShampoo = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotelShampoo = 1: noShampoo = 1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -208,7 +208,7 @@ $bath = {
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
-		if $loc = 'vanrPar' or $loc = 'tanvanr' or hotelShampoo = 1: noShampoo = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotelShampoo = 1: noShampoo = 1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 

+ 27 - 5
locations/mirror.qsrc

@@ -161,7 +161,13 @@ if $ARGS[0] = 'start':
 			if dyefade > 0 and dyefade < 7: $serv['hdye']='Your hair dye is beginning to fade and your roots are showing.'
 			if dyefade = 0: $serv['hdye']='Your hair dye has faded and looks terrible.'
 		end
-		'<table cellspacing=0 cellpadding=0><tr><td><hr></td></tr><tr><td><<$serv["hhair"]>></td></tr><tr><td><<$serv["hbraids"]>></td></tr><tr><td><<$serv["hdye"]>></td></tr><tr><td><<$serv["ponytail desc"]>></td></tr><tr><td><<$serv["bun desc"]>></td></tr><tr><td><<$serv["pigtails desc"]>></td></tr><tr><td><<$serv["braid desc"]>></td></tr></table>'
+		if $serv['hhair'] ! ''			: '<<$serv["hhair"]>>'
+		if $serv['hbraids'] ! ''		: '<<$serv["hbraids"]>>'
+		if $serv['hdye'] ! ''			: '<<$serv["hdye"]>>'
+		if $serv['ponytail desc'] ! ''	: '<<$serv["ponytail desc"]>>'
+		if $serv['bun desc'] ! ''		: '<<$serv["bun desc"]>>'
+		if $serv['pigtails desc'] ! ''	: '<<$serv["pigtails desc"]>>'
+		if $serv['braid desc'] ! ''		: '<<$serv["braid desc"]>>'
 	else
 		if player_avatar = 1:
 			'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
@@ -612,12 +618,28 @@ if $ARGS[0] = 'brush':
 	*clr & cla
 	minut += 3
 	pcs_hairbsh = 1
-	if player_avatar = 1:
-		'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
+	if newstylemirror = 1:
+		$serv['noaction'] = '<img <<$set_imgh>> src="images/system/icons/action/blank.png">'
+		if player_avatar = 1:
+			$serv['avatar']='<img <<$set_imgh>> src="images/avatar.jpg">'
+		else
+			$serv['avatar']='<img <<$set_imgh>> src="<<FUNC(''$face_image'')>>">'
+		end
+		if $mirrorloc = 'mirror':
+			$serv['back']='<a href="exec: gt ''mirror'',''start''"><img src="images/system/icons/action/back.png"></a>'
+		else
+			$serv['back']='<a href="exec: gt ''mirror'',''fin''"><img src="images/system/icons/action/back.png"></a>'
+        end
+		'<center><table align=center cellspacing=0 cellpadding=0><tr><td align=center colspan=15><center><<$serv["avatar"]>></center></td></tr><tr><td colspan=15><hr></td></tr><tr><td colspan=10></td><td><<$serv["back"]>></td><td colspan=4></td></tr></table></center>'
+        killvar('$serv')
 	else
-		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+		if player_avatar = 1:
+			'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
+		end
+		'You brush your hair.'
 	end
-	'You brush your hair.'
 	if $mirrorloc = 'mirror':
 		act 'Finish': gt 'mirror', 'start'
 	else

+ 2 - 2
locations/moncheri.qsrc

@@ -117,7 +117,7 @@ if $ARGS[0] = 'gowns':
 
 	gs 'clothing_QV', 'shop_filter_header'
 
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
+	act 'Return': minut += 1 & gt 'moncheri', 'changingroom'
 
 	!!To filter just this set
 	clo_i = 0
@@ -167,7 +167,7 @@ if $ARGS[0] = 'dresses':
 
 	gs 'clothing_QV', 'shop_filter_header'
 
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
+	act 'Return': minut += 1 & gt 'moncheri', 'changingroom'
 
 	!!To filter just this set
 	clo_i = 0

+ 68 - 0
locations/npcstatic5.qsrc

@@ -750,6 +750,74 @@ npc_dick['A<<npctemp>>'] = 15
 npc_sexskill['A<<npctemp>>'] = 2
 npc_intel['A<<npctemp>>'] = 47
 
+npctemp = 249
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Filipp'
+$npc_nickname['A<<npctemp>>'] = 'Sir'
+$npc_lastname['A<<npctemp>>'] = 'Morozov'
+$npc_usedname['A<<npctemp>>'] = 'Mr. Morozov'
+$npc_notes['A<<npctemp>>'] = 'A man that <<pcs_firstname>> met at the gas station. You know nothing about him except that he is dressed like a business man.'
+npc_dob['A<<npctemp>>'] = 19820714
+npc_intel['A<<npctemp>>'] = 75
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'well proportioned'
+npc_dick['A<<npctemp>>'] = 19
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = 11000
+npc_haircol['A<<npctemp>>'] = 0
+
+npctemp = 250
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Gora'
+$npc_nickname['A<<npctemp>>'] = 'Sir'
+$npc_lastname['A<<npctemp>>'] = 'Zhukov'
+$npc_usedname['A<<npctemp>>'] = 'Mr. Zhukov'
+$npc_notes['A<<npctemp>>'] = 'A man that <<pcs_firstname>> met at the gas station. A fat and ugly man. His car is always a mess.'
+npc_dob['A<<npctemp>>'] = 19760323
+npc_intel['A<<npctemp>>'] = 35
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'thick'
+npc_dick['A<<npctemp>>'] = 14
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = 11000
+npc_haircol['A<<npctemp>>'] = 1
+
+npctemp = 251
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Pasha'
+$npc_nickname['A<<npctemp>>'] = 'Sir'
+$npc_lastname['A<<npctemp>>'] = 'Vorobev'
+$npc_usedname['A<<npctemp>>'] = 'Mr. Vorobev'
+$npc_notes['A<<npctemp>>'] = 'A man that <<pcs_firstname>> met at the gas station. A homeless man who can often be found dumpster diving by the gas station. It''s likely that he hasn''t washed in months or even years.'
+npc_dob['A<<npctemp>>'] = 19790603
+npc_intel['A<<npctemp>>'] = 25
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'massive'
+npc_dick['A<<npctemp>>'] = 20
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = 11000
+npc_haircol['A<<npctemp>>'] = 1
+
+npctemp = 252
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Osip'
+$npc_nickname['A<<npctemp>>'] = 'Sir'
+$npc_lastname['A<<npctemp>>'] = 'Kuznetsov'
+$npc_usedname['A<<npctemp>>'] = 'Mr. Kuznetsov'
+$npc_notes['A<<npctemp>>'] = 'A man that <<pcs_firstname>> met at the gas station. An older man. The first time they met, he was arguing with his wife.'
+npc_dob['A<<npctemp>>'] = 19520603
+npc_intel['A<<npctemp>>'] = 25
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'massive'
+npc_dick['A<<npctemp>>'] = 20
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = 11000
+npc_haircol['A<<npctemp>>'] = 1
+
 
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp

+ 11 - 11
locations/preCUST.qsrc

@@ -571,14 +571,14 @@ if $ARGS[0] = 'Done':
 		sportsclothingnumber = 15
 		gs 'clothing', 'wear', 'gm_dress', 149
 	end
-	if swim_start = 98:
-		danilovich_swimsuit[98] = 1
-		danilovich_swimsuit_h[98] = 60
-		danilovich_swimsuit_b[98] = pcs_hips
-	elseif swim_start = 69:
-		danilovich_swimsuit[69] = 1
-		danilovich_swimsuit_h[69] = 60
-		danilovich_swimsuit_b[69] = pcs_hips
+	if swim_start = 99:
+		allure_swimsuit[99] = 1
+		allure_swimsuit_h[99] = 60
+		allure_swimsuit_b[99] = pcs_hips
+	elseif swim_start = 1:
+		danilovich_swimsuit[1] = 1
+		danilovich_swimsuit_h[1] = 60
+		danilovich_swimsuit_b[1] = pcs_hips
 	end
 	
 !!setting default danilovich outfit and setting coats
@@ -640,9 +640,9 @@ if $ARGS[0] = 'Done':
 			gm_school[17] = 1
 			gm_school_h[17] = 120
 			gm_school_b[17] = pcs_hips
-			danilovich_outfits[4] = 1
-			danilovich_outfits_h[4] = 100			
-			sportsclothingnumber = 4
+			danilovich_outfits[65] = 1
+			danilovich_outfits_h[65] = 100			
+			sportsclothingnumber = 65
 			danilovich_shoe[17] = 1
 			danilovich_shoe[21] = 0
 		end

+ 2 - 2
locations/preSYS.qsrc

@@ -849,7 +849,7 @@ if $ARGS[0] = 'jock':
 	pcs_makupskl = 30
 	pcs_heels = 20
 	pcs_inhib = 20
-	swim_start = 69
+	swim_start = 1
 	pirsC = 1
 	PirsC1_owned = 1
 	$currentpursetype = 'fashionista'
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'cool':
 	pcs_danc = 10
 	pcs_persuas = 30
 	pcs_inhib = 20
-	swim_start = 98
+	swim_start = 99
 	kosmetica = 20
 	shampoo = 20
 	stanok = 20

+ 10 - 0
locations/purses.qsrc

@@ -91,6 +91,14 @@ if $ARGS[0] = 'view_purse_list':
 	i += 1
 	if i <= ARRSIZE('flamingos_purses'):jump 'loop_flamingos_purses'
 
+	'<center><img src="images/locations/city/island/nerdvana/shop_name.png"></center>'
+
+	i = 1
+	:loop_nerdvana_purses
+	if nerdvana_purses[i] = 1 and nerdvana_pursesS[i] = ploc:*p '<a href="exec:gt ''purses'', ''view_purse_item'',  ''<<$ARGS[1]>>'', ''nerdvana'', <<i>>"><img src="images/pc/items/nerdvana/purses/<<i>>.jpg" 	height="300" /></a>'
+	i += 1
+	if i <= ARRSIZE('nerdvana_purses'):jump 'loop_nerdvana_purses'
+
 	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
@@ -229,6 +237,8 @@ if $ARGS[0] = 'descriptions':
 		'A sports bag for all your junk. Practical and durable but not fashionable'
 	elseif $ARGS[1] = 'fashionista':
 		'A stylish handbag for any fashion-forward female!'
+	elseif $ARGS[1] = 'nerdvana':
+		'For the geek inside you.'
 	elseif $ARGS[1] = 'gm':
 		'A functional, if not too fashionable, handbag for carrying all of the essentials.'
 	elseif $ARGS[1] = 'cats':

+ 2 - 2
locations/saveg.qsrc

@@ -15,7 +15,7 @@
 
 version_major = 0
 version_minor = 8
-version_revision = 4
-version_patch = 3
+version_revision = 5
+version_patch = 1
 --- saveg ---------------------------------
 

+ 23 - 0
locations/saveupdater.qsrc

@@ -1346,6 +1346,29 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if flag_start_parc > 0: katjaQW['school_kiss'] = flag_start_parc & killvar 'flag_start_parc'
 
 end
+
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080500:
+	if $loc = 'dorm': $loc = 'uni_dorm' & $menu_loc = 'uni_dorm'
+	if $loc = 'HotelWork': $loc = 'hotel_work' & $menu_loc = 'hotel_work'
+	if $loc = 'ParChurch': $loc = 'pav_church' & $menu_loc = 'pav_church'
+	if $loc = 'pav_train': $loc = 'pav_market' & $menu_loc = 'pav_market'
+	if $loc = 'univer': $loc = 'uni_admin' & $menu_loc = 'uni_admin'
+	if $loc='youplace': $loc = 'city_mansion_entrance' & $menu_loc = 'city_mansion_entrance'
+	if $loc='ykamin':   $loc ='city_mansion_residence_2' & $loc_arg='ylounge'   & $menu_loc ='city_mansion_residence_2' & $menu_arg='ylounge'
+	if $loc='ykuh':     $loc ='city_mansion_residence_1' & $loc_arg='ykitchen'  & $menu_loc ='city_mansion_residence_1' & $menu_arg='ykitchen'
+	if $loc='ydet':     $loc ='city_mansion_residence_2' & $loc_arg='ynursery'  & $menu_loc ='city_mansion_residence_2' & $menu_arg='ynursery'
+	if $loc='ybib':     $loc ='city_mansion_residence_2' & $loc_arg='ylibrary'  & $menu_loc ='city_mansion_residence_2' & $menu_arg='ylibrary'
+	if $loc='ybedr':    $loc ='city_mansion_residence_1' & $loc_arg='ybedroom'  & $menu_loc ='city_mansion_residence_1' & $menu_arg='ybedroom'
+	if $loc='ybass':    $loc ='city_mansion_residence_3' & $loc_arg='ypool'     & $menu_loc ='city_mansion_residence_3' & $menu_arg='ypool'
+	if $loc='yban':     $loc ='city_mansion_residence_3' & $loc_arg='ysauna'    & $menu_loc ='city_mansion_residence_3' & $menu_arg='ysauna'
+	if $loc='yvan':     $loc ='city_mansion_residence_1' & $loc_arg='ybathroom' & $menu_loc ='city_mansion_residence_1' & $menu_arg='ybathroom'
+	if $loc='ymans':    $loc ='city_mansion_residence_1' & $loc_arg='yfoyer'    & $menu_loc ='city_mansion_residence_1' & $menu_arg='yfoyer'
+	if $loc='yzal':     $loc ='city_mansion_residence_2' & $loc_arg='yliving'   & $menu_loc ='city_mansion_residence_2' & $menu_arg='yliving'
+	if $loc='ysport':   $loc ='city_mansion_residence_3' & $loc_arg='ygym'      & $menu_loc ='city_mansion_residence_3' & $menu_arg='ygym'
+	if $loc='ykabinet': $loc ='city_mansion_residence_2' & $loc_arg='yoffice'   & $menu_loc ='city_mansion_residence_2' & $menu_arg='yoffice'
+end
+
+
 if mod_list > 0:
 	mod_i=1
 	:mod_data_updater

+ 23 - 0
locations/shop_nerdvana.qsrc

@@ -26,6 +26,8 @@ if $ARGS[0] = 'start':
 	act 'View swimsuits': minut += 5 & gt 'shop_nerdvana', 'swim'
 
 	act 'View bikinis': minut += 5 & gt 'shop_nerdvana', 'bikinis'
+
+	act 'View purses': minut += 5 & gt 'shop_nerdvana', 'purses'
 end
 
 if $ARGS[0] = 'cosplay':
@@ -225,6 +227,27 @@ end
 
 if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'nerdvana_bikinis',i, 1750, 'shop'
 
+if $ARGS[0] = 'purses':
+	$loc_arg = 'purses'
+	$loc = 'shop_nerdvana'
+	$menu_loc = 'shop_nerdvana'
+	$menu_arg = 'purses'
+	menu_off = 0
+	*clr & cla
+	gs'stat'
+
+	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
+
+	i = 1
+
+	: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'
+end
+
+if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'nerdvana',i, 2000
+
 
 --- shop_nerdvana ---------------------------------
 

+ 1 - 1
locations/start.qsrc

@@ -18,7 +18,7 @@ $fname = 'Tahoma'
 fsize = 12
 gs 'saveg'
 gs 'addbuilddate'
-$version = '<<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>> built on <<$builddate>> for "The we just blamed each other for everything so who knows how it worked out version."'
+$version = '<<version_major>>.<<version_minor>>.<<version_revision>>.<<version_patch>> built on <<$builddate>> for "The finally got the uni started version."'
 opPRE = 1
 
 *nl

+ 2 - 2
locations/stol.qsrc

@@ -409,7 +409,7 @@ if $args[0] = 'studying':
 	else
 		'You study for half an hour, and you think you understand everything that is covered this week'
 	end
-	act 'Get up from you desk': gt 'stol', '<<$ARGS[3]>>'
+	act 'Get up from your desk': gt 'stol', '<<$ARGS[3]>>'
 end
 
 if $ARGS[0] = 'studying_exam':
@@ -492,7 +492,7 @@ if $ARGS[0] = 'studying_exam':
 	killvar 'study_mod'
 	killvar 'nod_study'
 
-	act 'Get up from you desk': gt 'stol', '<<$ARGS[3]>>'
+	act 'Get up from your desk': gt 'stol', '<<$ARGS[3]>>'
 end
 --- stol ---------------------------------
 

+ 195 - 27
locations/therapist.qsrc

@@ -39,6 +39,8 @@ if $ARGS[0] = 'hypnoGreet':
 				'"I''m sorry Dr. Pavlov... I don''t know what I was thinking. I-"'
 				'He interupts you and commands you to strip off your panties and hand them to him.'
 				act 'Give Dr. Pavlov your panties':
+					cla
+					*clr
 					'<center><img src="images/locations/pavlovsk/clinic/therapist/removePanties.jpg"></center>'
 					gs 'panties', 'dispose'
 
@@ -75,7 +77,7 @@ if $ARGS[0] = 'hypnoGreet':
 			act 'Lift your skirt for Dr. Pavlov':
 				cla
 				*clr
-				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/showPanties.mp4"></video></center>'
+				'<center><img src="images/locations/pavlovsk/clinic/therapist/showPanties.jpg"></center>'
 				'"Miss <<$pcs_lastname>>, what is this?"'
 				'"I''m sorry Dr. Pavlov... I don''t know what I was thinking. I-"'
 				'He interupts you and commands you to strip off your panties and hand them to him.'
@@ -912,7 +914,7 @@ if $ARGS[0] = 'thirdHypnoStage':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
-					'"Great. <font color=brown>Any time you see my cock, you will become horny and your pussy will become wet like a bitch in heat. In addition, my cum will taste and smell pleasant. Both the tast and smell will make you horny. These will happen even when you are awake, but you won''t think anything is wrong with these feelings.</font> Understand, <i>Cunt</i>?"'
+					'"Great. <font color=brown>Any time you see my cock, you will become horny and your pussy will become wet like a bitch in heat. In addition, my cum will taste and smell pleasant. Both the taste and smell will make you horny. These will happen even when you are awake, but you won''t think anything is wrong with these feelings.</font> Understand, <i>Cunt</i>?"'
 					act '"Yes, <i>Master</i>."':
 						cla
 						*clr
@@ -1078,7 +1080,7 @@ if $ARGS[0] = 'hypnoResist':
 	if sound = 0:PLAY 'sound/rainstorm.mp3',20 & PLAY 'sound/clock.mp3',40
 	'<font color=brown>'
 	if hypnoTimesResistedStage = 0:
-		'Your body tenses, and you shake your head as you reject Dr. Pavlov''s suggestion to <<$ARGS[1]>>. Seeing that you might awaken, he quickly tells you to forget the idea of undressing. As the suggestion fades from your memory, you once again relax.'
+		'Your body tenses, and you shake your head as you reject Dr. Pavlov''s suggestion to <<$ARGS[1]>>. Seeing that you might awaken, he quickly tells you to forget the command he gave you. As the suggestion fades from your memory, you once again relax.'
 		'"Hmmm," Dr. Pavlov muses, "Your will is quite strong, it may take some time to break you - but you will break."'
 	elseif hypnoTimesResistedStage = 1:
 		'Your body tenses, and you frown as you resist Dr. Pavlov''s suggestion to <<$ARGS[1]>>. The doctor frowns but orders you to forget the idea, for now. You relax as you comply with his order to forget.'
@@ -1763,7 +1765,7 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
 		''
-		'Now that I''ve sufficiently broken your resistence, it''s time we set you up on a more regular schedule. <font color=brown>"From now on, you will feel that you <b>need</b> my hypnotism treatment. You believe that you have scheduled therapy sessions every day at 18:00.</font>. Understand, <i>Cunt</i>?"'
+		'Now that I''ve sufficiently broken your resistence, it''s time we set you up on a more regular schedule. <font color=brown>"From now on, you will feel that you <b>need</b> my hypnotism treatment. You believe that you have scheduled therapy sessions every day at 18:00. You can come before that time, but you have to be here by at least 18:00 or you will feel terrible.</font>. Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		''
 		hypnoSchedule = 1
@@ -1775,6 +1777,12 @@ if $ARGS[0] = 'hypnoRandom':
 		*clr
 		hypnoRandomCounter = 0
 		therapistFuckedPussyStage += 1
+		pillsleft[0] = 0
+		pillsleft[1] = 0
+		pillsleft[2] = 0
+		pillsleft[3] = 0
+		pillsleft[4] = 0
+		pillsleft[5] = 0
 		tabletki = 1
 		tabletkiold = 0
 		tabletkifert = 1
@@ -2129,10 +2137,11 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
+				gs 'boyStat', 'A250'
 				if hypnoProstGuyFlag[1] = 0:
 					hypnoProstDates[1] = daystart
 					hypnoProstRubles[1] = 1300
-					'As you are waiting an ugly, fat man comes walking out of the gas station. He''s holding a bag which appears to be full with an assortment of sweets and unhealthy foods.'
+					'As you are waiting, an ugly fat man comes walking out of the gas station. He''s holding a bag which appears to be full with an assortment of sweets and unhealthy foods.'
 					'He throws the bag in the car then notices you. He walks over to you. "Hey, you''ve been standing here since I got here. Do you need a ride or something?"'
 					'"No sir, would you like to fuck me?" You reply almost immediatly.'
 					'"W-what?" He has an incredulous look on his face.'
@@ -2221,12 +2230,101 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
-					'As you are waiting... you come across a business man.'
+				gs 'boyStat', 'A249'
+				if hypnoProstGuyFlag[2] = 0:
+					hypnoProstDates[2] = daystart
+					'As you are waiting... you see a business man pumping gas at the station.'
+					'You approach him and ask him plainly, "Would you like to fuck me?"'
+					'He looks at you incredulously.'
+					act 'Wait for his answer':
+						:hypnoProstGuy2Start1
+						if vidage < 18:
+							'How old are you?'
+							'"I''m <<age>> years old."'
+							if age < 18:
+								'"<<age>>? Why is an <<age>> year old asking a stranger for sex at a gas station? Shouldn''t you be in school?"'
+								'"How much would you pay?"'
+								'"Oh, I see. Then, how is 2000 rubles?"'
+								hypnoProstRubles[2] = 2000
+							else
+								'"Hmm, so then what do you get out of this?"'
+								'"How much would you pay?"'
+								'"Oh, I see. Then, how is 1500 rubles?"'
+								hypnoProstRubles[2] = 1500
+							end
+							'"Okay."'
+							hypnoMoney += hypnoProstRubles[2]
+							'"Okay then..."He reaches into his wallet and pulls out the cash and hands it to you. Then he opens the door to his car and offers for you to step in.'
+							act 'Get in':
+								'He drives you to a secluded place, then parks the car. Once he''s parked, he reaches over and puts a hand on your thigh. He moves his hand towards your crotch, reaching underneath your skirt.'
+								'You sit still as his fingers explore your vagina. He does this for some time before telling you to strip.'
+								act 'Strip':
+									:hypnoProstSex2
+									i = rand(1,3)
+									if i = 3:
+										'You pull your clothes off. He tells you to lay back on the seat so he can fuck you.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									elseif i = 2:
+										'You pull your clothes off. He tells you to sit on his cock and ride him.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									else
+										'You pull your clothes off. He tells you to get on your hands and knees on the seat so he can fuck you.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									end
+									act 'Crawl onto the seat':
+										'<<$img1>>'
+										'You get into position and offer him your pussy.'
+										'He quickly presses the head of his cock against your hole and it slides in easily.'
+										act 'Get Fucked':
+											'<<$img2>>'
+											$butt = dyneval('$result = <<''$pcs_butt_adj''+rand(1,2)>> ')
+											''
+											'He fucks your pussy hard and fast. The car fills with the sound of his hips slapping against your <<$butt>> and the squelching of your wet pussy.'
+											'He uses your pussy for his own pleasure for some time until you start to feel his cock bulge inside of you and he lets out a moan.'
+											act 'Take his cum':
+												'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie<<rand(1,3)>>.mp4"></video></center>'
+												'He unloads inside of your vagina.'
+												act 'Continue':
+													'You dress and step out of the car. The man drives away, leaving you alone at the gas station.'
+													
+													act 'Continue waiting':
+														gt 'therapist', 'hypnoProstitute'
+													end
+												end
+											end
+										end
+									end
+								end
+							end
+						end
+					end
+					act 'Ask again':
+						'"Would you like to fuck me?"'
+						'I heard you the first time. Do you know what you are asking me?'
+						act '"Yes."':
+							jump 'hypnoProstGuy2Start1'
+						end
+						act '"Yes, sir."':
+							jump 'hypnoProstGuy2Start1'
+						end
+						act 'Nod':
+							jump 'hypnoProstGuy2Start1'
+						end
+					end
 				else
-
+					if hypnoProstRubles[2] > 100: hypnoProstRubles[2] -= rand(1,9) * 10
+					if hypnoProstRubles[2] < 100: hypnoProstRubles[2] = 100
+					hypnoMoney += hypnoProstRubles[2]
+					'As you are waiting, you see the business man from before pumping gas again. He notices you and walks over. He presses a wad of bills into your hands. "Come on now, I''d like to fuck you again."'
+					act 'Go with him':
+						'He leads you to his car and opens the door for you. Then gets into the front and starts to drive you somewhere secluded. Before you''ve even come to a stop, he''s exploring your vagina with his fingers. He does this for some time before telling you to strip.'
+						act 'Strip':
+							jump 'hypnoProstSex2'
+						end
+					end
 				end
 			end
 		elseif hypnoProstRand = 3:
@@ -2237,12 +2335,82 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
-					'As you are waiting... you come across a homeless man.'
+				gs 'boyStat', 'A251'
+				if hypnoProstGuyFlag[3] = 0:
+					hypnoProstDates[3] = daystart
+					hypnoProstRubles[3] = 1300
+					'As you are waiting... you see a homeless man picking through garbage in the dumpster by the gas station. He notices you standing by yourself and walks over to you.'
+					'"Excuse me, you got a few rubles to spare?"'
+					'Looking at him, you see that he looks like he hasn''t bathed in weeks and then you smell it. The stench coming from him is horrendous. He gives you a toothy grin and you see that many of his teeth are rotten.'
+					act 'Ask him if he''d like to fuck you':
+						'"Would you like to fuck me?" You ask.'
+						'"Fuck you?" he repeats. "Yea I wanna fuck you!" He grabs you by the arm and pulls you over by the dumpster, practically dragging you.'
+						act 'Continue':
+							jump 'hypnoProstGuy3Start1'
+						end
+					end
+					act 'Show him your bare pussy and ask if he''d like to fuck it':
+						'You pull your skirt up and show him your bare pussy. "Would you like to fuck this?"'
+						'He looks at your bare pussy dumbly, then back up at your face, then back down to your bare pussy again.'
+						'Then his eyes go wide and he grabs you by the arm and pulls you over by the dumpster, practically dragging you. "Yea I wanna fuck you! Little slut! Get over here!"'
+						act 'Continue':
+							:hypnoProstGuy3Start1
+							i = rand(1,3)
+									if i = 3:
+										'He tells you to get on your hands and knees.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									elseif i = 2:
+										'You pull your clothes off. He tells you to sit on his cock and ride him.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									else
+										'You pull your clothes off. He tells you to get on your hands and knees on the seat so he can fuck you.'
+										$img1 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+										$img2 = '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
+									end
+									act 'Crawl onto the seat':
+										'<<$img1>>'
+										'You get into position and offer him your pussy.'
+										'He quickly presses the head of his cock against your hole and it slides in easily.'
+										act 'Get Fucked':
+											'<<$img2>>'
+											$butt = dyneval('$result = <<''$pcs_butt_adj''+rand(1,2)>> ')
+											''
+											'He fucks your pussy hard and fast. The car fills with the sound of his hips slapping against your <<$butt>> and the squelching of your wet pussy.'
+											'He uses your pussy for his own pleasure for some time until you start to feel his cock bulge inside of you and he lets out a moan.'
+											act 'Take his cum':
+												'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/creampie<<rand(1,3)>>.mp4"></video></center>'
+												'He unloads inside of your vagina.'
+												act 'Continue':
+													'You dress and step out of the car. The man drives away, leaving you alone at the gas station.'
+													
+													act 'Continue waiting':
+														gt 'therapist', 'hypnoProstitute'
+													end
+												end
+											end
+										end
+									end
+						end
+					end
 				else
-
+					if hypnoProstRubles[2] > 100: hypnoProstRubles[2] -= rand(1,9) * 10
+					if hypnoProstRubles[2] < 100: hypnoProstRubles[2] = 100
+					hypnoMoney += hypnoProstRubles[2]
+					'As you are waiting, the homeless man from before comes walking up to you. He grabs you by the arm and starts pulling you over towards the garbage bins to the side of the gas station. Mostly out of sight.'
+					act 'Go with him':
+						'Shoving you aggressivly against the garbage bin, the homeless man pulls his cock out and says he''s going to fuck you.'
+						act '"Yes sir. How would you like to fuck me?"':
+							jump 'hypnoProstSex2'
+						end
+						act 'Place your hands against the dumpster and spread your legs.':
+							jump 'hypnoProstSex2'
+						end
+						act 'Lay on your back and spread your legs.':
+							jump 'hypnoProstSex2'
+						end
+					end
 				end
 			end
 		elseif hypnoProstRand = 4:
@@ -2253,9 +2421,9 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
+				if hypnoProstGuyFlag[4] = 0:
+					hypnoProstDates[4] = daystart
+					hypnoProstRubles[4] = 1300
 					'As you are waiting... a van rolls up to you and before you know it, you''re being dragged into the van.'
 				else
 
@@ -2427,9 +2595,9 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
+				if hypnoProstGuyFlag[6] = 0:
+					hypnoProstDates[6] = daystart
+					hypnoProstRubles[6] = 1300
 					'As you are waiting... you come across a middle aged man.'
 				else
 
@@ -2444,9 +2612,9 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
+				if hypnoProstGuyFlag[7] = 0:
+					hypnoProstDates[7] = daystart
+					hypnoProstRubles[7] = 1300
 					'As you are waiting... you come across a randomized trucker. This one should not be blocked from happening again.'
 				else
 
@@ -2460,9 +2628,9 @@ if $ARGS[0] = 'hypnoProstitute':
 					gt 'therapist', 'hypnoProstitute'
 				end
 			else
-				if hypnoProstGuyFlag[1] = 0:
-					hypnoProstDates[1] = daystart
-					hypnoProstRubles[1] = 1300
+				if hypnoProstGuyFlag[8] = 0:
+					hypnoProstDates[8] = daystart
+					hypnoProstRubles[8] = 1300
 					'As you are waiting... you come across a randomized male. This one should not be blocked from happening again.'
 				else
 

+ 52 - 52
locations/therapist_reminder.qsrc

@@ -7,13 +7,34 @@ if $ARGS[0] = '':
     '<center><img <<$set_imgh>> src="images/pc/reactions/forget.jpg"></center>'
     ''
     'You remember that you have an appointment with your therapist today at 18:00. It''s already <<hour>>:<<minut>>. You should go now.'
-    if reminderFreebee < 4:
-        gs 'willpower', 'misc', 'resist', 'easy'
-        will_cost += (hypnoTime * 2)
-        if will_cost <= pcs_willpwr:
-            act 'Return to what you were doing (<<will_cost>> Willpower)':
+    if $region = 'pav_commercial' or $region = 'pav_lake' or $region = 'pav_park' or $region = 'pav_residential':
+        if reminderFreebee < 4:
+            gs 'willpower', 'misc', 'resist', 'easy'
+            will_cost += (hypnoTime * 2)
+            if will_cost <= pcs_willpwr:
+                act 'Return to what you were doing (<<will_cost>> Willpower)':
+                    cla
+                    pcs_mood -= rand(10,20)
+                    gs 'stat'
+                    '<center><img <<$set_imgh>> src="images/pc/reactions/sad.jpg"></center>'
+                    ''
+                    'You feel bad about missing your appointment, but you have other things to do now. You tell yourself that you''ll see him again as soon as possible.'
+                    act 'Continue':
+                        gt '<<$menu_loc>>', '<<$menu_arg>>'
+                    end
+                end
+            else
+                act 'Return to what you were doing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+            end
+        else
+            act 'Return to what you were doing':
                 cla
-                pcs_mood -= rand(10,20)
+                *clr
+                reminderMult = reminderCount
+                if reminderCount > 10: reminderMult = 10
+                reminderMoodCostLow = func('shortgs','sqrt', 30*reminderMult)
+                reminderMoodCostHigh = func('shortgs','sqrt', 90*reminderMult)
+                pcs_mood -= rand(reminderMoodCostLow, reminderMoodCostHigh)
                 gs 'stat'
                 '<center><img <<$set_imgh>> src="images/pc/reactions/sad.jpg"></center>'
                 ''
@@ -22,11 +43,32 @@ if $ARGS[0] = '':
                     gt '<<$menu_loc>>', '<<$menu_arg>>'
                 end
             end
-        else
-            act 'Return to what you were doing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+        end
+        act 'Go see your therapist':
+            cla
+            *clr
+            if $region = 'pav_commercial':
+                minut += 5
+            elseif $region = 'pav_lake':
+                minut += 15
+            elseif $region = 'pav_park':
+                minut += 10
+            elseif $region = 'pav_residential':
+                minut += 10
+            else
+                minut += 5
+            end
+            '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/schoolWalk.mp4"></video></center>'
+            'You walk to your therapist''s office.'
+    
+            act 'Continue':
+                gt 'therapist'
+            end
         end
     else
-        act 'Return to what you were doing (<<will_cost>> Willpower)':
+        ''
+        '... But you realize you are much to far away, there''s no way you can make it on time.'
+        act 'Return to what you were doing':
             cla
             *clr
             reminderMult = reminderCount
@@ -37,54 +79,12 @@ if $ARGS[0] = '':
             gs 'stat'
             '<center><img <<$set_imgh>> src="images/pc/reactions/sad.jpg"></center>'
             ''
-            'You feel bad about missing your appointment, but you have other things to do now. You tell yourself that you''ll see him again as soon as possible.'
+            'You feel terrible about missing your appointment. You tell yourself that you''ll see him again as soon as possible.'
             act 'Continue':
                 gt '<<$menu_loc>>', '<<$menu_arg>>'
             end
         end
     end
-    act 'Go see your therapist':
-        cla
-        *clr
-        if $region = 'city_center':
-            minut += 30
-        elseif $region = 'city_industrial':
-            minut += 45
-        elseif $region = 'city_island':
-            minut += 45
-        elseif $region = 'city_lake':
-            minut += 45
-        elseif $region = 'city_park':
-            minut += 45
-        elseif $region = 'city_redlight':
-            minut += 45
-        elseif $region = 'city_residential':
-            minut += 45
-        elseif $region = 'gad_forest':
-            minut += 45
-        elseif $region = 'gad_village':
-            minut += 30
-        elseif $region = 'puskin':
-            minut += 35
-        elseif $region = 'pav_commercial':
-            minut += 5
-        elseif $region = 'pav_lake':
-            minut += 15
-        elseif $region = 'pav_park':
-            minut += 10
-        elseif $region = 'pav_residential':
-            minut += 10
-        else
-            minut += 5
-        end
-        '<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/schoolWalk.mp4"></video></center>'
-        'You walk to your therapist''s office.'
-
-        act 'Continue':
-			$loc = 'pav_clinic'
-            gt 'therapist'
-        end
-    end
 end
 
 --- therapist_reminder ---------------------------------

+ 1 - 1
locations/traits.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'menu':
 		'You have this trait at level 2.'
 		'To maintain this trait, you must wear bimbo make up, clothing and shoes at least once per day.'
 		'Due to this trait, you gain a small bonus to appearance and a small penalty to intelligence.'
-		'You have <<bimbo>> out of 14 points towards level 3.'
+		'You have <<bimbo>> out of 30 points towards level 3.'
 		if bimbowithdrawal = 0:
 			'You are not in withdrawal.'
 		else

+ 37 - 0
locations/version.qsrc

@@ -1,6 +1,43 @@
 # version
 
 act 'Return': gt 'start'
+
+'0.8.5.1'
+'- Bugfixes from rachels, Anya, Thavus and KS.'
+'0.8.5'
+'- The university now has first two terms and end of year exams, preparatory system recoded and cleaned up and several students added (teacher train course only for now) by bgkjdgbizgblzdgbr and writing from nutluck both aided by Anya'
+'- Journal entry for uni added by bgkjdgbizgblzdgbr'
+'- Some more clothing and changes to some existing with new light grey backgrounds by Gwen'
+'- Clothing menus all tidied up with new buttons and links between them including UI for clothes shopping and viewing updated and a range of filters added by KS'
+'- Piercing management interface now image based by KS'
+'- More links for navigating around Pavlovsk more directly and easily including changing station exterior to market and making train station a direct link by KS'
+'- Homes given more options where missing and brought more in line with each other by Anya'
+'- Journal updated by nutluck'
+'- Continuation of the Alex magic events with a whole new mission by THX'
+'- New churches in Gadukino and the city thanks to nutluck with Anya''s help'
+'- Cosmetic (makeup) tattoos added to beauty parlour from R.'
+'- More Albina content by Vengeance11'
+'- Nerd study group at the library by Nutluck'
+'- Anal sex option to protect virginity when having sex with bio-dad and some anal only options for sis, ''Nush and more from FenrirRed'
+'- Mansion (owned home) revamped and updated by Anya'
+'- Clothes shopping in Fashionista now must be via changing room and that process streamlined, system also imported to Mon Chéri by KS'
+'- New therapist story starting with hypno sessions and quickly taking over your life by Thavus'
+'- Family schedule fixes and tweaks by Anya'
+'- Flashing while wearing a butt plug now has special images thanks to bgkjdgbizgblzdgbr'
+'- Stripping tweaks to allow dancing while clothed and tip calculation and amounts fixed and tweaked to rely more on skill and generally be better by KS'
+'- Some more post stripping sex offer events from ILoveNudes'
+'- Sextoys now in proper shopping menu and not massive list in actions thanks to Anya'
+'- The weird issue with sleeping through whole days finally fixed thanks to rachels'
+'- Various changes and rewriting of Albina scenes by HornGuy6'
+'- New purchasable player home in City res from Anya'
+'- Orgasm count split to track those from masturbation, clitoral stimulation, vaginal and anal penetration for better stat reporting with new code for masturbation tracking by KS partly for the butt slut trait from FenrirRed'
+'- Katja variables reworked making it clearer to understand on the code side and hopefully a bit for players too by bgkjdgbizgblzdgbr'
+'- Rework of exercise and weight gain algorithms by bgkjdgbizgblzdgbr'
+'- City lake got a rework by JedimasterBob with code from Anya'
+'- Kendra reworked to be more les dom and less crazy by nutluck'
+'- Text edits by Vengeance11, Anya, Hornguy6, nutluck, bgkjdgbizgblzdgbr, Dybbuk, Ensus and KS'
+'- Code tweaks and bug fixes by Rachels, bgkjdgbizgblzdgbr, Anya, Gwen, Hornguy6, NOX, R. and KS'
+
 '0.8.4.2'
 '- Bugfixes from rachels, bgkjdgbizgblzdgbr, Anya, Gwen and KS'
 '0.8.4.1'

BIN
tools/Player-video/plugins/plugins.dat