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

locations/NikoWhore.qsrc

@@ -676,7 +676,7 @@ if $ARGS[0] = 'Locker Room 2':
 																		*clr & cla
 																		gs'stat'
 																		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock8.mp4"></video></center>'
-																		'Petka begins fucking you, thrusting at an increased pace, as he holds your legs open, giving himself easier access. You have no fight left, your strength is gone, your entire body is numb, you feel nothing, as Petka continues using your body. <font color=#FF00FF>Wha...what''s going...feel...so hot...head...can''t think...why...</font>'\
+																		'Petka begins fucking you, thrusting at an increased pace, as he holds your legs open, giving himself easier access. You have no fight left, your strength is gone, your entire body is numb, you feel nothing, as Petka continues using your body. <font color=#FF00FF>Wha...what''s going...feel...so hot...head...can''t think...why...</font>'
 																		$orgasm_txt = ''
 																		gs 'cum_call', 'stomach', 'A6', 1
 																		gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang', 'prostitution'

locations/ParChurch.qsrc

@@ -56,7 +56,6 @@ end
 
 if $ARGS[0] = 'Mom':
 	cla & *clr
-	mom_church = daystart
 	gs'stat'
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 	if VKChurchNo = 4 or VKChurchNo = 5:
@@ -65,15 +64,15 @@ if $ARGS[0] = 'Mom':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
 	end
 	if motherKnowWhore = 0 and VKChurchIntro = 0:
-		'You walk into the church then look for a seat when you suddenly hear someone casually call out, "<<$pcs_firstname>> I never expected you to come here without me dragging you." You turn to see your <<$npc_nickname[''A29'']>> sitting in the middle row. You reply, "Hey <<$npc_nickname[''A29'']>>." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
+		'You suddenly hear someone casually call out, "<<$pcs_firstname>> I never expected you to come here without me dragging you." You turn to see your <<$npc_nickname[''A29'']>> sitting in the middle row. You reply, "Hey <<$npc_nickname[''A29'']>>." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
 	elseif motherKnowWhore = 0 and VKChurchNo < 4:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then says, "<<$pcs_firstname>> you''re here. Come here, take a seat." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then says, "<<$pcs_firstname>> you''re here. Come here, take a seat." Your <<$npc_nickname[''A29'']>> then motions you to sit next to her.'
 	elseif motherKnowWhore = 0 and VKChurchNo = 4:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then get up and walks to you before saying, "<<$pcs_firstname>> we need to talk." She then guides you out of the church.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She quickly notices you then get up and walks to you before saying, "<<$pcs_firstname>> we need to talk." She then guides you out of the church.'
 	elseif motherKnowWhore > 0 or VKChurchNo = 5:
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She peeks over in your direction then turns away from you, as if you were not there.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She peeks over in your direction then turns away from you, as if you were not there.'
 	else
-		'You walk into the church then see your <<$npc_nickname[''A29'']>> sitting in the middle row. She doesn''t seem to notice you.'
+		'You see your <<$npc_nickname[''A29'']>> sitting in the middle row. She doesn''t seem to notice you.'
 	end
 
 	if motherKnowWhore = 0 and VKChurchNo = 4:
@@ -137,6 +136,7 @@ end
 if $ARGS[0] = 'Excuses':
 	cla & *clr
 	VKChurchEvents = 0
+	mom_church = daystart
 	gs'stat'
 	if VKChurchNo = 0:
 		VKChurchNo += 1
@@ -234,7 +234,11 @@ if $ARGS[0] = 'vigil':
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/church'+ rand(9,10) +'.jpg"></center>'
 		'You decide to stay for the rite of mutual forgiveness and feel much better afterwards.'
-		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+		if $args[1] = 'mom':
+			act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
+		else
+			act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+		end
 	end
 end
 
@@ -274,7 +278,11 @@ if $ARGS[0] = 'liturgy':
     vokal_exp += rand(0,3)
     gs 'stat'
 
-	act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+	if $args[1] = 'mom':
+		act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
+	else
+		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+	end
 end
 
 if $ARGS[0] = 'reducepavrep':
@@ -306,42 +314,56 @@ if $ARGS[0] = 'Narthex':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'
 	'You enter the church and the scent of incense and beeswax fills your lungs. Your eyes are drawn past the Narthex into the Nave with its walls covered in lovingly painted icons while a thousand points of light dance in joy throughout God''s house from the magnificent chandelier that hangs from the ceiling.'
 	'To your left as you enter, there is a counter where a deacon sells candles, icons, and prayer books. He smiles and nods at you absently, acknowledging your presence without really seeing you.'
+	act 'Leave the church': gt 'ParChurch' , 'start'
+	act 'Attend the Vigil':gt 'ParChurch', 'vigil'
+	act 'Join the Liturgy':gt 'ParChurch', 'liturgy'
+	act 'Light a candle':gt 'ParChurch', 'candle'
+	act 'Pray':gt 'ParChurch', 'pray'
+end
+
+if $ARGS[0] = 'Narthex_mom':
+	CLOSE ALL
+	$menu_loc = 'ParChurch'
+	$menu_arg = 'Narthex_mom'
+	menu_off = 0
+	*clr & cla
+	gs 'themes', 'indoors'
+	gs 'stat'
+	PLAY 'sound/church/76139__dkustic__090227-01-people-church-concert.wav',30
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'
+	'You enter the church and the scent of incense and beeswax fills your lungs. Your eyes are drawn past the Narthex into the Nave with its walls covered in lovingly painted icons while a thousand points of light dance in joy throughout God''s house from the magnificent chandelier that hangs from the ceiling.'
+	'To your left as you enter, there is a counter where a deacon sells candles, icons, and prayer books. He smiles and nods at you absently, acknowledging your presence without really seeing you.'
 	if VKChurchEvents < 2 and hour < 14:
 		if VKChurch = 0 or VKChurch = 4:
 			if VKChurch < 4: VKChurch += 1
-			act 'Attend the Vigil':gt 'ParChurch', 'vigil'
+			act 'Attend the Vigil':VKChurchEvents += 1 & gt 'ParChurch', 'vigil', 'mom'
 		elseif VKChurch = 1 or VKChurch = 4:
 			if VKChurch < 4: VKChurch += 1
-			act 'Join the Liturgy':gt 'ParChurch', 'liturgy'
-		elseif VKChurch = 2 or VKChurch = 4:
+			act 'Join the Liturgy':VKChurchEvents += 1 & gt 'ParChurch', 'liturgy', 'mom'
+		elseif VKChurch = 2 or VKChurch = 4:	
 			if VKChurch < 4: VKChurch += 1
-			act 'Light a candle':gt 'ParChurch', 'candle'
+			act 'Light a candle':VKChurchEvents += 1 & gt 'ParChurch', 'candle', 'mom'
 			if VKChurch < 4: VKChurch += 1
 		elseif VKChurch = 3 or VKChurch = 4:
 			if VKChurch < 4: VKChurch = 4
-			act 'Pray':gt 'ParChurch', 'pray'
+			act 'Pray':VKChurchEvents += 1 & gt 'ParChurch', 'pray', 'mom'
 		else
-			act 'Attend the Vigil':gt 'ParChurch', 'vigil'
-			act 'Join the Liturgy':gt 'ParChurch', 'liturgy'
-			act 'Light a candle':gt 'ParChurch', 'candle'
-			act 'Pray':gt 'ParChurch', 'pray'
+			act 'Attend the Vigil':gt 'ParChurch', 'vigil', 'mom'
+			act 'Join the Liturgy':gt 'ParChurch', 'liturgy', 'mom'
+			act 'Light a candle':gt 'ParChurch', 'candle', 'mom'
+			act 'Pray':gt 'ParChurch', 'pray', 'mom'
 		end
 		act 'Leave early':gt 'ParChurch', 'Leave Early'
 	else
-		if hour = 12:
-			minut += 120 - minut
-		else
-		   minut += 60 - minut
-		end
-		if hour >= 14:hour = 14 - minut
 		if VKChurchQW < 6:VKChurchQW += 1
 		act 'Finish':gt 'ParChurch', 'Leave'
-	end
+	end	
 end
 
 if $ARGS[0] = 'Leave Early':
 	CLOSE ALL
 	VKChurchEvents = 0
+	mom_church = daystart
 	*clr & cla
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
@@ -360,6 +382,7 @@ if $ARGS[0] =  'Leave':
 	else
 		hour = 14
 	end
+	mom_church = daystart
 	VKChurchEvents = 0
 	gs'stat'
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
@@ -421,7 +444,11 @@ if $ARGS[0] = 'candle':
 		'You approach the iconostasis and light your candle in the dark church. It gives you a nice feeling and decide to say a little prayer. The darkness, combined with the pleasant sight of fire makes you feel warm inside.'
 	end
 
-	act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+	if $args[1] = 'mom':
+		act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
+	else
+		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+	end
 end
 
 if $ARGS[0] = 'pray':
@@ -489,10 +516,14 @@ if $ARGS[0] = 'pray':
 			'"That felt refreshing," you mumble to yourself.'
 		end
 		gs 'stat'
-		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+		if $args[1] = 'mom':
+			act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
+		else
+			act 'Return to Narthex': gt 'ParChurch', 'Narthex'
+		end
 	end
 
-	if exhibitionist_lvl > 0:
+	if exhibitionist_lvl > 0 and $args[1] ! 'mom':
 		act 'Be naughty':
 			*clr & cla
 			menu_off = 1

locations/_attributes_alternative.qsrc

@@ -303,6 +303,7 @@ elseif ARGS[1] = 55:
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 2
+	CloStyle2 = 4
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 3

locations/foto_shoot.qsrc

@@ -491,6 +491,7 @@ if $ARGS[0] = 'bikini':
 	minut += 120
 	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_bikini += 1
+	if pcs_inhib < 20: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(7,12)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
@@ -516,6 +517,7 @@ if $ARGS[0] = 'lingerie':
 	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (min(city_modelling, 700)/2) + (pcs_mdlng/2 * 10)
 	modelfoto_lingerie += 1
 	mdlng_exp += rand(6,10)
+	if pcs_inhib < 25: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(7,13)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,6)
@@ -543,6 +545,7 @@ if $ARGS[0] = 'sexy':
 	modelfoto_glamour += 1
 	modelfoto_ero_clo += 1
 	mdlng_exp += rand(5,10)
+	if pcs_inhib < 30: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(7,12)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(1,6)
@@ -563,6 +566,7 @@ if $ARGS[0] = 'transparent':
 	modelfoto_transparent += 1
 	modelfoto_nip += 1
 	mdlng_exp += rand(6,10)
+	if pcs_inhib < 45: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(7,13)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -588,6 +592,7 @@ if $ARGS[0] = 'trans_ling':
 	modelfoto_nip += 1
 	modelfoto_lingerie += 1
 	mdlng_exp += rand(8,10)
+	if pcs_inhib < 45: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(9,14)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -618,6 +623,7 @@ if $ARGS[0] = 'topless':
 	modelfoto_nip += 1
 	modelfoto_topless += 1
 	mdlng_exp += rand(6,10)
+	if pcs_inhib < 50: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(8,14)
 	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,8)
@@ -641,6 +647,7 @@ if $ARGS[0] = 'tasteful':
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto_tastenude += 1
 	mdlng_exp += rand(9,10)
+	if pcs_inhib < 40: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
@@ -664,6 +671,7 @@ if $ARGS[0] = 'topless_nude':
 	modelfoto_nude += 1
 	modelfoto_toplessnude += 1
 	mdlng_exp += rand(9,10)
+	if pcs_inhib < 55: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(3,10)
@@ -692,6 +700,7 @@ if $ARGS[0] = 'nude':
 	modelfoto_nip += 1
 	modelfoto_pussy += 1
 	mdlng_exp += rand(9,10)
+	if pcs_inhib < 60: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(10,20)
 	gs 'fame', 'pav', 'modelling', rand(10,15)
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(5,10)
@@ -732,6 +741,7 @@ if $ARGS[0] = 'erotic':
 	modelfoto_pussy += 1
 	modelfoto_asshole += 1
 	mdlng_exp += rand(1,4)
+	if pcs_inhib < 65: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(5,10)
 	gs 'fame', 'city', 'porn', rand(5,15)
 	gs 'fame', 'pav', 'porn', rand(0,15)

locations/gschool_grounds.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'main':
 				end
 			elseif hour = 7:
 				if NikoEv = 10:
-					gt 'NikoDates', 'Walk Of Shame'
+					gt 'NikoWhore', 'Walk Of Shame'
 				elseif minut <= 45:
 					act '<b>Go to class</b>': gt 'gschool_grounds', 'bulding'
 				else
@@ -170,7 +170,7 @@ if $ARGS[0] = 'main':
 					end
 				end
 			elseif hour = 8:
-				if NikoEv = 10: gt 'NikoDates', 'Walk Of Shame'
+				if NikoEv = 10: gt 'NikoWhore', 'Walk Of Shame'
 				'You missed your whole first class, hopefully no one noticed.'
 				act '<b>Rush to class</b>':	demerit += 10 & gt 'gschool_grounds', 'bulding'
 			elseif hour < 14:

locations/gschool_lessons3.qsrc

@@ -442,7 +442,7 @@ end
 if $ARGS[0] = 'art':
 	menu_off = 1
 	pcs_grades += rand(0,1)
-	artslks_exp += rand(1,2)
+	artskls_exp += rand(1,2)
 	agil_exp += rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classart.jpg"></center>'
@@ -456,7 +456,7 @@ if $ARGS[0] = 'art':
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			pcs_grades += rand(0,1)
-			artslks_exp += rand(1,2)
+			artskls_exp += rand(1,2)
 			agil_exp += rand(0,1)
 			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
@@ -465,7 +465,7 @@ if $ARGS[0] = 'art':
 			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of art and famous artist.'
 			act 'Ask a question about the lesson':
 				*clr & cla
-				artslks_exp += rand(0,1)
+				artskls_exp += rand(0,1)
 				agil_exp += rand(0,1)
 				pcs_grades += rand(0,1)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
@@ -830,7 +830,7 @@ if $ARGS[0] = 'art':
 			'Mr. Vasilyev tries to convince you of the importance of todays lesson, "<<$pcs_nickname>>, please pay attention, this is very important. Today''s topic is going to be on the exam for sure."'
 			act 'Reluctantly pay attention':
 				*clr & cla
-				artslks_exp += rand(0,1)
+				artskls_exp += rand(0,1)
 				agil_exp += rand(0,1)
 				pcs_grades += rand(0,1)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
@@ -841,7 +841,7 @@ if $ARGS[0] = 'art':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
-				artslks_exp += rand(0,2)
+				artskls_exp += rand(0,2)
 				agil_exp += rand(0,1)
 				pcs_grades += rand(0,1)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/payattention.jpg"></center>'

locations/ludahome.qsrc

@@ -111,36 +111,7 @@ if $ARGS[0] = 'home':
 		elseif rand(7,10) <= 9 and (week < 5 and hour >= 18 and hour <= 22) or (week > 5 and hour >= 8 and hour <= 22):
 			*clr & cla
 			'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-			if OluQW['met'] = 0:
-				OluQW['met'] = 1
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by a large African man, who has a big friendly smile on his face "Hello can I help you?" He asks in heavily accented Russian.'
-				'You return his smile "Yes, is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now, you one her nieces?"'
-				'You nod "Yes I am <<$pcs_nickname>>, you must be Olu, my Aunts boyfriend. I have heard about you, nice to finally meet you."'
-				'He smiles even bigger "All good I hope. I will tell her you stopped by, it was nice meeting you."'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				act 'Ask if you can come in': 
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He pauses a moment and then nods opening the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What do you need?"'
-					!! Temporary loc measure
-					act 'I just wanted to talk': OluLoc = 5 & gt 'ludahome', 'chat_olu'
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
-				end
-			elseif OluQW['met'] = 1 and OluQW['talked'] = 1:
-				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
-				'You return his smile "Is my Aunt Luda home?"'
-				'He shakes his head no "No she not home right now. Would you like to come in and talk again?"'
-				act 'Leave': gt 'pod_ezd', 'etaj_4'
-				act 'Go in and talk':
-					*clr & cla
-					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
-					'He opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
-					!! Temporary loc measure
-					act 'Sit down and chat': OluLoc = 5 & gt 'ludahome', 'chat_olu'
-					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
-				end
-			elseif OluQW['sex'] = 1:
+			if OluQW['sex'] = 1:
 				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian. When he sees it is you, his smile turns into a hungry grin as his eyes roam all over you body.'
 				'You return his smile "Is my Aunt Luda home?"'
 				'He shakes his head no "No she not home right now. We have time to have some fun, come in, come in."'
@@ -170,6 +141,35 @@ if $ARGS[0] = 'home':
 				end
 				!! Temporary loc measure
 				act 'Agree to have fun': OluLoc = 5 & gt 'olu', 'olusex1'
+			elseif OluQW['met'] = 1 and OluQW['talked'] = 1:
+				'You stand outside your aunts apartment, knocking on the door. The door is answered by Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
+				'You return his smile "Is my Aunt Luda home?"'
+				'He shakes his head no "No she not home right now. Would you like to come in and talk again?"'
+				act 'Leave': gt 'pod_ezd', 'etaj_4'
+				act 'Go in and talk':
+					*clr & cla
+					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+					'He opens the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What shall we talk about?"'
+					!! Temporary loc measure
+					act 'Sit down and chat': OluLoc = 5 & gt 'ludahome', 'chat_olu'
+					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
+				end
+			elseif OluQW['met'] = 0:
+				OluQW['met'] = 1
+				'You stand outside your aunts apartment, knocking on the door. The door is answered by a large African man, who has a big friendly smile on his face "Hello can I help you?" He asks in heavily accented Russian.'
+				'You return his smile "Yes, is my Aunt Luda home?"'
+				'He shakes his head no "No she not home right now, you one her nieces?"'
+				'You nod "Yes I am <<$pcs_nickname>>, you must be Olu, my Aunts boyfriend. I have heard about you, nice to finally meet you."'
+				'He smiles even bigger "All good I hope. I will tell her you stopped by, it was nice meeting you."'
+				act 'Leave': gt 'pod_ezd', 'etaj_4'
+				act 'Ask if you can come in': 
+					*clr & cla
+					'<center><img src="images/pc/npc_headshots/big55.jpg"></center>'
+					'He pauses a moment and then nods opening the door wide for you to walk through. Once you step inside he closes the door behind you, he then leads you to the couch in the living room and takes a seat. He indicates for you to take as seat as well, once you do he says "What do you need?"'
+					!! Temporary loc measure
+					act 'I just wanted to talk': OluLoc = 5 & gt 'ludahome', 'chat_olu'
+					act 'Sorry I should go': gt 'pod_ezd', 'etaj_4'
+				end
 			else
 				'You stand outside your aunts apartment, knocking on the door. The door is answered by a Olu, who has a big friendly smile on his face "Hello again." He asks in heavily accented Russian.'
 				'You return his smile "Is my Aunt Luda home?"'

locations/mother.qsrc

@@ -542,7 +542,6 @@ if $ARGS[0] = '':
 			end
 		end
 		gs 'mother', 'pregreact'
-		end
 	end
 
 	if alko >= 3  and alkomday ! daystart:

locations/preCUST.qsrc

@@ -583,8 +583,11 @@ if $ARGS[0] = 'Done':
 	end
 	
 !!setting default exercise outfit and setting coats
-	if goth_clothing = 1:
-		killvar 'goth_clothing'
+	if school_clothing = 1:
+		killvar 'school_clothing'
+		alternative[55] = 1
+		alternativeH[55] = 120
+		alternativeB[55] = pcs_hips
 		sportspantynumber = 44
 		sportsbranumber = 28
 		$sportsbratype = 'kats'
@@ -606,7 +609,29 @@ if $ARGS[0] = 'Done':
 		coat[5] = 1
 		coatH[5] = 200
 		defaultcoat = 5
-		sportscoat = 5	
+		sportscoat = 5
+		if school_clothing = 2:
+			school[10] = 1
+			schoolH[10] = 120
+			schoolB[10] = pcs_hips
+		elseif school_clothing = 3:
+			school[62] = 1
+			schoolH[62] = 120
+			schoolB[62] = pcs_hips
+		elseif school_clothing = 4:
+			alternative[19] = 1
+			alternativeH[19] = 120
+			alternativeB[19] = pcs_hips
+		elseif school_clothing = 5:
+			school[25] = 1
+			schoolH[25] = 120
+			schoolB[25] = pcs_hips
+		elseif school_clothing = 6:
+			school[26] = 1
+			schoolH[26] = 120
+			schoolB[26] = pcs_hips
+		end
+		killvar 'school_clothing'
 	end
 	sportsshoenumber = 21
 	$sportspursetype = $currentpursetype

locations/preSYS.qsrc

@@ -931,6 +931,7 @@ if $ARGS[0] = 'socialite':
 		currentpursenumber = 4
 		fashionista_purses[4] = 1
 		bag = 1
+		school_clothing = 6
 		if player_avatar ! 1: pcs_hairlng = 200
 		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 0, 0, 0, 0
 		npc_rel['A140'] += 10
@@ -959,6 +960,7 @@ if $ARGS[0] = 'beautiful':
 			pcs_lip = 3
 			pcs_lashes = 2
 		end
+		school_clothing = 6
 		pcs_skin = 100
 		pcs_tan = 50
 		genbsize = 37
@@ -1047,6 +1049,7 @@ if $ARGS[0] = 'gopnikstart':
 		pcs_kick = 35
 		pcs_def = 35
 		pcs_makupskl = 20
+		school_clothing = 5
 		npc_rel['A9'] += 10
 		npc_rel['A10'] += 10
 		npc_rel['A11'] += 10
@@ -1090,6 +1093,7 @@ if $ARGS[0] = 'troublemaker':
 		currentpursenumber = 16
 		dolls_purses[16] = 1
 		bag = 1
+		school_clothing = 5
 		if player_avatar ! 1: pcs_hairlng = 55
 		npc_rel['A24'] += 10
 		npc_rel['A155'] += 15
@@ -1208,6 +1212,7 @@ if $ARGS[0] = 'alternative':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
+		school_clothing = 4
 		pcs_skin = 80
 		pcs_tan = 5
 		pcs_inhib = 40
@@ -1305,6 +1310,7 @@ if $ARGS[0] = 'uglyduckling':
 			pcs_lip = 0
 			pcs_lashes = 2
 		end
+		school_clothing = 3
 		salo = 20
 		willpowermax = 70
 		gt 'preCUST', 'SGStart'
@@ -1340,6 +1346,7 @@ if $ARGS[0] = 'goodgirl':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
+		school_clothing = 3
 		salo = 80
 		genbsize = 17
 		npc_rel['A25'] -= 5
@@ -1398,6 +1405,7 @@ if $ARGS[0] = 'slut':
 			pcs_lip = 2
 			pcs_lashes = 1
 		end
+		school_clothing = 2
 		pcs_perform = 20
 		pcs_skin = 80
 		pcs_tan = 20
@@ -1473,7 +1481,7 @@ if $ARGS[0] = 'goth':
 			pcs_eyecol = 1
 			pcs_lashes = 1
         end
-		goth_clothing = 1
+		school_clothing = 1
         kosmetica = 25
 		stanok = 20
 		tampon = 10

locations/preSYS2.qsrc

@@ -270,7 +270,7 @@ if $ARGS[0] = 'modpur':
 		'<center><img src="images/locations/city/island/dolls.png"></center>'
 		i = 1
 		:loopdollspurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/purses/dolls/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 22:jump 'loopdollspurses'
 	end

locations/wardrobe.qsrc

@@ -283,8 +283,12 @@ if $ARGS[0] = 'default_entry_set':
 	defpantynumber[i] = pantywornnumber
 	$defshoetype[i] = $shoeworntype
 	defshoenumber[i] = shoewornnumber
-	$defpursetype[i] = $currentpursetype
-	defpursenumber[i] = currentpursenumber
+	if bag = 1:
+		$defpursetype[i] = $currentpursetype
+		defpursenumber[i] = currentpursenumber
+	else
+		$defpursetype[i] = 'none'
+	end
 	defcoat[i] = defaultcoat
 
 	$def_clothing_temp = '<<$def_clothing_name[i]>>'