Browse Source

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

hornguy6 1 năm trước cách đây
mục cha
commit
3ada04f120

+ 4 - 0
glife.qproj

@@ -558,6 +558,10 @@
 		<Location name="fbGar"/>
 		<Location name="zsoft_gopskverGorSlut"/>
 	</Folder>
+	<Folder name="Employment Systems">
+		<Location name="emp_functions"/>
+		<Location name="emp_job_array"/>
+	</Folder>
 	<Folder name="Fedor">
 		<Location name="FedorEv"/>
 		<Location name="FedorEv2"/>

+ 15 - 13
locations/DNA.qsrc

@@ -41,30 +41,32 @@ if $ARGS[0] = 'relate':
 	!!paternal grandfather ID
 	temp2[6] = $mid ($ARGS[2], 67, 10)
 	
+	killvar 'gen_relationship'
+	
 	if temp1[0] = temp2[1] or temp1[0] = temp2[2] or temp2[0] = temp1[1] or temp2[0] = temp1[2]:
-		'Parent-child relation'
+		$gen_relationship += 'Parent-child relationship. '
 		if temp1[0] = temp2[1] or temp1[0] = temp2[2]:
 			!!temp1 is the parent, temp2 is child
-			if temp2[1] = temp2[5] or temp2[2] = temp2[4]:'Child is the result of incest (parent is also grandparent)'
-			if temp2[3] = temp2[5] and temp2[4] = temp2[6]:'Child is result of incest with close family member (sibling)'
-			if temp2[3] = temp2[5] or temp2[4] = temp2[6]:'Child is result of incest with close family member (half sibling)'
+			if temp2[1] = temp2[5] or temp2[2] = temp2[4]: $gen_relationship += 'Child is the result of incest (parent is also grandparent)'
+			if temp2[3] = temp2[5] and temp2[4] = temp2[6]: $gen_relationship += 'Child is result of incest with close family member (sibling)'
+			if temp2[3] = temp2[5] or temp2[4] = temp2[6]:$gen_relationship += 'Child is result of incest with close family member (half sibling)'
 		elseif temp2[0] = temp1[1] or temp2[0] = temp1[2]:
 			!!temp2 is the parent, temp1 is child
-			if temp1[1] = temp1[5] or temp1[2] = temp1[4]:'Child is the result of incest (parent is also grandparent)'
-			if temp1[3] = temp1[5] and temp1[4] = temp1[6]:'Child is result of incest with close family member (sibling)'
-			if temp1[3] = temp1[5] or temp1[4] = temp1[6]:'Child is result of incest with close family member (half sibling)'
+			if temp1[1] = temp1[5] or temp1[2] = temp1[4]: $gen_relationship += 'Child is the result of incest (parent is also grandparent)'
+			if temp1[3] = temp1[5] and temp1[4] = temp1[6]: $gen_relationship += 'Child is result of incest with close family member (sibling)'
+			if temp1[3] = temp1[5] or temp1[4] = temp1[6]: $gen_relationship += 'Child is result of incest with close family member (half sibling)'
 		end
 	elseif temp1[0] = temp2[3] or temp1[0] = temp2[4] or temp1[0] = temp2[5] or temp1[0] = temp2[6] or temp2[0] = temp1[3] or temp2[0] = temp1[4] or temp2[0] = temp1[5] or temp2[0] = temp1[6]:
-		'Grandparent-grandchild relation'
+		$gen_relationship += 'Grandparent-grandchild relationship.'
 	elseif temp1[1] = temp2[1] or temp1[2] = temp2[2]:
-		'Sibling relation'
-		if temp1[1] = temp2[1] and temp1[2] = temp2[2]:'Full sibling'
-		if temp1[1] ! temp2[1] or temp1[2] ! temp2[2]:'Half sibling'
+		$gen_relationship += 'Sibling relation'
+		if temp1[1] = temp2[1] and temp1[2] = temp2[2]: $gen_relationship += 'Full sibling'
+		if temp1[1] ! temp2[1] or temp1[2] ! temp2[2]: $gen_relationship += 'Half sibling'
 	elseif temp1[1] ! temp2[1] and temp1[2] ! temp2[2]:
 		if temp1[3] = temp2[3] and temp1[4] = temp2[4] or temp1[3] = temp2[5] and temp1[4] = temp2[6]:
-			'first cousins'
+			$gen_relationship += 'first cousins'
 		elseif temp1[3] = temp2[3] or temp1[4] = temp2[4] or temp1[3] = temp2[5] or temp1[4] = temp2[6]:
-			'distand blood relation'
+			$gen_relationship += 'distand blood relation'
 		end
 	end
 	killvar 'temp1'

+ 65 - 0
locations/NPCFinder.qsrc

@@ -0,0 +1,65 @@
+*clr
+'<a href="exec: gt ''NPCFinder'', ''finder''">Enter the ID of the character.</a>'
+if $ARGS[0] = 'finder':
+	$looking = input ('ID (like <i>A17</i>)')
+	gt 'NPCFinder'
+end
+
+if $looking ! '':
+	'<br><br>'
+	'Found character:'
+	'<br>'
+	'<<$npc_pic[''<<looking>>'']>>'
+	'DNA string: <<$npc_dna[''<<$looking>>'']>>'
+	'Name: <<$npc_firstname[''<<$looking>>'']>> "<<$npc_nickname[''<<$looking>>'']>>" <<$npc_lastname[''<<$looking>>'']>> (<<$npc_usedname[''<<$looking>>'']>>)'
+	if npc_dob['<<$looking>>'] ! '': 'Birthday (YYYY-MM-DD): <<mid(npc_dob[''<<$looking>>''],1,4)>>-<<mid(npc_dob[''<<$looking>>''],5,2)>>-<<mid(npc_dob[''<<$looking>>''],7,2)>>'
+	'Intelligence: <<npc_intel[''<<$looking>>'']>>'
+	if npc_grupTipe['<<$looking>>'] ! '': 'Social group: <<npc_grupTipe[''<<$looking>>'']>>'
+	if npc_sexskill['<<$looking>>'] ! '': 'Sex skill: <<npc_sexskill[''<<$looking>>'']>>'
+	if npc_rep['<<$looking>>'] ! '': ' Reputation in school: <<npc_rep[''<<$looking>>'']>>'
+	if npc_haircol['<<$looking>>'] = 0:
+		'Natural hair color: black (<<npc_haircol[''<<$looking>>'']>>)'
+	elseif npc_haircol['<<$looking>>'] = 1:
+		'Natural hair color: brown (<<npc_haircol[''<<$looking>>'']>>)'
+	elseif npc_haircol['<<$looking>>'] = 2:
+		'Natural hair color: read (<<npc_haircol[''<<$looking>>'']>>)'
+	else
+		'Natural hair color: blonde (<<npc_haircol[''<<$looking>>'']>>)'
+	end
+	if hotcat_rating['<<$looking>>'] ! '': 'Hotness rating: <<hotcat_rating[''<<$looking>>'']>>'
+	'Appearance value: <<npc_apprnc[''<<$looking>>'']>>'
+	'Height: <<npc_height[''<<$looking>>'']>>'
+	if npc_gender['<<$looking>>'] = 0:
+		'Gender: male'
+		'Dick thickness: <<$npc_thdick[''<<$looking>>'']>>'
+		'Dick length: <<npc_dick[''<<$looking>>'']>>'
+		'Potential: <<npc_spermpot[''<<$looking>>'']>> (default is 10000)'
+	else
+		'Gender: female'
+		'Breast size: <<npc_bust[''<<$looking>>'']>>'
+	end
+	if npc_herpes['<<$looking>>'] > 0: $npcvendisease += 'herpes; '
+	if npc_syth['<<$looking>>'] > 0: $npcvendisease += 'syphilis; '
+	if npc_gon['<<$looking>>'] > 0: $npcvendisease += 'gonorrhea; '
+	if npc_thrush['<<$looking>>'] > 0: $npcvendisease += 'yeast infection; '
+	if $npcvendisease = '': $npcvendisease = 'none'
+	'Veneral diseases: <<$npcvendisease>>'
+	'Sexual acts with PC: <<npc_sex[''$looking'']>>'
+	'Perversion: <<npc_perv[''$looking'']>>'
+	'Notes: <<$npc_notes[''<<$looking>>'']>>'
+	''
+	'Found relationships:'
+	npctemp = 0
+	:relationshipfinder
+		gs 'DNA','relate', $npc_dna['<<$looking>>'], $npc_dna['A<<npctemp>>']
+		if $gen_relationship ! '' and 'A<<npctemp>>' ! '<<$looking>>':
+			'<br>ID: A<<npctemp>>'
+			'DNA string: <<$npc_dna[''A<<npctemp>>'']>>'
+			'Name: <<$npc_firstname[''A<<npctemp>>'']>> "<<$npc_nickname[''A<<npctemp>>'']>>" <<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
+			'Relationship type: <<$gen_relationship>>'
+		end
+	if npctemp < aarraynumber: npctemp += 1 & jump 'relationshipfinder'
+	killvar 'npctemp'
+	killvar 'npcvendisease'
+	killvar 'looking'
+end

+ 105 - 105
locations/albinahome.qsrc

@@ -9,19 +9,19 @@ if $ARGS[0] = 'gate':
 	act 'Leave':gt 'pav_residential'
 	
     if hour = 23 or hour < 7:
-		'Now isn''t a good time for a house call.'
+		'There are better times for a house call than right now.'
 	elseif hour < 9:
-		'You push a button on the intercom and a female voice blasts through. "What kind of ungodly hour do you call this?! Come back later for a social call!" That must have been her mother.'	
+		'You push a button on the intercom, and a female voice blasts through. "What kind of ungodly hour do you call this?! Come back later for a social call!" That must have been her mother.'	
 	elseif hour <17:
 		if (kanikuli = 0) and (week < 6):
-			'Nobody answers when you buzz the intercom a few times and you decide to leave.'
+			'Nobody answers when you buzz the intercom a few times, and you decide to leave.'
 		else
 			gt 'albinahome', 'mom answers'
 		end
 	elseif hour < 20:
 		gt 'albinahome', 'mom answers'
 	else	
-		if hour >= 9:'You push a button on the intercom and a female voice comes through asking who it is. When you say you''re here to see Albina, she tells you that Albina is currently unavailable and you should come back later.'
+		if hour >= 9:'You push a button on the intercom, and a female voice asks who it is. When you say you''re here to see Albina, she tells you that Albina is unavailable and you should come back later.'
 	end
 	gs 'stat'
 end
@@ -30,12 +30,12 @@ if $ARGS[0] = 'mom answers':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
 	if AlbinaQW['albride'] = 2:
 		AlbinaQW['albride'] = 3
-		'You push a button on the intercom and you''re surprised to hear a somewhat cautious sounding female voice crackle through the speaker as you hear Albina in the background.'
+		'You push a button on the intercom, and you''re surprised to hear a somewhat cautious-sounding female voice crackle through the speaker as you hear Albina in the background.'
 		'The strange voice asks who you are and when she says your name to Albina, Albina gleefully tells you to excuse her mother''s caution and invites you in. The voice apologizes to you as the gate slowly opens.'
 		act 'Walk up the driveway': gt 'albinahome', 'hallway'
 	else
-		'You push a button on the intercom and you hear the familiar voice of Albina''s mother on the other end. You tell her it''s you and she opens the gate.'
-		'"She really enjoys having you come round and visit her you know? It''s good for her to have such a dependable friend to rely on after everything she''s been through." she adds.'
+		'You push a button on the intercom and hear the familiar voice of Albina''s mother on the other end. You tell her it''s you, and she opens the gate.'
+		'"She enjoys having you come round and visit her, you know? It''s good for her to have such a dependable friend to rely on after everything she''s been through," she adds.'
 		act 'Walk up the driveway': gt 'albinahome', 'hallway'
 	end
 end
@@ -56,18 +56,18 @@ if $ARGS[0] = 'hallway':
 		!!First time visiting on your own after she shows you where she lives
 		AlbinaQW['visiting'] = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-		'You walk up the long driveway to the front door and knock. It opens to reveal a woman you estimate to be in her late 30s. She''s very attractive and well dressed, wearing high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
+		'You walk up the long driveway to the front door and knock. It opens to reveal a woman you estimate to be in her late 30s. She''s beautiful and well-dressed. She wears high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
 		'"You must be <<$pcs_firstname>>!" she smiles. "Albina has told me quite a bit about you. All good things, I assure you," she adds with a laugh.'
-		'The woman holds out her hand for you to shake and you do so tentatively. "I''m sorry, and you are...?"'
-		'"Oh! Forgive my rudeness. I''m Albina''s mother, Zoya Petrenko." <i>Albina''s mother??</i> you think, shocked by the introduction.'
-		'"It''s a pleasure to meet you!" you blurt out. "Mrs... Ms... Uhh..." you flounder, realizing she didn''t use Albina''s surname and you''re not sure what to do.'
-		'"Doctor actually," she says, handling it with grace. "But," she continues, holding up her hand. "You can just call me Zoya."'
+		'The woman holds her hand for you to shake, and you do so tentatively. "I''m sorry, and you are...?"'
+		'"Oh! Forgive my rudeness. I''m Albina''s mother, Zoya Petrenko." <i>Albina''s mother??</i> You think, shocked by the introduction.'
+		'"It''s a pleasure to meet you!" you blurt out. "Mrs... Ms... Uhh..." you flounder, realizing she didn''t use Albina''s surname, and you''re unsure what to do.'
+		'"Doctor, actually," she says, handling it with grace. "But," she continues, holding up her hand. "You can just call me Zoya."'
 		'"Oh no! I could-"'
 		'"I insist," she smiles warmly. "Would you like to come inside?"'
 		act 'Continue':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-			'"Albina is in her room right now, I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital so I will just have to leave that to my daughter. If you are a frequent visitor, you might not see me a lot, but do come and say hello if I''m ever home when you visit. It was nice meeting you <<$pcs_firstname>>."'
+			'"Albina is in her room right now. I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital, so I will just have to leave that to my daughter. If you are a frequent visitor, you might not see me often, but do come and say hello if I''m ever home when you visit. It was nice meeting you, <<$pcs_firstname>>."'
 			'She gives a parting smile and closes the door behind her.'
 			act 'Continue': gt 'albinahome', 'bedroom'
 		end
@@ -110,7 +110,7 @@ if $ARGS[0] = 'hallway':
 					!! maid greeting sveta at front door
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/maid.jpg"></center>'
 					'The maid answers the door with a polite smile.'
-					'"Miss Albina is in her room and said you should meet her there." she says before motioning for you to enter and closing the door behind you before returning to her duties.'
+					'"Miss Albina is in her room and said you should meet her there," she says before motioning for you to enter and closing the door before returning to her duties.'
 					act 'Continue': gt 'albinahome', 'bedroom'
 				end
 			else
@@ -118,13 +118,13 @@ if $ARGS[0] = 'hallway':
 				if temp = 1:
 					!! Zoya greets you
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-					'The door opens and you see that it''s Zoya, who smiles at you.'
+					'The door opens, and you see that it''s Zoya, who smiles at you.'
 					'"Please make yourself at home <<$pcs_nickname>>. Albina is up in her room. I''m sure she''ll be thrilled to see you."'
 					act 'Continue': gt 'albinahome', 'bedroom'
 				else
 					!! Albina greets you
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-					'The door flies open and Albina greets you with a rather tight hug.'
+					'The door flies open, and Albina greets you with a tight hug.'
 					'"<<$pcs_nickname>>! Come in, come in," she says while dragging you inside and closing the door.'
 					act 'Continue': gt 'albinahome', 'bedroom'
 				end
@@ -133,7 +133,7 @@ if $ARGS[0] = 'hallway':
 	else
 		!! For leaving the house or going to the bathroom, no random event chances
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
-		'The foyer is well appointed with hardwood flooring, numerous arches and tasteful decor. Lighting is sunk into the exquisite staircase that features wraparound balconies on either side.'
+		'The foyer is well-appointed with hardwood flooring, numerous arches and tasteful decor. Lighting is sunk into the exquisite staircase with wraparound balconies on either side.'
 		'You have been asked not to wander around the house alone, so you''re limited in where you can go.'
 		act 'Go back to town':
 			AlbinaQW['visiting'] = 0
@@ -216,12 +216,12 @@ if $ARGS[0] = 'bedroom':
 	if AlbinaQW['albride'] = 3:
 		AlbinaQW['albride'] = 4
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-		'You head up to Albina''s room and she smiles at you when you walk in. "So you met my mother then? Don''t worry, she''s <i>mostly</i> harmless and actually likes you. So what do you want to do?"'
+		'You head up to Albina''s room, and she smiles at you when you walk in. "So you met my mother then? Don''t worry. She''s <i>mostly</i> harmless and actually likes you. So what do you want to do?"'
 		act 'Hang out': gt $loc, $loc_arg
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-		'You are impressed at how nice Albina''s bedroom looks, the centrepiece being a large double bed covered in soft pillows. A door at the back of the room leads to her en-suite bathroom and she even has a sliding door leading to a balcony that overlooks the nearby lake. A closet full of expensive looking clothes is built into one of the walls.'
-		'By the bed is a small <a href="exec:gt ''albina_house_events'',''night_stand''">night stand</a>, and on a desk is a <a href="exec:gt ''albina_house_events'',''computer''">laptop</a>'
+		'You are impressed at how nice Albina''s bedroom looks, the centrepiece being a large double bed covered in soft pillows. A door at the back of the room leads to her en-suite bathroom, and she even has a sliding door leading to a balcony that overlooks the nearby lake. A closet full of expensive-looking clothes is built into one of the walls.'
+		'By the bed is a small <a href="exec:gt ''albina_house_events'',''night_stand''">nightstand</a>, and on a desk is a <a href="exec:gt ''albina_house_events'',''computer''">laptop</a>'
 		act 'Return to the hallway': gt 'albinahome', 'hallway'
 		act 'Chat with Albina': gt 'albina_chat', 'chat'
 		act 'Talk about video games': gt 'albinahome', 'game'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'dancing':
 	if AlbinaQW['SportHome']  = 0:
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/albinahome/train.mp4"></video></center>'
 		'Albina is training in her room, doing some stretching exercises.'
-		'She''s wearing a pair of skin tight yoga pants that show off her toned body quite well.'
+		'She''s wearing skin-tight yoga pants that show off her toned body quite well.'
 		act 'Ask why she doesn''t train at the gym':
 			*clr & cla
 			AlbinaQW['SportHome']  = 1
@@ -247,8 +247,8 @@ if $ARGS[0] = 'dancing':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 			'"I don''t like the sweaty perverts at the gym staring at my ass, so I prefer training at home instead," she replies.'
-			'You can''t help but stare at her firm, shapely rear as she says that and she grins at you.'
-			'"Eyes up here <<$pcs_nickname>>! Anyway, I could teach you about stripping and poledancing if you want?"'
+			'You can''t help but stare at her firm, shapely rear as she says that, and she grins at you.'
+			'"Eyes up here, <<$pcs_nickname>>! Anyway, if you want, I could teach you about stripping and pole dancing?"'
 			act 'No thanks': AlbinaQW['SportDay'] = daystart & gt 'albinahome', 'bedroom'
 			act 'Teach me stripping': gt 'albinahome', 'stripping'
 			act 'Teach me poledancing': gt 'albinahome', 'poledancing'
@@ -275,7 +275,7 @@ if $ARGS[0] = 'stripping':
 		gs 'stat'
 		'"Okay, we need some space. Follow me." She leads you down to the home gym, where she teaches you how to passionately dance to the music while stripping.'
 
-		if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
+		if pcs_dancero >= 100:'You don''t learn anything new since you already know everything she can teach you.'
 	else
 		gs 'exercise', 'tier3', 120, 'agil', 'danc'
 		gs 'stat'
@@ -294,21 +294,21 @@ if $ARGS[0] = 'poledancing':
 		gs 'exercise', 'tier2', 120, 'stren', 'vital', 'dancpol'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/poledance.jpg"></center>'
-		'Albina leads you down to the home gym, where she teaches you various acrobatic moves on the pole there and the two of you greatly enjoy yourselves.'
+		'Albina leads you to the home gym, where she teaches various acrobatic moves on the pole. The two of you greatly enjoy yourselves.'
 		if pcs_dancpol >= 100: 'You didn''t learn anything new since you already know everything she can teach you.'
 		gs 'albinahome', 'post_workout_shower'
 		act 'Rest':gt 'albinahome', 'bedroom'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
-		'You try your best to follow Albina''s instructions, but you end up smacking your head on the pole instead and fall to the floor.'
-		'You are flat on your back and see Albina kneeling over you. "Are you okay <<$pcs_nickname>>? It looks like you''re still too weak for poledancing, so we need to develop your strength instead."'
-		'You nod at her and she pulls you to your feet before checking your head. "It might bruise, but otherwise you look fine."'
+		'You try your best to follow Albina''s instructions but end up smacking your head on the pole instead and falling to the floor.'
+		'You are flat on your back and see Albina kneeling over you. "Are you okay, <<$pcs_nickname>>? You''re still too weak for pole dancing, so we need to develop your strength instead."'
+		'You nod at her, and she pulls you to your feet before checking your head. "It might bruise, but otherwise, you look fine."'
 		act 'Develop strength (2:00)':
 			*clr & cla
 			gs 'exercise', 'tier2', 120, 'stren', 'vital'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
-			'You silently wonder if these exercises are how she has such a great looking ass.'
+			'You wonder if these exercises are how she has such a great-looking ass.'
 			gs 'albinahome', 'post_workout_shower'
 			act 'Rest':gt 'albinahome', 'bedroom'
 		end
@@ -316,13 +316,13 @@ if $ARGS[0] = 'poledancing':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stripdance.jpg"></center>'
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
-		'Albina grins. "You still can''t strip well enough for poledancing. We should practice that first."'
+		'Albina grins. "You still can''t strip well enough for pole dancing. We should practice that first."'
 		if pcs_danc >= 40:
 			gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 			gs 'stat'
 			'Albina teaches you how to passionately dance to the music while stripping.'
 
-			if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
+			if pcs_dancero >= 100:'You don''t learn anything new since you already know everything she can teach you.'
 		else
 			gs 'exercise', 'tier3', 120, 'agil', 'danc'
 			gs 'stat'
@@ -346,8 +346,8 @@ if $ARGS[0] = 'dressing':
 		pcs_mood += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/dressing.jpg"></center>'
-		'You and Albina open her huge wardrobe and begin digging into her various clothes.'
-		'As you rummage around in her wardrobe, you are amazed by how many different clothes she owns. It feels like her wardrobe is a bottomless pit filled with dresses, skirts, leggings, jeans and all kinds of other expensive looking clothes.'
+		'You and Albina open her vast wardrobe and begin digging into her various clothes.'
+		'As you rummage around in her wardrobe, you are amazed by how many different clothes she owns. Her wardrobe seems like a bottomless pit filled with dresses, skirts, leggings, jeans and other expensive-looking clothes.'
 		'The two of you end up spending an hour trying on various different outfits.'
 		act 'Finish': gt 'albinahome', 'bedroom'
 	end
@@ -359,8 +359,8 @@ if $ARGS[0] = 'game':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'You notice the flat screen TV and a games console sitting in front of it. A row of various Tekken and Mortal Kombat games sit underneath them.' 
-	'"I wish I could afford a console..." you mumble out loud.'
+	'You notice the flat-screen TV and a games console sitting in front of it. A row of various Tekken and Mortal Kombat games sit underneath them.' 
+	'"I wish I could afford a console..." you mumble.'
 	'She smiles at you. "You want to play a few games?"'
 	act 'No':
 		*clr & cla
@@ -368,7 +368,7 @@ if $ARGS[0] = 'game':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		'You shake your head. "Not right now thanks. I just noticed them is all, maybe some other time."'
+		'You shake your head. "Not right now, thanks. I just noticed them, is all. Maybe some other time."'
 		'She shrugs. "Sure. If you ever want to play, all you have to do is ask."'
 		act 'Do something else': gt 'albinahome', 'bedroom'
 	end
@@ -398,7 +398,7 @@ if $ARGS[0] = 'game':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'You shake your head. "Not this time."'
-					'You can tell she is a little disappointed, but she turns her attention to the game. "You are so going to lose!" she laughs. You play games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well I had fun, but there is some stuff I need to take care of." she says as she turns the console off.'
+					'She is a little disappointed but turns her attention to the game. "You are so going to lose!" she laughs. You play games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well, I had fun, but there is some stuff I need to take care of," she says as she turns the console off.'
 					'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
 					act 'Say goodbye and go home':
 						AlbinaQW['visiting'] = 0
@@ -410,7 +410,7 @@ if $ARGS[0] = 'game':
 				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
-			'You and Albina lie down in front of the TV after picking one of the games. You play while chatting about various things and trash talking each other, although neither of you are giving your full attention to the game. You''re just having fun together.'
+			'You and Albina lie down in front of the TV after picking one of the games. You play while chatting about various things and trash-talking each other. However, neither of you are giving your full attention to the game. Instead, you''re just having fun together.'
 			act 'Finish playing': gt 'albinahome', 'bedroom'
 			act 'Keep playing': gt 'albinahome', 'playgame'
 		end
@@ -427,11 +427,11 @@ if $ARGS[0] = 'playgame':
 	npc_rel['A23'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-	'The two of you keep playing video games and trash talking each other, even bumping each other to try and screw each other up, but neither of you are taking it seriously. You mostly just laugh at the silly mistakes you both make while only partially paying attention to the game.'
+	'The two of you keep playing video games and trash-talking, even bumping each other to try and screw each other up. Still, neither of you are taking it seriously. Instead, you mostly just laugh at the silly mistakes you both make while only partially paying attention to the game.'
 	if hotcat >= 5:
 		'Once you finish the game, Albina turns to you instead of starting another one. "How about we see who actually <i>is</i> the better gamer?" she asks with a confident smile.'
 		'You laugh and nod. "Sure, but you''re so going down!"'
-		'She laughs in response. "You''re that sure? Then how about we make it a bit more interesting then?"'
+		'She laughs in response. "You''re that sure? So, how about we make it a bit more interesting then?"'
 		'You arch your brow curiously. "What do you have in mind?"'
 		'She grins at you, gets up and walks over to her dresser. She rummages around in it before pulling out a strapon harness with a large black dildo attached. "The winner gets to use this on the loser... However. They. Want," she says with a smirk.'
 
@@ -448,7 +448,7 @@ if $ARGS[0] = 'playgame':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'You shake your head. "Uhhh... I''m really not interested in doing that."'
-				'Albina puts the strapon away and you can tell she is a little disappointed as she comes back over and lies down beside you again. "You are so going to lose!" she laughs. You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well I had fun, but there''s some stuff I need to take care of." she says as she turns the console off.'
+				'Albina puts the strapon away, and you can tell she is a little disappointed as she comes back over and lies down beside you again. "You are so going to lose!" she laughs. You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well, I had fun, but there''s some stuff I need to take care of," she says as she turns the console off.'
 				'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
 				act 'Say goodbye and go home':
 					AlbinaQW['visiting'] = 0
@@ -480,8 +480,8 @@ if $ARGS[0] = 'game_bet':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 	'You stare at the size of the attached dildo. It''s almost as long and thick as your forearm. "Where did you get that?!" you laugh. "Whatever, you''re on. You''re so going to get fucked!"'
-	'Albina laughs as she brings the strapon over with a bottle of lube and tosses them on the bed next to you before she lies back down beside you and picks her controller up. "Please! You''re so going to lose."' 
-	'She starts the game and you both fall silent, your focus only on winning.'
+	'Albina laughs as she brings the strapon over with a bottle of lube and tosses them on the bed before she lies back beside you and picks her controller up. "Please! You''re so going to lose."' 
+	'She starts the game, and you both fall silent, your focus only on winning.'
 	act 'Play until someone wins':
 		*clr & cla
 		menu_off = 1
@@ -498,16 +498,16 @@ if $ARGS[0] = 'game_bet':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 		if albplay = 3:
-			'She doesn''t even come close to beating you. Before the game can end, she lets out an exacerbated sigh and tosses her controller down in defeat, knowing she has no chance. You give her a gloating smirk as she reaches over and grabs the strapon harness before handing it to you. You both undress and you grin as you slide the harness on.'
+			'She doesn''t even come close to beating you. Before the game can end, she lets out an exacerbated sigh and tosses her controller down in defeat, knowing she has no chance. You give her a gloating smirk as she reaches over and grabs the strapon harness before handing it to you. You both undress, and you grin as you slide the harness on.'
 			act 'Continue': gt 'albinahome', 'wear_strapon'
 		elseif albplay = 2:
-			'It''s close, but in the end you just manage to win the game. "Yes!" you exclaim triumphantly, and she laughs as she grabs the strapon harness and hands it to you. You both undress and you grin as you slide the harness on.'
+			'It''s close, but in the end, you just manage to win the game. "Yes!" you exclaim triumphantly, and she laughs as she grabs the strapon harness and hands it to you. You both undress, and you grin as you slide the harness on.'
 			act 'Continue': gt 'albinahome', 'wear_strapon'
 		elseif albplay = 1:
-			'Although you try your best, Albina proves a worthy opponent and manages to just barely defeat you. Laughing in a mocking and villianous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress and Albina slides the harness on with a smirk on her face.'
+			'Although you try your best, Albina proves a worthy opponent and barely defeats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
 			act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
 		elseif albplay = 0:
-			'Although you try your best, Albina simply outplays you at every turn. You stand no chance and she easily beats you. Laughing in a mocking and villianous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress and Albina slides the harness on with a smirk on her face.'
+			'Although you try your best, Albina simply outplays you at every turn. You stand no chance, and she easily beats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
 			act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
 		end
 		killvar 'gameresult'
@@ -518,7 +518,7 @@ if $ARGS[0] = 'game_bet':
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-		'You''re not sure why, but part of you <i>wants</i> her to use the strapon on you, so you purposefully lose the game. Albina looks at you suspiciously with a raised brow, but smiles and smacks your ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress and Albina slides the harness on with a smirk on her face.'
+		'You''re not sure why, but part of you <i>wants</i> her to use the strap-on on you, so you purposefully lose the game. Albina looks at you suspiciously with a raised brow but smiles and smacks your ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
 		act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
 	end
 end
@@ -527,10 +527,10 @@ if $ARGS[0] = 'wear_strapon':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/game/spank.mp4"></video></center>'
-	'Before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
+	'Before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
 	'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
-	'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
-	'You continue spanking her as hard as you can until the stinging in your hand becomes too much and you have to stop. "That was fucking amazing <<$pcs_nickname>>! I''m so fucking wet after that!" True to her word, you can feel her juices trickling down your leg. "I need you to fuck me just as hard now. Pound me until I cum!" She climbs off of you and you stand to adjust the harness around your hips.' 
+	'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
+	'You continue spanking her as hard as you can until the stinging in your hand becomes too much, and you have to stop. "That was fucking amazing, <<$pcs_nickname>>! I''m so fucking wet after that!" True to her word, you can feel her juices trickling down your leg. "I need you to fuck me just as hard now. Pound me until I cum!" She climbs off of you, and you stand to adjust the harness around your hips.' 
 	gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
 	gs 'stat'
 
@@ -539,7 +539,7 @@ if $ARGS[0] = 'wear_strapon':
 		lesbian += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-		'With the strapon firmly in place, you stand next to the bed and pull her head down to the dildo. "Suck my dick loser!" you giggle.'
+		'With the strapon firmly in place, you stand next to the bed and pull her head down to the dildo. "Suck my dick, loser!" you giggle.'
 		'She laughs before she takes the dildo in her mouth and starts sucking while stroking the shaft with one hand. You spend several minutes making her suck on the dildo, getting it wet with her drool.'
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'stat'
@@ -548,14 +548,14 @@ if $ARGS[0] = 'wear_strapon':
 			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
-			'You pull away until the dildo slides out of her mouth, climb onto the bed next to her and lie on your back. "Come and ride it cowgirl!" you laugh. She straddles you and lowers herself down until the dildo slides easily inside of her wet pussy, causing her to moan in pleasure. She starts riding you slowly, but picks up speed, moaning louder and louder.'
+			'You pull away until the dildo slides out of her mouth, climb onto the bed next to her and lie on your back. "Come and ride it, cowgirl!" you laugh. She straddles you and lowers herself down until the dildo slides easily inside her wet pussy, causing her to moan in pleasure. She starts riding you slowly but picks up speed, moaning louder and louder.'
 			gs 'arousal', 'vaginal_strap_give', 8, 'lesbian'
 			gs 'stat'
 			act 'Fuck her faster':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
-				'You slap her on the ass. "Come on Albina! Ride it like you mean it!" With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before she slides off the dildo, which glistens with her juices, and collapses on the bed next to you. She looks at you with an appreciative smile on her face before she leans over and whispers in your ear.'
+				'You slap her on the ass. "Come on, Albina! Ride it like you mean it!" With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before she slides off the dildo, glistens with her juices, and collapses on the bed next to you. She looks at you with an appreciative smile before she leans over and whispers in your ear.'
 				'"I want you to fuck my ass now..."' 
 				'You grin as she giggles and gets on all fours to wiggle her bubble butt at you.'
 				gs 'arousal', 'vaginal_strap_give', 7, 'lesbian'
@@ -575,18 +575,18 @@ if $ARGS[0] = 'fuck_albina_ass':
 	gs 'boyStat', 'D3'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-	'You grab the bottle of lube and squirt some onto the dildo, rubbing it up and down the shaft until it is very slick before spreading her ass cheeks and applying a generous amount onto her asshole. You grab her ass in your hand and appreciate how firms it feels in your grip.'
-	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is little resistance, and the huge dildo slides into her ass with ease, causing her to moan in pleasure as you go deeper and faster. You look down and admit that her ass is amazing, the dildo being enveloped by her huge, firm cheeks as you thrust in and out of her back door.' 
-	'You wonder what the guys in your class would do to be in your position right now as you continue fucking her ass. After a few minutes, you pull out of her and she looks back over her shoulder at you.'
+	'You grab the bottle of lube and squirt some onto the dildo. You rub it up and down the shaft until it is very slick before spreading her ass cheeks and applying a generous amount onto her asshole. You grab her ass in your hand and appreciate how firm it feels in your grip.'
+	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is little resistance, and the large dildo slides into her ass easily, causing her to moan as you go deeper and faster. You look down and admit that her ass is fantastic, the dildo enveloping her huge, firm cheeks as you thrust in and out of her back door.' 
+	'You wonder what the guys in your class would do to be in your position as you continue fucking her ass. Finally, after a few minutes, you pull out of her, and she looks back over her shoulder at you.'
 	gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 	gs 'stat'
 	act 'Keep fucking her ass':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
-		'"Come on <<$pcs_nickname>>. Put it back in and fuck me... hard," she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. You grab onto her hips and start fucking her balls deep, filling her ass with the entire dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock and she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
-		'After you''ve pulled out, she inserts a few fingers into her gaping hole as juices continue leaking from her pussy. "Oh fuck yes <<$pcs_nickname>>! That was fucking amazing!"'
-		'"Fucking such a nice looking ass was amazing!" you reply and you both laugh.'
+		'"Come on, <<$pcs_nickname>>. Put it back in and fuck me... hard," she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. Next, you grab onto her hips and start fucking her balls deep, filling her ass with the dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock. Finally, she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
+		'After you''ve pulled out, she inserts a few fingers into her gaping hole as juices leak from her pussy. "Oh fuck yes, <<$pcs_nickname>>! That was fucking amazing!"'
+		'"Fucking such a nice-looking ass was amazing!" you reply, and you both laugh.'
 		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 		gs 'stat'
 		act 'Finish': gt 'albinahome', 'strapon_finish'
@@ -600,8 +600,8 @@ if $ARGS[0] = 'receive_strapon':
 	lesbian += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-	'You slide your panties off as she tightens the strapon firmly in place while standing next to the bed. You lie down next to her and she pulls your head down to the dildo. "Suck my dick loser!" she says with a giggle.'
-	'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that <<$pcs_nickname>>!" she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
+	'You slide your panties off as she tightens the strapon firmly while standing next to the bed. You lie next to her, and she pulls your head down to the dildo. "Suck my dick, loser!" she says with a giggle.'
+	'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that, <<$pcs_nickname>>!" she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
 	if stat['think_virgin'] = 1:
@@ -609,7 +609,7 @@ if $ARGS[0] = 'receive_strapon':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-			'You blush deeply and she looks at you. "Oh, right. You haven''t done this before," she says, remembering that you''re still pure.'
+			'You blush deeply, and she looks at you. "Oh, right. You haven''t done this before," she says, remembering that you''re still pure.'
 			'You blush even more. "Yes, I''m... still a virgin..." you reply.'
 			'"Well, I can just fuck your ass if you want?" She then gives you a small smile. "Unless you want me to pop your cherry?"'
 			act 'Just fuck my ass': gt 'albinahome', 'albina_ass_fucks_you'
@@ -618,18 +618,18 @@ if $ARGS[0] = 'receive_strapon':
 				gs 'boyStat', 'D3'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-				'You give her an awkward smile in return. "I... I want you to... take me. My... virginity, that is..." you tell her as your cheeks burn bright red.' 
-				'She smiles back. "Okay, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands and she climbs onto the bed and scoots in between your legs. She rubs your pussy with her fingers to make sure it''s wet enough, but adds some lube to the dildo anyway. You feel it rubbing against your slit before she slowly slides it into your virgin pussy.' 
-				'It''s both painful and pleasurable at the same time and you moan softly as she slowly starts to fuck you. After a few minutes, it starts to hurt less and you find yourself moaning louder.'
+				'You give her an awkward smile in return. "I... I want you to... take me. My... virginity that is..." you tell her as your cheeks burn bright red.' 
+				'She smiles back. "Okay, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs your pussy with her fingers to make sure it''s wet enough but adds some lube to the dildo anyway. You feel it rubbing against your slit before she slowly slides it into your virgin pussy.' 
+				'It''s both painful and pleasurable, and you moan softly as she starts to fuck you. After a few minutes, it starts to hurt less, and you find yourself moaning louder.'
 				*nl
-				'After a few more minutes, Albina starts growing tired and pulls out, leaving you feeling a little empty. "So how was that for your first time?" she asks with a smile.'
-				'"It was amazing! I''m glad it was you I shared it with, you were so gentle and considerate," you reply and Albina smiles even wider.'
+				'After a few more minutes, Albina starts growing tired and pulls out, leaving you empty. "So how was that for your first time?" she asks with a smile.'
+				'"It was amazing! I''m glad it was you I shared it with. You were so gentle and considerate," you reply, and Albina smiles even wider.'
 				'"I couldn''t have your first time being a shitty experience like mine...." she replies, but gasps and looks away when she realises what she said.'
 				*nl
 				'You quickly sit up next to her and give her a hug. "Hey, it''s okay. This was the best thing I could hope for when losing my virginity."'
-				'She looks at you as tears well up in her eyes, the memories of what were clearly a traumatic event flooding back to her. "Really? I wanted it to be good for you because-"'
-				'You can see this is a painful memory for her and pull her into another hug. "I know..." you gently reassure her and you both sit in silence for a few minutes before she gets up and pulls the harness off before cleaning the dildo and tossing it back in the drawer.'
-				'"This is supposed to be your happy memory and I don''t want to ruin it for you. Let''s do something fun!" She clearly needs a distraction, so you nod in agreement.'
+				'She looks at you as tears well up in her eyes, the memories of a traumatic event flooding her. "Really? I wanted it to be good for you because-"'
+				'You can see this is a painful memory for her, and pull her into another hug. "I know..." you gently reassure her, and you both sit silently for a few minutes. Finally, she gets up, takes the harness off, cleans the dildo and tosses it back in the drawer.'
+				'"This is supposed to be your happy memory, and I don''t want to ruin it for you. So let''s do something fun!" She clearly needs a distraction, so you nod in agreement.'
 				gs 'arousal', 'vaginal_strap', 5, 'lesbian'
 				gs 'stat'
 				act 'Continue': gt 'albinahome', 'bedroom'
@@ -641,14 +641,14 @@ if $ARGS[0] = 'receive_strapon':
 			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-			'"Lie on your back and spread your legs." You do as she commands and she climbs onto the bed and scoots in between your legs. She rubs the head of the dildo against your pussy before she pushes it inside you. You moan as she slowly starts fucking your pussy, going a little faster the louder you moan.'
+			'"Lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs the head of the dildo against your pussy before she pushes it inside you. You moan as she slowly starts fucking your pussy, going a little faster the louder you moan.'
 			gs 'arousal', 'vaginal_strap', 8, 'lesbian'
 			gs 'stat'
 			act 'Keep getting your pussy fucked':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
-				'She proceeds to fuck you hard, but not too hard, settling into a near perfect thrusting rhythm that you enjoy, feeling youself slowly getting wetter. She seems to be enjoying it as much as you, moaning softly as she fucks you. She leans in and kisses you before suddenly stopping and pulling out. "Okay, that''s enough of that, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
+				'She proceeds to fuck you hard, but not too hard, settling into a near-perfect thrusting rhythm that you enjoy, feeling yourself slowly getting wetter. She seems to enjoy it as much as you, moaning softly as she fucks you. Finally, she leans in and kisses you before suddenly stopping and pulling out. "Okay, that''s enough, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
 				gs 'arousal', 'vaginal_strap', 7, 'lesbian'
 				gs 'stat'
 				act 'Take it up the ass': gt 'albinahome', 'albina_ass_fucks_you'
@@ -665,7 +665,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-				'Thoughts race through your head as you look at the huge dildo, and Albina notices your hesitation.'
+				'Thoughts race through your head as you look at the massive dildo, and Albina notices your hesitation.'
 				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
 				'You shake your head as you feel your cheeks burning bright red. "Uhh... No, I haven''t..."'
 				'She places a hand on your shoulder. "Hey, it''s nothing to be embarrassed about. Plenty of girls don''t do anal."'
@@ -684,9 +684,9 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
 				'You feel your cheeks burning bright red. "Well, I''ve managed to take a fist..."'
 				*nl
-				'Albina looks at you in what you can only describe as awe. "God damn <<$pcs_nickname>>, even I''ve never taken a fist up my ass and I''m the queen of butt stuff!"'
+				'Albina looks at you in what you can only describe as awe. "God damn, <<$pcs_nickname>>, even I''ve never taken a fist up my ass, and I''m the queen of butt stuff!"'
 				'"Is it weird to do that?" you ask with concern.'
-				'"No, not at all! To be honest, I''ve always wanted to try it, but I''ve never found anyone interested in doing it. Maybe that''s about to change..."'
+				'"No, not at all! I''ve always wanted to try it, but I''ve never found anyone interested in it. But, maybe that''s about to change..."'
 				'She looks you over with lustful desire before continuing. "Practicing with a dildo makes your first butt fuck easier, but a whole fucking hand?! A cock or dildo would be a breeze for you!"'
 				'She then places a hand on your shoulder. "<<$pcs_nickname>>, be honest with me. Do you want me to fuck your ass? I''ll be as gentle as you want."'
 				act 'Yes': gt 'albinahome', 'first_anal1'
@@ -699,7 +699,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-				'Thoughts race through your head as you look at the huge dildo, and Albina notices your hesitation.'
+				'Thoughts race through your head as you look at the massive dildo, and Albina notices your hesitation.'
 				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
 				'You feel your cheeks burning bright red. "Well, I''ve used a dildo..."'
 				*nl
@@ -717,14 +717,14 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 			lesbian += 1
 			gs 'boyStat', 'D3'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-			'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts some on the dildo and strokes the shaft with it before she massages a generous amount into your asshole with her fingers. You and the dildo now lubed up, she moves behind you and you feel the dildo pressing against your asshole, the pressure building until the tip pops into your ass, causing you to groan slightly in pain. She slowly starts to slide the dildo up your ass, steadily working it deeper.'
+			'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts some on the dildo and strokes the shaft with it before she massages a generous amount into your asshole with her fingers. You and the dildo now lubed up, she moves behind you, and you feel the dildo pressing against your asshole, the pressure building until the tip pops into your ass, causing you to groan slightly in pain. Next, she slowly slips the dildo up your ass, steadily working it deeper.'
 			gs 'arousal', 'anal_strap', 5, 'lesbian'
 			gs 'stat'
 
 			act 'Get your ass hammered':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
-				'Once you''re comfortable with her in your ass, she stands up over you. "Get ready, because now I''m <i>really</i> going to fuck your ass!" she laughs before she starts slamming the full length of the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.' 
+				'Once you''re comfortable with her in your ass, she stands up over you. "Get ready because now I''m really going to fuck your ass!" she laughs before slamming the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough, and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.' 
 				'Just as it''s starting to hurt, she lets out a loud, pleasured scream as you feel her juices spraying across your legs. You then feel the dildo slide out of you and turn to see Albina sprawled out on the bed in orgasmic bliss, her juices slowly trickling out of her soaking wet pussy as a huge wet patch soaks into the sheets. "You were such a good little buttslut, <<$pcs_nickname>>..." she says softly.'
 				'After riding through her orgasm, she pulls the harness off and tosses it aside.'
 				gs 'arousal', 'anal_strap', 10, 'lesbian'
@@ -742,28 +742,28 @@ if $ARGS[0] = 'first_anal':
 	lesbian += 1
 	gs 'boyStat', 'D3'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-	'"Y-yes, I would. Just promise you''ll be gentle," you reply and Albina smiles.'
-	'"I will. Now get on all fours and bring your ass up as high as you can."'
-	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole and Albina starts massaging it in before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
+	'"Y-yes, I would. Just promise you''ll be gentle," you reply, and Albina smiles.'
+	'"I will. Get on all fours and bring your ass up as high as possible."'
+	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole. Albina starts massaging it before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
 	'After spending a few minutes fingering you, she pulls her finger out. "Okay, that should be enough. Are you sure you want to do this, <<$pcs_nickname>>? Just because I''m a buttslut doesn''t mean you have to be one too."'
-	'You stare at the dildo hanging between her legs, but steel yourself and nod. "Yes, I want to do this. Just go slow please?"'
+	'You stare at the dildo hanging between her legs but steel yourself and nod. "Yes, I want to do this. Just go slow, please?"'
 	gs 'arousal', 'anal_finger', 5, 'lesbian'
 	gs 'stat'
 
 	act 'Get your ass fucked':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-		'Your heart races as you feel Albina moving in behind you. You instinctively tense up when you feel the head of the dildo pressing against your asshole. "Okay <<$pcs_nickname>>, this is going to feel strange and definitely hurt a little, but you''re going to have to try and relax as best as you can for me," Albina tells you, and you grip the sheets tightly as you do what she says.' 
-		'You feel her start slowly pushing and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation and you instinctively feel the urge to pull yourself free. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
-		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her and she nods.'
+		'Your heart races as you feel Albina moving in behind you. You instinctively tense up when you feel the head of the dildo pressing against your asshole. "Okay, <<$pcs_nickname>>, this is going to feel strange and definitely hurt a little, but you''re going to have to try and relax as best as you can for me," Albina tells you. You grip the sheets tightly as you do what she says.' 
+		'You feel her start slowly pushing, and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation, and you instinctively feel the urge to free yourself. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
+		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her, and she nods.'
 		*nl
-		'After taking a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the already slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
-		'You nod and prepare yourself as you feel Albina start slowly pushing the dildo deeper into your ass. You feel yourself being stretched out as she reaches a depth she feels you''ll be comfortable with and starts gently thrusting.'
-		'Despite the shallow depth and Albina being gentle, the pain becomes too much after a few minutes and you ask her to pull out. You sit up on your knees and clutch your ass cheeks in your hands as pain pulses through your stretched asshole.'
+		'After a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
+		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass. You feel stretched out as she reaches a depth she feels you''ll be comfortable with and starts gently thrusting.'
+		'Despite the shallow depth and Albina being gentle, the pain becomes too much after a few minutes, and you ask her to pull out. You sit on your knees and clutch your ass cheeks in your hands as pain pulses through your stretched asshole.'
 		'"You lasted longer than I thought you would. Not bad for your first go, <<$pcs_nickname>>," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
 		*nl
-		'You slowly get dressed as the stinging pain continues to pulse through your ass. Albina watches with an amused grin. "Don''t worry, it gets less painful the more you do it."'
-		'"You would know," you reply with a smirk and she laughs.'
+		'As the stinging pain continues to pulse through your ass, you slowly get dressed. Albina watches with an amused grin. "Don''t worry. It gets less painful the more you do it."'
+		'"You would know," you reply with a smirk, and she laughs.'
 		gs 'arousal', 'anal_strap', 10, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -778,22 +778,22 @@ if $ARGS[0] = 'first_anal1':
 	lesbian += 1
 	gs 'boyStat', 'D3'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-	'"Yes, I would," you reply and Albina smiles.'
-	'"Okay, get on all fours and bring your ass up as high as you can."'
-	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole and Albina starts massaging it in before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
+	'"Yes, I would," you reply, and Albina smiles.'
+	'"Okay, get on all fours and bring your ass up as high as possible."'
+	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole. Albina starts massaging it before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
 	'After spending a few minutes fingering you, she pulls her finger out. "Okay, that should be enough. Are you sure you want to do this, <<$pcs_nickname>>? Just because I''m a buttslut doesn''t mean you have to be one too."'
-	'You stare at the dildo hanging between her legs, but steel yourself and nod. "Yes, I want to do this."'
+	'You stare at the dildo hanging between her legs but steel yourself and nod. "Yes, I want to do this."'
 	gs 'arousal', 'anal_finger', 5, 'lesbian'
 	gs 'stat'
 
 	act 'Get your ass fucked':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-		'Your heart is racing even though you know what to expect. Albina presses the tip of the dildo against your asshole and you feel the familiar sensation of the pressure building as she pushes forward until the tip of the dildo suddenly pops into your ass, causing you to groan. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks.'
+		'Your heart is racing even though you know what to expect. Albina presses the tip of the dildo against your asshole, and you feel the familiar sensation of the pressure building as she pushes forward until the dildo suddenly pops into your ass, causing you to groan. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks.'
 		*nl
-		'After taking a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the already slick dildo before placing her hands on your hips. "Okay, just tell me if it gets too painful for you."'
-		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass and starts thrusting.'
-		'Having had your ass penetrated before, Albina goes a little faster and deeper than you think she normally would have. However, the sensation of actually being buttfucked is still new to you and you soon ask her to stop when it becomes too much.'
+		'After a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just tell me if it gets too painful for you."'
+		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass and start thrusting.'
+		'Having had your ass penetrated before, Albina goes faster and deeper than you think she usually would have. However, the sensation of being buttfucked is still new to you, and you soon ask her to stop when it becomes too much.'
 		*nl
 		'"Not bad for your first go, <<$pcs_nickname>>. I bet the prior ''practice'' helped," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
 		'You slowly get dressed as Albina watches with an amused grin. "It feels great, doesn''t it? It gets better the more you do it."'
@@ -812,9 +812,9 @@ if ARGS[0] = 'anal_refuse':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 	'You shake your head. "No, I don''t think I''m ready for that yet."'
-	'Albina smiles. "That''s okay, but if you do want to do it with me or just want some advice, then just ask. It''s best to get help from someone with... experience on the matter," she says with a grin.'
+	'Albina smiles. "That''s okay, but if you want to do it with me or want some advice, then just ask. It''s best to get help from someone with... experience on the matter," she says with a grin.'
 	'You grin back. "I''ll be sure to ask the master buttslut for any of her wisdom."'
-	'She punches you on the arm. "Damn right you will."'
+	'She punches you in the arm. "Damn right, you will."'
 	act 'Do something else' :gt 'albinahome', 'bedroom'
 end
 
@@ -826,17 +826,17 @@ if $ARGS[0] = 'strapon_finish':
 	gs 'stat'
 	if rand(0,3) = 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
-		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she gives you a sly smile and moves into position to start scissoring you. Before she can, her phone buzzes and she looks at it before frowning in disappointment. "Sorry, but I need to go <<$pcs_nickname>>. I''ll see later?"'
+		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she gives you a sly smile and moves into position to start scissoring you. Before she can, her phone buzzes, and she looks at it before frowning in disappointment. "Sorry, but I need to go, <<$pcs_nickname>>. I''ll see you later?"'
 		'You nod in understanding. "Sure, not a problem. I had fun."'
-		'You share a final kiss with each other before you both quickly get dressed. She wipes the dildo clean and shoves it back in the drawer before ushering you out of her room. She walks with you into town before leaving you to attend to her business.'
+		'You finally kiss each other before you both quickly get dressed. She wipes the dildo clean and shoves it back in the drawer before ushering you out of her room. She walks with you into town before leaving you to attend to her business.'
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Finish':gt 'pav_residential'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
-		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she collapses next to you and you both just lie naked on her bed in silence. She eventually gets up and cleans the dildo before shoving it back in the drawer and getting dressed.'
-		'You get dressed yourself and when you finish, she smiles at you. "Okay, what do you want to do now?" she asks.'
+		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she collapses next to you, and you both just lie naked on her bed in silence. She eventually gets up and cleans the dildo before shoving it back in the drawer and getting dressed.'
+		'You get dressed, and when you finish, she smiles at you. "Okay, what do you want to do now?" she asks.'
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'

+ 16 - 16
locations/alexandriaSex.qsrc

@@ -6,6 +6,7 @@ $location_type = 'indoors'
 
 if $ARGS[0] = 'nice1':
 	*clr & cla
+	$orgasm_or = 'no'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/N1.jpg"></center>'
@@ -18,7 +19,7 @@ if $ARGS[0] = 'nice1':
 
 	act '"Your turn Aleksei"':
 		*clr & cla
-		gs 'arousal', 'clit_finger', 5
+		gs 'arousal', 'clit_finger', 5, 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/N2.jpg"></center>'
 		'He only answers with a raised eyebrow and an amused half-smile before taking your dominant hand towards his lips, lightly kissing your fingers.'
@@ -29,8 +30,9 @@ if $ARGS[0] = 'nice1':
 
 		act '"Stop teasing me!"':
 			*clr & cla
-			gs 'arousal', 'foreplay', 5
-			gs 'arousal', 'cuni', 5
+			gs 'arousal', 'foreplay', 5, 'lesbian'
+			$orgasm_or = 'yes'
+			gs 'arousal', 'cuni', 5, 'lesbian', 'no_orgasm_msg'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/N3.jpg"></center>'
 			'When you try to play with your trapped cunt, he slaps your hand and forcefully takes it away.'
@@ -53,7 +55,7 @@ if $ARGS[0] = 'nice1':
 
                 act 'It''s his turn':
 					*clr & cla
-					gs 'arousal', 'cuni_give', 10
+					gs 'arousal', 'cuni_give', 10, 'lesbian'
 					gs 'arousal', 'end'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/N5.jpg"></center>'
@@ -74,8 +76,6 @@ if $ARGS[0] = 'nice1':
 						pcs_sweat = 0
 						pcs_breath = 1
 						girl += 1
-						lesbian += 1
-						orgasm += 1
 						if succubusflag = 1:
 							scfeed = succublvl + rand(1,4)
 							sexnutrition += 100 * scfeed
@@ -103,8 +103,9 @@ end
 
 if $ARGS[0] = 'grumpy1':
 	*clr & cla
-	gs 'arousal', 'massage', 5, 'sub'
-	gs 'arousal', 'BDSM', 5, 'sub'
+	$orgasm_or 'no'
+	gs 'arousal', 'massage', 5, 'sub', 'lesbian'
+	gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G1.jpg"></center>'
 	'You find yourself tied in bondage gear with a ball gag in your mouth kneeling in the center of a bare-bones room, looking directly at assorted tools that you can barely recognize. Some are piercing equipment that are used for body modification, others seem surgical and the rest look like they were taken from a toolbox.'
@@ -116,8 +117,8 @@ if $ARGS[0] = 'grumpy1':
 
 	act 'He slaps you':
 		*clr & cla
-		gs 'arousal', 'massage', 5, 'sub'
-		gs 'arousal', 'BDSM', 5, 'sub'
+		gs 'arousal', 'massage', 5, 'sub', 'lesbian'
+		gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G2.jpg"></center>'
 		'You are quivering under Aleksei ministrations when the strike comes. He smacks your exposed breasts several times, turning your gagged moans into silent screams. When you instinctively try to get away from him, one of his hands darts towards your hair, locking you painfully in position.'
@@ -128,8 +129,9 @@ if $ARGS[0] = 'grumpy1':
 
 		act 'The torture continues':
 			*clr & cla
-			gs 'arousal', 'vaginal_finger', 5, 'sub'
-			gs 'arousal', 'BDSM', 5, 'sub'
+			gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
+			$orgasm_or 'yes'
+			gs 'arousal', 'vaginal_finger', 5, 'sub', 'lesbian', 'no_orgasm_msg'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G3.jpg"></center>'
 			'Finally, after who knows how long, Aleksei breaks away from you and stands up, looking down at you with a critical eye as he drags slowly on a cigarette, the silence eternalizing as you kneel before him.'
 			'"You have done well, my new pet."'
@@ -153,8 +155,8 @@ if $ARGS[0] = 'grumpy1':
 
                 act 'It''s his turn':
 					*clr & cla
-					gs 'arousal', 'cuni_give', 10, 'sub'
-					gs 'arousal', 'BDSM', 5, 'sub'
+					gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
+					gs 'arousal', 'cuni_give', 10, 'sub', 'lesbian'
 					gs 'arousal', 'end'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G5.jpg"></center>'
@@ -180,8 +182,6 @@ if $ARGS[0] = 'grumpy1':
 						pain['wrists'] +=5
 						pain['ankles'] +=5
 						girl += 1
-						lesbian += 1
-						orgasm += 1
 						if succubusflag = 1:
 							scfeed = succublvl + rand(1,4)
 							sexnutrition += 50 * scfeed

+ 4 - 4
locations/anushkachat.qsrc

@@ -618,7 +618,7 @@ if $ARGS[0] = 'boyfriend_chat':
 					act 'Maybe':
 						*clr & cla
 						minut += 5
-						anushkaQW['fedor_3some']
+						anushkaQW['fedor_3some'] = 1
 						npc_rel['A144'] += 1
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
@@ -632,7 +632,7 @@ if $ARGS[0] = 'boyfriend_chat':
 					act 'I will ask him':
 						*clr & cla
 						minut += 5
-						anushkaQW['fedor_3some']
+						anushkaQW['fedor_3some'] = 1
 						npc_rel['A144'] += 1
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
@@ -698,7 +698,7 @@ if $ARGS[0] = 'boyfriend_chat':
 					*clr & cla
 					minut += 5
 					npc_rel['A144'] += 1
-					artemQW['nush3some_ask'] += 1
+					artemQW['nush3some_ask'] = 1
 					gs 'stat'
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
@@ -713,7 +713,7 @@ if $ARGS[0] = 'boyfriend_chat':
 					*clr & cla
 					minut += 5
 					npc_rel['A144'] += 1
-					artemQW['nush3some_ask'] += 1
+					artemQW['nush3some_ask'] = 1
 					gs 'stat'
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'

+ 2 - 2
locations/artem_sex.qsrc

@@ -599,7 +599,7 @@ if $ARGS[0] = 'anushka_3some_oral1':
 	gs 'arousal', 'erotic_sex', 2, 'dom'
 	gs 'stat'
 	if artemQW['nushart_oral'] <= 1:
-		act 'Eat her out': gt 'artem_sex', 'anushka_3some_oral1'
+		act 'Eat her out': gt 'artem_sex', 'anushka_3some_oral2'
 	else
 		act 'Give Artem a blowjob': gt 'artem_sex', 'anushka_3some_bj'
 	end
@@ -614,7 +614,7 @@ if $ARGS[0] = 'anushka_3some_oral2':
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
 	if artemQW['nushart_oral'] <= 1:
-		act 'Make Artem eat her out': gt 'artem_sex', 'anushka_3some_oral2'
+		act 'Make Artem eat her out': gt 'artem_sex', 'anushka_3some_oral1'
 	else
 		act 'Give Artem a blowjob': gt 'artem_sex', 'anushka_3some_bj'
 	end

+ 1 - 1
locations/brother.qsrc

@@ -988,8 +988,8 @@ if $ARGS[0] = 'brother_voyeur_ev2':
 	menu_off = 1
 	gs 'stat'
 	temp_var = rand(5,10)
-	minut += temp_var
 	gs 'arousal','foreplay', temp_var
+	killvar 'temp_var'
 	picrand = rand(1,7)
 	if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/c (<<picrand>>).jpg"></center>'

+ 3 - 3
locations/brother_voyeur_sex.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'brother_shower_bj':
 						end
 					end
 
-					if trt_cumeater = 1:
+					if trait['cumeater'] = 1:
 						act'I didn''t want to waste it':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershower.jpg"></center>'
@@ -851,7 +851,7 @@ if $ARGS[0] = 'shower_swallow':
 			end
 		end
 
-		if trt_cumeater = 1:
+		if trait['cumeater'] = 1:
 			act'"Tasty!"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershower.jpg"></center>'
@@ -1148,7 +1148,7 @@ if $ARGS[0] = 'shower_facial':
 			end
 		end
 
-		if trt_cumeater = 1:
+		if trait['cumeater'] = 1:
 			act'Feels like a waste':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facial2.jpg"></center>'

+ 36 - 36
locations/camera.qsrc

@@ -123,7 +123,7 @@ $camera_people['eugene'] = {
 if $ARGS[0] = 'start':
 	*clr & cla
 	'<center><img src="images/pc/items/accessories/camera.jpg"></center>'
-	'You can''t help but smile as you check your camera. You love capturing life as it happens, but can be hard to decide exactly who or what you want to take photographs of.'
+	'You can''t help but smile as you check your camera. You love capturing life as it happens, but it can take time to decide precisely who or what you want to take photographs of.'
 	'You spend a few minutes thinking about places and people that might make for interesting subjects. Perhaps...'
 	*nl
 	! Get the number of locations in the array
@@ -198,30 +198,30 @@ if $ARGS[0] = 'eugene':
 	npc_rel['A89'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big89.jpg"></center>'
 	'"Hey, can I ask you something?"'
-	'She smiles and nods. "Sure. What is it sweetie?"'
+	'She smiles and nods. "Sure. What is it, sweetie?"'
 	'"Can I take your photo?"'
 	'"Sure thing, sweetie." She stops to let you take a photo, misunderstanding what you meant.'
 	'You shake your head and pull out your camera. "No, I meant with this."'
 	'She looks a little surprised and sheepish. "Oh! Are you working on becoming a photographer?"'
 	*nl
 	'You nod. "Yes, I just need more practice. Which is where you come in."'
-	'She laughs softly. "Okay, why not? I havn''t taken a break yet today. We can go to my place and you can take my picture there. Sound good?"'
-	'You nod. "Sure, that works for me." She tells her sister that she''s taking a break and leads you out of the cafe to her apartment building. She leads you upstairs and into her apartment. Once inside, you take out your camera.'
+	'She laughs softly. "Okay, why not? I haven''t taken a break yet today. So we can go to my place, and you can take my picture there. Sound good?"'
+	'You nod. "Sure, that works for me." She tells her sister she''s taking a break and leads you out of the cafe to her apartment building. She leads you upstairs and into her apartment. Once inside, you take out your camera.'
 	act 'Start taking her picture': gt 'eugeneev1', 'photography'
 end
 
 if $ARGS[0] = 'mother':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-	'You take our your camera. "Hey <<$npc_nickname[''A29'']>>, do you mind if I take your photograph for my portfolio?"'
+	'You take out your camera. "Hey, <<$npc_nickname[''A29'']>>, do you mind if I take your photograph for my portfolio?"'
 	'She frowns at you. "Where did you get that camera?"'
-	'You shrug a little. "I saved up and bought it. Please? I need the practice and I think you would make a great subject."'
+	'You shrug a little. "I saved up and bought it. Please? I need the practice, and I think you would make a great subject."'
 	'She shakes her head. "Seems like a waste of money to me."'
-	'You sigh. "I love doing it, plus I can make a living from it. Please?"'
+	'You sigh. "I love doing it, and I can make a living. Please?"'
 	*nl
 	'She sighs. "Fine, but I still think it''s a waste of time."'
 	'You nod. "I know. Let''s go outside."'
-	'"I don''t have time for that, just take my picture." she sternly replies'
+	'"I don''t have time for that. Just take my picture." she sternly replies.'
 	'"Please?" you plead.'
 	'She shakes her head. "Fine. The things I do for you kids..."'
 	act 'Take her photo':
@@ -233,9 +233,9 @@ if $ARGS[0] = 'mother':
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/1.jpg"></center>'
 		'You go outside and have her stand in a few poses around the courtyard before finally settling on her standing in front of some flowers. "I got it!"'
 		'She walks over to you. "Finally. Now I can get back to the housework."'
-		'You show her the photos you took and the one you finally decided on. "Here look, this one here is the one I will use for my portfolio."'
-		'She smiles. "They do look nice... I still say it''s a waste of time though."'
-		'You roll your eyes. "I know <<$npc_nickname[''A29'']>>." you reply as she walks back inside.'
+		'You show her your photos and the one you finally decided on. "Here, look, this is the one I will use for my portfolio."'
+		'She smiles. "They do look nice... I still say it''s a waste of time, though."'
+		'You roll your eyes. "I know, <<$npc_nickname[''A29'']>>," you reply as she walks back inside.'
 		act 'Put your camera away': gt 'pav_complex', 'start'
 	end
 end
@@ -245,7 +245,7 @@ if $ARGS[0] = 'anya':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_05.jpg"></center>'
 	'You climb off the bed and grab your camera off your desk. "Hey, do you mind if I take your photograph for my portfolio?"'
 	'She smiles. "What is it with you and that camera?"'
-	'You shrug a little. "I just love doing it. If I get good enough I could do it for a living. So please? I need the practice and I think you would make a great subject."'
+	'You shrug a little. "I just love doing it. If I get good enough, I could do it for a living. So, please? I need the practice, and I think you would make a great subject."'
 	'She giggles. "Fine, but something classy."'
 	'You nod. "Deal."'
 	act 'Take her photo':
@@ -257,9 +257,9 @@ if $ARGS[0] = 'anya':
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/2.jpg"></center>'
 		'You direct her to lie on the bed in several poses, then stand in various spots around the room before you finally find the perfect image. Once you''ve taken it, you sit down on the bed. "I got it."'
 		'She sits down next to you. "Let me see."'
-		'You show her the photos you took and the one you finally decided on. "You sure my ass doesn''t look fat in this? I think it looks fat." she says with a pout.'
+		'You show her your photos and the one you finally decided on. "You sure my ass doesn''t look fat in this? I think it looks fat," she says with a pout.'
 		'You shake your head and reassure her. "Your ass looks perfect. That''s why I took this photo. Trust me."'
-		'"Fine!" she pouts before sits back down on her bed. You put your camera away and join her.'
+		'"Fine!" she pouts before sitting back down on her bed. You put your camera away and join her.'
 		act 'Finish': gt 'sister_chat', 'sister_chat'
 	end
 end
@@ -277,7 +277,7 @@ if $ARGS[0] = 'lazar':
 		portfolio_people[3] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/3.jpg"></center>'
-		'You watch as he starts showing off his skills, pretending to be teaching them, but you''re fairly sure he''s just showing off for you. You start taking several photos of him and they''re looking pretty good. He then suddenly pulls off his shirt and you keep taking photographs as you try to remain focused. You finally get the shot you want and put your camera away before giving Lazar a wave. He returns the wave as you leave.'
+		'You watch as he starts showing off his skills, pretending to be teaching them, but you''re reasonably sure he''s just showing off for you. You begin taking several photos of him, and they''re looking pretty good. He then suddenly pulls off his shirt, and you keep taking photographs as you try to remain focused. You finally get the shot you want and put your camera away before giving Lazar a wave. He returns the wave as you leave.'
 		act 'Walk off the pitch': gt 'gschool_grounds', 'sports'
 	end
 end
@@ -289,7 +289,7 @@ if $ARGS[0] = 'city_library':
 	portfolio_locations[1] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'You make your way over to the city library. It is a grand building and would make for a wonderful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'You make your way over to the city library. It is a grand building and would make for a beautiful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -300,7 +300,7 @@ if $ARGS[0] = 'city_uni':
 	portfolio_locations[2] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'You make your way over to the university. It is a grand building and would make for a wonderful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice all the students moving around and feel that they would make for a great photo as well. You stop and take several more photos of the students before stopping. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'You make your way over to the university. It is a grand building and would make for a beautiful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice all the students moving around and feel they would make for a great shot. You stop and take several more photos of the students before stopping. You''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'gadukino':
 	portfolio_locations[4] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in the village, you realize what a wonderful photograph this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice the houses and feel that they would make for a great photo as well. You stop and take several photos of different houses before finally settling on your grandparents home. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in the village, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. You can''t help but notice the houses and feel that they would also make for a great photo. You stop and take several pictures of different places before finally settling on your grandparents'' home. You''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -322,7 +322,7 @@ if $ARGS[0] = 'gadforest':
 	portfolio_locations[6] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in the forest, you are amazed by how breathtakingly beautiful it is out here. You walk around taking photos of the trees until you''re happy and check all the photos you''ve taken. You feel confident that you''ve found something to add to your portfolio and put your camera away.'
+	'Standing in the forest, you are amazed by how breathtakingly beautiful it is. You take photos of the trees until you''re happy and check all the shots you''ve taken. Finally, you feel confident that you''ve found something to add to your portfolio and put your camera away.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -333,7 +333,7 @@ if $ARGS[0] = 'pav_church':
 	portfolio_locations[12] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in front of the local church, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You then spot the cemetery and walk over to take some photos of it as well. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the local church, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. You then spot the cemetery and take some photos of it. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -344,7 +344,7 @@ if $ARGS[0] = 'pav_train_hall':
 	portfolio_locations[8] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in front of the local train station, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the local train station, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -355,7 +355,7 @@ if $ARGS[0] = 'pav_complex':
 	portfolio_locations[7] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in the courtyard, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in the courtyard, you realize this place would make a wonderful photo. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -366,7 +366,7 @@ if $ARGS[0] = 'pav_school':
 	portfolio_locations[9] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in front of the school, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the school, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -377,7 +377,7 @@ if $ARGS[0] = 'pav_park':
 	portfolio_locations[10] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Walking through the park, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Walking through the park, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -388,10 +388,10 @@ if $ARGS[0] = 'pav_lake':
 	portfolio_locations[11] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'As you look out over the lake, you realize what a wonderful photo this place would make. You walk around the shore several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'As you look out over the lake, you realize what a wonderful photo this place would make. You walk around the shore several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 	if soniaPS > 0 and sunWeather = 1 and temp > 15 and hour > 6 or hour < 22:
-		'Just as you''re about to put your camera away, you notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia and she appears to be alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
+		'Just as you''re about to put your camera away, you notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia, and she appears alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
 		gs 'camera', 'pav_lake_sonia'
 	else
 		act 'Put your camera away': gt $loc, $loc_arg
@@ -399,14 +399,14 @@ if $ARGS[0] = 'pav_lake':
 end
 
 if $ARGS[0] = 'pav_lake_sonia':
-	if $ARGS[1] = 'describe': 'You notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia and she appears to be alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
+	if $ARGS[1] = 'describe': 'You notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia, and she appears alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
 	act 'Take her photograph':
 		*clr & cla
 		camera_found['sonia'] = 1
 		gs 'exp_gain', 'photoskl', rand(1,2)
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo1.jpg"></center>'
-		'You get a little closer and start taking her photograph, moving around and taking a number of shots from different angles before she suddenly sits up and looks in your direction.'
+		'You get a little closer and start taking her photograph, moving around and taking several shots from different angles before she suddenly sits up and looks in your direction.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		act 'Caught':
@@ -414,11 +414,11 @@ if $ARGS[0] = 'pav_lake_sonia':
 			gs 'exp_gain', 'photoskl', rand(1,2)
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo2.jpg"></center>'
-			'She covers herself up and looks at you in surprise. "What the fuck <<$pcs_nickname>>?! What are you doing?"'
-			'You smile and take another photo of her. "Sorry, I was just taking your photo. You''re just so beautiful and I couldn''t help myself."'
+			'She covers herself up and looks at you in surprise. "What the fuck, <<$pcs_nickname>>?! What are you doing?"'
+			'You smile and take another photo of her. "Sorry, I was just taking your photo. You''re just so beautiful, and I couldn''t help myself."'
 			'She smiles at the compliment. "Really?"'
 			'You nod as you take another photo of her. "Yes, now why don''t you get up and stop covering up?"'
-			'She smiles even more. "Okay, but just a few." She gets up on her knees and removes her hands, giving you a nice shot of her topless body.'
+			'She smiles even more. "Okay, but just a few." Then, she gets up on her knees and removes her hands, giving you a nice shot of her topless body.'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Take more photos':
@@ -427,7 +427,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 				gs 'exp_gain', 'photoskl', rand(1,2)
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo3.jpg"></center>'
-				'She is a little awkward at first, not knowing what to do, but as you continue taking more photos, she starts to relax and become more natural in her poses. She even starts to get into it herself and enjoying it.'
+				'She is a little awkward at first, not knowing what to do, but as you take more photos, she starts to relax and become more natural in her poses. She even starts to get into it herself and enjoys it.'
 				act 'Take more photos':
 					*clr & cla
 					gs 'exp_gain', 'photoskl', rand(1,2)
@@ -451,11 +451,11 @@ if $ARGS[0] = 'pav_lake_sonia':
 							portfolio_people[4] = 1
 							gs 'stat'
 							'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo6.jpg"></center>'
-							'You continue taking photos of her now naked body and start getting a lot closer to her. The longer it goes on, the more turned on she seems to get, eventually playing with her pussy. Finally, having taken several dozen photos, you feel that you''ve taken enough and stop. "Thanks Sonia, I got what I needed."'
-							'She frowns before bobbing her head slightly and smiling. "It was my pleasure, I really liked it. M-Maybe we can do it again sometime?" You can hear her shy sweet former self coming out.'
-							'You feel bad for her, knowing that almost nobody talks to her anymore. "Yeah sure, I would like that."'
+							'You continue taking photos of her naked body and start getting closer to her. The longer it goes on, the more turned on she seems to get, eventually playing with her pussy. Finally, having taken several dozen photos, you feel you''ve taken enough and stop. "Thanks, Sonia. I got what I needed."'
+							'She frowns before bobbing her head slightly and smiling. "It was my pleasure. I really liked it. M-Maybe we can do it again sometime?" You can hear her shy, sweet former self coming out.'
+							'You feel bad for her, knowing that almost nobody talks to her anymore. "Yeah, sure, I would like that."'
 							'She breaks into a huge smile and looks happier than you''ve seen her in a long time. "Okay, just let me know or maybe stop by my house sometime?"'
-							'You nod. "I will, but for now I''ve got all I need. I''ll let you get back to sunbathing. Thanks again." She smiles and gets dressed as you put your camera away.'
+							'You nod. "I will, but I''ve got all I need now. I''ll let you get back to sunbathing. Thanks again." She smiles and gets dressed as you put your camera away.'
 							gs 'arousal', 'voyeur', 5
 							gs 'arousal', 'end'
 							gs 'stat'

+ 10 - 10
locations/city_center.qsrc

@@ -44,7 +44,7 @@ else
 end
 *nl
 
-'Day or night the city center is alive and bustling. Whether You''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
+'Day or night, the city centre is alive and bustling. So whether you''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
 *nl
 
 gs'street_event','city_center', 'extras'
@@ -73,15 +73,15 @@ if shantpopala > 0:
 	rape += 1
 	shantpopala -= 1
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/sex/rape.jpg"></center>'
-	'On the street close to you, a black jeep suddenly hit the brakes. You turn your head to see what''s happening and see two large men jump of it and start to run towards you in. Before you can react and run away, they grap you and drag you into the car.'
-	'"You''re doing this for a living? Taking pictures of naked people in the park?", one of the shouts, holding one of the pictures to your face you''ve made awhile back and sent someone over a social network, hoping they would pay the ransom.'
-	'"No... what? What the hell is going on? I don''t know what you''re talking about!", you try to explain.'
-	'"Don''t lie to use you stupid bitch.", as he said that, he hits you on your head and you pass out.'
-	'You wake up somewhere out of town, you''re tied up and naked. You look down on yourself and notice traces of cum on your body, it also seems like that cum is flowing from your ass and your pussy.'
-	'You notice that the blokes, who captured you sit next to you and seem to have a break, some of them are smoking.'
-	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said, as he noticed you moving. Some of them are starting to get an evil grin on their face.'
-	'They got up and came back at you, barely a minute later you wished your were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded to black and you lost you consciousness again.'
-	'You feel groggy as you wake up, but it feels like someone is grapping you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he shouts, then kicks you into the stomach and leaves. As you collapse on the ground holding your stomach in pain, you take a glimpse at the street and see the assholes driving away in their black jeep. The mainroad is about 200m away, you crawl most of the way there, but soon you can walk again and eventually you find your way back to one of the mainstreets.'
+	'A black jeep suddenly hit the brakes on the street close to you. You turn your head to see what''s happening and see two prominent men jump out of it and start running towards you. Before you can react and run away, they grab you and drag you into the car.'
+	'"You''re doing this for a living? Taking pictures of naked people in the park?" one of them shouts while holding one of the pictures to your face you''ve made a while back and sent someone over a social network, hoping they would pay the ransom.'
+	'"No... what? What the hell is going on? I don''t know what you''re talking about!" you try to explain.'
+	'"Don''t lie to us, you stupid bitch." as he says that, he hits you on your head, and you pass out.'
+	'You wake up somewhere out of town, tied up and naked. You look down on yourself and notice traces of cum on your body. It also seems like that cum is flowing from your ass and pussy.'
+	'You notice that the blokes, who captured you, sit next to you and seem to have a break. Some of them are smoking.'
+	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said as he noticed you moving. Some of them are starting to get evil grins on their face.'
+	'They got up and came back at you. Barely a minute later, you wished you were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded black, and you lost consciousness again.'
+	'You feel groggy as you wake up, but someone grabs you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he yells, then kicks you in the stomach and leaves. As you collapse on the ground holding your stomach in pain, you glimpse the street and see the assholes driving away in their black jeep. The main road is about 200m away. You crawl most of the way there, but soon you can walk again, and eventually, you find your way back to one of the main streets.'
 	gs 'arousal', 'bj', -60, 'sub', 'gangbang','humiliation', 'rough'
 	gs 'arousal', 'vaginal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
 	gs 'arousal', 'anal', -60, 'sub', 'gangbang', 'humiliation', 'rough'

+ 7 - 8
locations/city_clinic.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'start':
 
 	if katjob > 0:act 'Visit the chief doctor': gt 'city_clinic', 'glavdoc'
 
-	if (pcs_teeth > -1 and (dentistday + 90 < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
+	if (pcs_teeth > -1 and (dentistday < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
 		act 'Go to the dentist':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
@@ -212,7 +212,6 @@ if $ARGS[0] = 'start':
 			if pcs_brace = 1:
 				pcs_brace = 0
 				pcs_teeth -= 1
-				dentistday = daystart
 				'The dentist spends 15 minutes to take of you brace and clean up. You look at the mirror afterward and you teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
 				gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 				gs 'stat'
@@ -244,11 +243,11 @@ if $ARGS[0] = 'start':
 								pcs_missing_teeth = 0
 								'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 							elseif pcs_teeth > 0:
-								dentistday = daystart
+								dentistday = daystart + 180
 								pcs_brace = 1
-								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 							else
-								dentistday = daystart
+								dentistday = daystart + 90
 								pcs_teeth = -1
 								'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 							end
@@ -267,12 +266,12 @@ if $ARGS[0] = 'start':
 								pcs_missing_teeth = 0
 								'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 							elseif pcs_teeth > 0:
-								dentistday = daystart
+								dentistday = daystart + 180
 								pcs_brace = 1
-								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 							else
 								pcs_teeth = -1
-								dentistday = daystart
+								dentistday = daystart + 90
 								'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 							end
 							gs 'AppearanceSystem', 'UpdateBaseAppearnce'

+ 1 - 1
locations/clothing.qsrc

@@ -418,7 +418,7 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 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
 

+ 278 - 0
locations/emp_functions.qsrc

@@ -0,0 +1,278 @@
+# emp_functions
+
+!! Employmnent and Event Systems
+!! 2022-09-30
+!! Author: Hooded Silence
+!!
+!! v.01 - Initial code base
+!! v.02 - Event generator partially integrated
+!! v.03 - Job management system integrated
+!! 
+
+!! --------------------- UI Interface for Journal
+
+if $ARGS[0] = 'gen_schedule':
+	*clr & cla 
+		if night_mode = 1 or night_mode = 2:
+		$header_theme = '#91B0B4'
+		$body_theme = '#303030'
+		$body_theme_alt  = '#474747'
+		$font_theme = '#000000'
+	else
+		$header_theme = '#e27c00'
+		$body_theme = '#E0DED4'
+		$body_theme_alt  = '#D58B32'
+		$font_theme = '#FFFFFF'
+	end
+	if  function_sw = 1:	'<center><h2>' + $npc_firstname['A<<mod_npc_id>>'] + ' ' + $npc_lastname['A<<mod_npc_id>>'] + '</h2></center>'
+	if function_sw = 2: 
+		gs 'journal', 'journalmenu'
+		'<center><h2>Work</h2></center>'
+	end
+	!! Enable selector if attending school or Uni by NPC group type or by character and set default to School
+	if (npc_grupTipe['A<<mod_npc_id>>']>= 1 and npc_grupTipe['A<<mod_npc_id>>']<= 5) or mod_npc_id = 34 and function_sw <= 1: 
+		if flag_schedule = 0: flag_schedule = 1
+		school_group = 1
+		'<center>Change to: <a href="exec: flag_schedule = 1 & gs ''emp_functions'', ''gen_schedule''">School</a> | <a href="exec: flag_schedule = 2 &  gs ''emp_functions'', ''gen_schedule''">University</a> | <a href="exec: flag_schedule = 3 &  gs ''emp_functions'', ''gen_schedule''">Holiday</a> </center>'
+	else
+		!! Set schedule to holiday / non-edu NPCs
+		flag_schedule = 3
+	end
+
+	!! Initiate loop variables
+
+	i_day = 1
+    mod_max_day = 7
+	i_hour = ARGS[1]
+    mod_max_hour = ARGS[1] + 8 
+    header_switch = 1
+	killvar '$tablebody'   
+	killvar '$tableheader'
+
+	!! create header, using header switch to fill in :00 or :30 automatically using mod to determine odd/even and set display hour automatically.
+
+	$tableheader = '<tr border="1" align="center"  bgcolor="<<$header_theme>>"><th style="padding: 10px;"></th>'
+	:jmp_header_create
+		if (i_hour mod 2) = 0:
+			display_hour = i_hour/ 2
+		end
+		if display_hour = 24: Display_hour = 0
+		if header_switch = 1:
+			header_switch += 1
+			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<<display_hour >>', display_hour) + ':00</font></th>'
+		elseif header_switch=2: 
+			header_switch = 1
+			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<< display_hour>>', display_hour) + ':30</font></th>'
+		end		
+		i_hour += 1
+	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
+	! Reset i_hour for next loop	
+	killvar 'display_hour'
+	killvar 'header_switch'
+	i_hour = ARGS[1]
+	header_switch = 1
+	!! Close out table header
+	$tableheader += '</tr>'
+	!! Create table body, with alternating colour rows for legibility
+    :jmp_day_create
+
+        !Set day
+        if i_day = 1 or i_day = 3 or i_day = 5 or i_day = 7:
+			$tablebody += '<tr><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
+		else
+			$tablebody += '<tr bgcolor="<<$body_theme_alt>>"><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
+		end
+		!! fill the slots from the NPC schedule
+
+        :jmp_hour_create 
+			if i_day >= 1:
+
+				!! Create function switcher:
+				!! 1: NPC tracker
+				!! 2: Job tracker
+				!! 3: Event Tracker
+
+				if function_sw = 1 or function_sw = 0:
+					dynamic $schedule_tracker 
+				elseif function_sw = 2:
+                    flag_active  = 1
+                    j_id = emp_rota_week[i_day +  '_' + i_hour]
+                    if emp_rota_week[i_day +  '_' + i_hour] ! 0:							
+                        $transient_tb =  '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
+                    else
+                        $transient_tb  = 'Free'
+                    end
+				elseif function_sw = 3:
+				else
+					msg 'Error - Failed to create body. Please set content switch.'
+				end
+
+				if flag_active = 0:
+					$tablebody += '<td style="padding: 10px;">Slot: ' + i_hour +'</td>'
+				else
+					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
+					flag_active = 0
+					killvar '$transient_tb'
+				end	
+			else
+				 i_day += 1
+				 jump 'jmp_day_create'
+			end
+			i_hour += 1
+            if i_hour <=  mod_max_hour: jump 'jmp_hour_create'
+			$tablebody +='</tr>'
+			i_day += 1
+			i_hour = ARGS[1]
+        if i_day <= mod_max_day: jump 'jmp_day_create'	
+	!! Create navigaton bars
+	if (mod_max_hour + 8)  <= 48:
+		set_hour = ARGS[1] + 8
+		$msg_forward = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
+	else
+		$msg_forward = 'End of Day'
+	end
+    if (mod_max_hour  - 8) >0 :
+		set_hour = ARGS[1] - 8
+        $msg_back = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
+    else
+		$msg_back = 'Start of day'
+    end
+
+    !! Start the table constuction    
+    '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
+    '<<$msg_back>> | <<$msg_forward>>'
+    *nl
+    if  function_sw = 1:
+	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>' 
+	end
+	if  function_sw = 2:
+		'<b>Note:</b> Times are approximate, some jobs may extend past the allotted time or have flexi-starts.</center>' 
+	end
+    act 'Back':
+		killvar 'flag_schedule'
+		killvar 'school_group'
+		killvar 'j_id'
+		gt $loc, $loc_arg
+	end
+end
+
+!! Job Info popup
+if $ARGS[0] = 'job_info':
+	j_id = ARGS[1]
+	killvar '$msg_body'
+	$msg_body +=  '<p>Job Title: ' + $emp_job_title[j_id] + '</p>'
+	$msg_body += '<p>Location: ' + $emp_job_loc[j_id] + '</p>'
+	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
+	$msg_body += '<p>Wages: ' +emp_job_wages[j_id] + '<b>₽</b></p>'
+	
+	msg '<<$msg_body>>'
+end
+
+!!  Removed event generation for initial code review and to make job integration easier.
+
+!! --------------------- Event Generator
+
+!! Author - Hooded Silence
+!! Date created - 26 Aug 22
+!! Event Generator - filler content only for one off events or recurring work from NPCs
+!!
+!! v. 01 - Initial code base
+!! v. 02 - UI improvements and feature feedback
+
+
+!! --------------------- Job management system
+
+
+!! book role, creates a time slot for emp_rota_week in format day_hour to be used in schedule mode.
+
+if $ARGS[0] = 'emp_booking':
+	gs 'emp_functions', 'emp_chk_clk'
+	if emp_rota_fail  = 0:	
+		gs 'emp_functions', 'loop_configure'
+		j_finish = emp_job_end[j_id]
+		:jmp_daily_book
+			j_idx = emp_job_start[j_id]
+			:jmp_hour_book
+				emp_rota_week[d_idx + '_' + j_idx]  = j_id
+				j_idx += 1
+			if j_idx <= j_finish: jump 'jmp_hour_book'	
+			d_idx += 1
+		if d_idx <= d_end: jump 'jmp_daily_book'
+		emp_job_status[j_id] = 1
+		emp_job[active] += 1
+		killvar 'j_idx'
+		killvar 'j_finish'
+		killvar 'd_idx'
+		killvar 'd_end'
+	else
+		msg 'Sorry, you''ve already got a job for this time period.'
+	end
+
+	killvar 'emp_rota_fail'
+end
+
+!! check if time slots are avaialble for this role. 
+
+if $ARGS[0] = 'emp_chk_clk':	
+	gs 'emp_functions', 'loop_configure'
+	j_finish = emp_job_end[j_id]
+	:jmp_daily_chk
+		j_idx = emp_job_start[j_id]
+		:jmp_job_chk
+			if emp_rota_week[d_idx + '_' + j_idx]  >  0:
+				!! booking failed					
+				emp_rota_fail = 1
+			else
+				!! booking passed
+				emp_rota_fail = 0
+			end	
+			j_idx +=1
+		if j_idx <= j_finish and emp_rota_fail = 0: jump 'jmp_job_chk'	
+		d_idx += 1
+	if d_idx <= d_end and emp_rota_fail = 0: jump 'jmp_daily_chk'
+end
+
+if $ARGS[0] = 'emp_terminate':
+	if ARGS[1] >= 4:
+		gs 'emp_functions', 'loop_configure'
+		j_finish = emp_job_end[j_id]
+		:jmp_daily_book
+			j_idx = emp_job_start[j_id]
+			:jmp_hour_book
+				emp_rota_week[d_idx + '_' + j_idx] = 0
+				j_idx += 1
+			if j_idx <= j_finish: jump 'jmp_hour_book'	
+			d_idx += 1
+		if d_idx <= d_end: jump 'jmp_daily_book'
+		!! Set the termination value
+		emp_job_status[j_id] = ARGS[1]
+		emp_job[active] -= 1
+	else
+		msg 'Job termination failed. Please ensure you set to  4 - Terminated or 5 - Fired'
+	end
+	killvar 'j_idx'
+	killvar 'j_finish'
+	killvar 'd_idx'
+	killvar 'd_end'	
+end
+
+if $ARGS[0] = 'loop_configure':	
+	if  j_day= 0 or j_day = 1 or j_day = 2:
+		d_idx = 1
+	else
+		d_idx= 6
+	end
+	if  j_day <= 1:
+		d_end = 5
+	else
+		d_end= 7
+	end	
+end
+--- emp_functions ---------------------------------
+
+
+
+
+
+
+

+ 124 - 0
locations/emp_job_array.qsrc

@@ -0,0 +1,124 @@
+# emp_job_array
+
+!! Jobs array
+!! < 4 hours is classed as ad-hoc work 
+!! => 4 hours is contract roles
+!! Events are non-permanent employment of varying rates/times and set in the future.
+!!
+!! Index:
+!! 1 - Tourist Guide
+!! 2 - Pavlosk Hotel Maid
+!! 3 - Pussy Kats Shop Assistant
+!! 4 - Titran Secretary
+!! 5 - City Burger Joint
+
+if $ARGS[0] = 'emp_tourist_guide':
+	!! Transitory variables to initialise job start - REQ
+	j_id = 1
+	
+	!! j_day defines work days: 1 - Mon-Sun, 2 Mon-Fr, 3 Weekend.  - REQ
+	j_day = 2
+
+	!! Role ID - Array index and used as job identifier.
+	emp_job_id[j_id] = 1
+	
+	!! Job Role	- REQ
+	$emp_job_title[j_id] = 'Tourist Guide' 
+	
+	!! Job start time - a day has 48 slots from base 0 - REQ
+	emp_job_start[j_id] = 16
+	
+	!! Job finish time - REQ
+	emp_job_end[j_id] = 32
+	
+	!! Job pay rate- REQ
+	emp_job_wages[j_id] = 1000
+	
+	!! Job employment location- REQ
+	$emp_job_loc[j_id] = 'Pavlosk Park'
+	
+	!! Job notes - to remind the player of the job details
+	$emp_job_notes[j_id] = 'Summer job with flexible days - start between 08:00 and 09:00'
+		
+	if emp_job_status[j_id] < 1:
+		!! Job status 1 Employed, 2 Started with favour, 3 Started with merit, 4 Terminated/suspended, 5 Fired permanently - REQ. <= 10 reserved for core mechanics, 10 + for custom quest markers
+		emp_job_status[j_id] = 0
+	end
+	if emp_job_rank[j_id] < 1:
+		!! Job ranking system for promotions and career progression. - Opt
+		emp_job_rank[j_id] = 1
+	end
+	
+end
+
+if $ARGS[0] = 'emp_pav_maid':
+	j_id = 2
+	j_day = 2
+	emp_job_id[j_id] = 2
+	$emp_job_title[j_id] = 'Hotel Maid'
+	emp_job_start[j_id] = 33
+	emp_job_end[j_id] = 40
+	emp_job_wages[j_id] = 375
+	$emp_job_loc[j_id] = 'Pavlosk Park'
+	$emp_job_notes[j_id] = 'Be at the Pavlosk Hotel reception between 16:00-17:00 to start your shift.'		
+	if emp_job_status[j_id] < 1:
+		emp_job_status[j_id] = 0
+	end
+	if emp_job_rank[j_id] < 1:
+		emp_job_rank[j_id] = 1
+	end
+
+end
+
+if $ARGS[0] = 'emp_pussy_kats':
+	j_id = 3
+	if ARGS[1] = 1:
+		!! Weekdays
+		j_day = 2
+		emp_job_start[j_id] = 32
+		emp_job_end[j_id] = 40
+	else
+		!! P/T weekend
+		j_day = 3
+		emp_job_start[j_id] = 18
+		emp_job_end[j_id] = 30
+	end
+	emp_job_id[j_id] = 3
+	$emp_job_title[j_id] = 'Shop Assistant'
+	emp_job_wages[j_id] = 205
+	$emp_job_loc[j_id] = 'Pussy Cats'
+	$emp_job_notes[j_id] = 'Shop assistant at Pussy Cat''s in the City Center Mall. You''ve missed <<young_shop_miss>> day(s).'
+		
+	if emp_job_status[j_id] < 1:
+		emp_job_status[j_id] = 0
+	end
+	if emp_job_rank[j_id] < 1:
+		emp_job_rank[j_id] = 1
+	end
+
+end
+
+if $ARGS[0] = 'emp_titran':
+	j_id = 4
+	j_day = 2
+	emp_job_start[j_id] = 18
+	emp_job_end[j_id] = 34
+
+	emp_job_id[j_id] = 3
+	$emp_job_title[j_id] = 'Secretary'
+	emp_job_wages[j_id] = 1500
+	$emp_job_loc[j_id] = 'Titran-Express Engineering'
+	$emp_job_notes[j_id] = 'You work as a secretary at Titran Express. You need to come to work by 09:00 during the week Monday-Friday. Salary is automatically transferred on the 25th of each month.'
+		
+	if emp_job_status[j_id] < 1:
+		emp_job_status[j_id] = 0
+	end
+
+	!! Secretatry Career examples
+	!! 1 Office Secretary 2 Pool Secretary 3 Head Secretary 4 PA - Trainable through the Ind Comm Ctr
+	if emp_job_rank[j_id] < 1:
+		emp_job_rank[j_id] = 1
+	end
+end
+
+--- emp_job_array ---------------------------------

+ 61 - 61
locations/gschool_socialchg.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'Pavlovsk slut':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/shamewalk.jpg"></center>'
-	'As you walk down the school hallway, you notice almost everyone is eying you. Some sneer at you, others laugh, a few turn away in disgust. You are used to this treatment with your sexual escapades, but not to this level. No one wants to greet you and most seem to actively avoid you, you are starting to feel a bit uncomfortable at all the staring eyes. As you approach your locker, you see someone has spray painted ''Slut'' on it in big red letters. You hear someone walking up behind you before you turn around to see who it might be.'
+	'Walking down the school hallway, you notice almost everyone is eying you. Some sneer at you, others laugh, and others turn away in disgust. You are used to this treatment with your sexual escapades, but not to this level. No one wants to greet you and most actively avoid you. You are starting to feel a bit uncomfortable at all the staring eyes. As you approach your locker, you see someone has spray painted ''Slut'' on it in big red letters. You hear someone walking up behind you before you turn around to see who it might be.'
 
 	grupvalue[1] = min(100,grupvalue[1])
 	grupvalue[2] = min(150,grupvalue[2])
@@ -103,31 +103,31 @@ if $ARGS[0] = 'Pavlovsk slut':
 	if grupTipe = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/coolslut.jpg"></center>'
 		if soniaPS = 0:
-			'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Just as you''re about to ask what''s going on, Irina cuts you off. "Shut your cum hole, slut! I don''t want to smell your cum breath. We''ve all heard about what you''ve been up to and your ass is out. You''re no longer welcome around us. Go and find some dick to suck and maybe they will pretend to care about you." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
+			'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Just as you''re about to ask what''s going on, Irina cuts you off. "Shut your cum hole, slut! I don''t want to smell your cum breath. We''ve all heard about what you''ve been up to, and your ass is out. You''re no longer welcome around us. Find some dick to suck, and maybe they will pretend to care about you." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
 		else	
-			'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Just as you''re about to ask what''s going on, Irina cuts you off. "Shut your cum hole, slut! I don''t want to smell your cum breath. We''ve all heard about what you''ve been up to and your ass is out. You''re no longer welcome around us. Go and find Sonia, I''m sure you two have a lot in common now." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
+			'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Then, just as you''re about to ask what''s going on, Irina cuts you off. "Shut your cum hole, slut! I don''t want to smell your cum breath. We''ve all heard about what you''ve been up to, and your ass is out. You''re no longer welcome around us. Go and find Sonia. I''m sure you two have a lot in common now." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
 		end	
 		'"What a waste, you fucking slut." He then spits at your feet before leaving as well. You hear many of the students around you laughing as you look around. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	elseif grupTipe = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/jockslut.jpg"></center>'
 		if christinaQW['fight'] < 1 or christinaQW['blackmail'] < 2:
-			'Christina, Lariska, and Lina walk up to you. Lariska and Lina are looking at you in disgust, while Christina is smirking. She shoves you hard up against your locker. "What are you doing here slut? Shouldn''t you be in the boys bathroom sucking a bunch of cocks? We all heard that''s all you do now. At least sluts know to get paid, but you just give it away for free." she says mockingly while laughing. Lariska, Lina and several other students nearby join in, openly mocking you.'
+			'Christina, Lariska, and Lina walk up to you. Lariska and Lina are looking at you in disgust while Christina is smirking. She shoves you hard up against your locker. "What are you doing here slut? Shouldn''t you be in the boys'' bathroom sucking a bunch of cocks? We all heard that''s all you do now. At least sluts know to get paid, but you just give it away for free, " she laughs mockingly. Lariska, Lina and several other students nearby join in, openly mocking you.'
 		else
-			'Albina and Lazar walk up to you with looks of disgust on their face. "What are you doing here? Shouldn''t you be in the boys bathroom sucking dick like the whore that you are?" Lazar says mockingly. Albina opens her mouth to say something, but chooses to remain quiet and stares at the floor. Christina smirks at you from behind them, not daring to challenge you directly, but definitely enjoying the moment.'
+			'Albina and Lazar walk up to you with looks of disgust on their face. "What are you doing here? Shouldn''t you be in the boys'' bathroom sucking dick like the whore that you are?" Lazar says mockingly. Albina opens her mouth to say something but chooses to remain quiet and stares at the floor. Christina smirks at you from behind them, not daring to challenge you directly but enjoying the moment.'
 		end
 		if soniaPS = 0:
-			'"Go and hang out with the other losers because none of us give a shit about you anymore." Lazar says before turning and walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+			'"Go hang out with the other losers because none of us gives a shit about you anymore," Lazar says before turning and walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 		else	
-			'"Go and hang out with the other losers because none of us give a shit about you anymore. I''m sure you and Sonia have a lot in common now." Lazar says mockingly before walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+			'"Go hang out with the other losers because none of us gives a shit about you anymore. I''m sure you and Sonia have a lot in common now." Lazar says mockingly before walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 		end	
 	elseif grupTipe = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
-		'A group of students stand in front of you, wanting to get a better look at what''s written on your locker. When you look at them, they start laughing and then quickly hurry away from you as if you have the plague. You turn and try to find some of your friends, but most seem to be hiding or hurry off when you approach. You finally manage to catch up to Gerasim, but just as you''re about to say something, he turns to you. "Please go away! I don''t know what you''ve gotten yourself into, but the things they say you''ve done..." He looks disgusted. "I''m sorry, but I can''t be seen hanging out with you anymore. I''ve got enough problems without you making it worse."'
-		'He pauses for a second to stare at the dejected look on your face, realizing that you are now an outcast. He then lets out a short sigh. "I''m sorry, I really am but this is your own fault. What were you thinking doing all that.. sex stuff? Just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. You take a second to look around as most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+		'A group of students stand in front of you, wanting a better look at what''s written on your locker. They start laughing when you look at them and quickly hurry away from you as if you have the plague. You turn and try to find some of your friends, but most seem to be hiding or hurrying off when you approach. You finally manage to catch up to Gerasim, but he turns to you just as you''re about to say something. "Please go away! I don''t know what you''ve gotten yourself into, but the things they say you''ve done..." He looks disgusted. "I''m sorry, but I can''t be seen hanging out with you anymore. I''ve got enough problems without you making them worse."'
+		'He pauses for a second to stare at the dejected look on your face, realizing that you are now an outcast. He then lets out a short sigh. "I''m sorry, I really am, but this is your fault. What were you thinking doing all that.. sex stuff? Just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. You take a second to look around as most other students either start mocking you or actively look away. Finally, you grab your stuff and hurry to your next class.'
 	elseif grupTipe = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/gopnikslut.jpg"></center>'
-		'You turn and see Pauline, Lera and Lena standing next to you. Lera is snickering, Pauline looks like she''s preparing to beat you up and Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. Noooo, you had to go around and be the town bicycle! Don''t act all surprised, we''ve all heard about how you let any guy fuck you in whatever hole they desire. Spineless sluts have no place with us, so stay the fuck away from us or I will personally beat the living shit out of you." With that, Pauline shoves your against you locker and walks away.'
-		'Lena gives you a final look of disgust and shoves you again while Lera gives you a few parting words before walking away. "If you ever try to approach us, we''ll take you to some nasty guys who will fuck you so hard that your holes will be loose enough to stick a watermelon inside them!" Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+		'You turn and see Pauline, Lera and Lena standing next to you. Lera is snickering. Pauline looks like she''s preparing to beat you up, and Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently, hanging out, partying and having a good time wasn''t enough for you. Noooo, you had to go around and be the town bicycle! Don''t act all surprised. We''ve all heard about how you let any guy fuck you in whatever hole they desire. Spineless sluts have no place with us, so stay away from us, or I will beat the living shit out of you." With that, Pauline shoves you against your locker and walks away.'
+		'Lena gives you a final look of disgust and shoves you again while Lera gives you a few parting words before walking away. "If you ever try to approach us, we''ll take you to nasty guys who will fuck you so hard that your holes will be loose enough to stick a watermelon inside them!" Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	end
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	grupTipe = 5
@@ -140,13 +140,13 @@ if $ARGS[0] = 'coolkid':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey <<$pcs_nickname>>, we''ve been talking and you seem to have the right attitude to be one of us. So what do you say, do you want to join the popular clique?" Vicky asks and the three of them just stand there waiting on your response.'
+	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey, <<$pcs_nickname>>, we''ve been talking, and you seem to have the right attitude to be one of us. So what do you say? Do you want to join the popular clique?" Vicky asks, and the three of them just wait for your response.'
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I don''t think that''s a good idea."'
-		'Vicky frowns but nods. "Suit yourself then." With that, she turns and leaves, Andrey just shakes his head at you and does the same.'
-		'Stasya gives you a once over. "I told you guys she wasn''t cool enough! What a loser!" With that, she follows the others, leaving you behind to wonder if you made the right choice.'
+		'Vicky frowns but nods. "Suit yourself then." With that, she turns and leaves. Andrey just shakes his head at you and does the same.'
+		'Stasya gives you a once-over. "I told you guys she wasn''t cool enough! What a loser!" With that, she follows the others, leaving you behind to wonder if you made the right choice.'
 
 		grupvalue[1] = rand(600,650)
 		old_grupvalue[1] = grupvalue[1]
@@ -158,7 +158,7 @@ if $ARGS[0] = 'coolkid':
 	act 'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-		'You nod your head. "Yes I would love to! I love hanging out with you guys!"'
+		'You nod your head. "Yes, I would love to! I love hanging out with you guys!"'
 		'Vicky gives you a hug. Once she lets go, Andrey wraps an arm around your shoulder and starts leading you to your next class. "From now on, you''re one of us." Stasya gives you a friendly smile as the four of you walk to your next class.'
 		
 		grupvalue[2] = min(rand(675,725),grupvalue[2])
@@ -190,9 +190,9 @@ if $ARGS[0] = 'coolkid warn 1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey <<$pcs_nickname>>, is everything okay?"'
-	'Before you can answer, Stasya chimes in. "You havn''t been setting the right example of late. You''re acting more like the losers than us, so do you want to keep hanging around with us or not?"'
-	'You are again interrupted before you can speak. "Cool it, Stasya! Look <<$pcs_nickname>>, if you want to hang out with us, just act like you normally do okay? That''s all we''re saying." Vicky says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other cool kids question whether you belong in the group or not...'
+	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey, <<$pcs_nickname>>, is everything okay?"'
+	'Before you can answer, Stasya chimes in. "You haven''t been setting the right example of late. You''re acting more like the losers than us, so do you want to keep hanging around with us?"'
+	'You are again interrupted before you can speak. "Cool it, Stasya! Look, <<$pcs_nickname>>, if you want to hang out with us, just act like you normally do, okay? That's all we're saying." Vicky says before the bell rings, and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -202,9 +202,9 @@ if $ARGS[0] = 'coolkid warn 2':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vicky, Andrey and Stasya. "Hey <<$pcs_nickname>>, we talked about this before, but you still seem to be not getting with the program." Vicky says with disdain.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vicky, Andrey and Stasya. "Hey, <<$pcs_nickname>>, we talked about this before, but you still seem to be not getting with the program," Vicky says with disdain.'
 	'Before you can answer, Stasya chimes in. "I told you she doesn''t want to be one of us! I don''t know why we ever let her hang out with us in the first place."'
-	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to get your act together or you''re out, simple as that." Andrey says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other cool kids question whether you belong in the group or not. You need to improve your standing with them or risk being kicked out...'
+	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to get your act together, or you''re out, simple as that," Andrey says before the bell rings and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group. You need to improve your standing with them or risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -214,9 +214,9 @@ if $ARGS[0] = 'coolkid slut warn':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vicky, Andrey and Stasya. "What''s going on with you, <<$pcs_nickname>>? We''ve all heard the rumors about your sexual exploits. We all like sex but come on, this is getting out of hand." Vicky says with a hint of disdain.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vicky, Andrey and Stasya. "What''s going on with you, <<$pcs_nickname>>? We''ve all heard the rumours about your sexual exploits. Of course, we all like sex but come on, this is getting out of hand." Vicky says with a hint of disdain.'
 	'Before you can answer, Stasya chimes in. "Maybe she just wants to be a slut."'
-	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to start using a little discretion or you''re out." Andrey says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other cool kids question whether you belong in the group or not. You better fix things fast or you risk being kicked out...'
+	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to start using a little discretion, or you''re out," Andrey says before the bell rings and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group. You better fix things fast, or you risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -225,13 +225,13 @@ if $ARGS[0] = 'jock':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "Hey <<$pcs_nickname>>, we''ve been talking and you seem to have the right attitude to be one of us. So what do you say, do you want to join us and become a jock?" They seem to be waiting on your response.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "Hey, <<$pcs_nickname>>, we''ve been talking, and you seem to have the right attitude to be one of us. So what do you say? Do you want to join us and become a jock?" They seem to be waiting on your response.'
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I don''t think that''s a good idea."'
-		'Lariska frowns then nods. "Suit yourself." With that, she turns and leaves.'
-		'Lina gives you a once over. "Well at least Christina will be happy." With that she follows after Lariska, leaving you behind to wonder if you made the right choice.'
+		'Lariska frowns, then nods. "Suit yourself." With that, she turns and leaves.'
+		'Lina gives you a once-over. "Well, at least Christina will be happy." With that, she follows after Lariska, leaving you behind to wonder if you made the right choice.'
 		grupvalue[2] = rand(600,650)
 		old_grupvalue[2] = grupvalue[2]
 		gs 'gschool_socialchg', 'group_rel_change','jocks', -5
@@ -243,7 +243,7 @@ if $ARGS[0] = 'jock':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
 		'You nod your head. "Yes, I would love to! I love hanging out with you guys!"'
-		'Lariska gives you a hug. "From now on you are one of us." Lina gives you a friendly smile and you all walk you to your next class.'
+		'Lariska gives you a hug. "From now on, you are one of us." Lina gives you a friendly smile, and you all walk to your next class.'
 
 		grupvalue[1] = min(rand(675,725),grupvalue[1])
 		grupvalue[3] = min(rand(600,650),grupvalue[3])
@@ -274,9 +274,9 @@ if $ARGS[0] = 'jock warn 1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "Hey <<$pcs_nickname>>, is everything okay with you?" Lariska asks.'
-	'Before you can answer, Lina chimes in. "You haven''t been putting your all into sports and you''re starting to act like some of the others, so does that mean that you don''t want to hang around with us anymore?"'
-	'The bell rings and you all hurry to class, but you can''t help but worry. It seems your recent activity has made the other jocks question whether you belong in the group or not...'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "Hey, <<$pcs_nickname>>, is everything okay with you?" Lariska asks.'
+	'Before you can answer, Lina chimes in. "You haven''t been putting your all into sports, and you''re starting to act like some others, so does that mean you don''t want to hang around with us anymore?"'
+	'The bell rings, and you all hurry to class, but you can''t help but worry. It seems your recent activity has made the other jocks question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -288,7 +288,7 @@ if $ARGS[0] = 'jock warn 2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
 	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "<<$pcs_nickname>>, we talked about this before, but you still seem to be not getting the idea." Lariska scoffs.'
 	'Before you can answer, Lina chimes. "Christina says she doesn''t want you to be one of us and that we should have never let you hang out with us in the first place."'
-	'You are again interrupted before you can speak. "<<$pcs_nickname>> you need to get your act together or you''re out, simple as that." Lina says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other jocks question whether you belong in the group or not. You better fix things fast or risk becoming being kicked out...'
+	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to get your act together, or you''re out, simple as that," Lina says before the bell rings and you all hurry to class. You can''t help but worry. Your recent activity has made the other jocks question whether you belong in the group. You better fix things fast or risk becoming kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -298,8 +298,8 @@ if $ARGS[0] = 'jock slut warn':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "What''s going on with you, <<$pcs_nickname>>? We''ve all heard the rumors about your sexual exploits. Sex is fun, but what are you going to do next? Fuck the whole football team?"'
-	'Before you can answer, Lina chimes. "You need to start using a little discretion or you''re out." The bell then rings and you all hurry to class, but you can''t help but worry. It seems your recent activity has made the other jocks question whether you belong in the group or not. You better fix things fast or risk being kicked out...'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "What''s going on with you, <<$pcs_nickname>>? We''ve all heard the rumours about your sexual exploits. Sex is fun, but what are you going to do next? Fuck the whole football team?"'
+	'Before you can answer, Lina chimes. "You need to start using a little discretion, or you''re out." The bell then rings, and you all hurry to class, but you can''t help but worry. Your recent activity has made the other jocks question whether you belong in the group. So you better fix things fast or risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -308,12 +308,12 @@ if $ARGS[0] = 'nerd':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up, all giving you friendly smiles. "Hey <<$pcs_nickname>>, we''ve been talking and we like you. We were wondering if you would like to come hang out with us at our game night?" They seem to be waiting on your response.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up, all giving you friendly smiles. "Hey, <<$pcs_nickname>>, we''ve been talking, and we like you. We were wondering if you would like to hang out with us at our game night?" They seem to be waiting on your response.'
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I''m just not interested in doing a game night. Sorry."'
-		'Artem frowns then nods. "Oh, okay. Well maybe some other time then..." With that, he turns and the rest follow, looking a little disappointed. Looks like they were hoping you would join them. It makes you feel a little bad and wondering if you made the right choice.'
+		'Artem frowns and then nods. "Oh, okay. Well, maybe some other time then..." With that, he turns, and the rest follow, looking a little disappointed. Looks like they were hoping you would join them. It makes you feel a little bad and wonder if you made the right choice.'
 		grupvalue[3] = rand(600,650)
 		old_grupvalue[3] = grupvalue[3]
 		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
@@ -325,7 +325,7 @@ if $ARGS[0] = 'nerd':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
 		'You nod your head. "Yes, I would love to hang out with you guys! A game night sounds like a lot of fun."'
-		'They all start speaking at once, excited about you joining them. Feofan then speaks up. "That''s great <<$pcs_nickname>>! Meet us at the community center library tonight at 20:00. See you then." With that they all start leaving and going to class, saying that they look forward to seeing you tonight.'
+		'They all start speaking at once, excited about you joining them. Feofan then speaks up. "That''s great, <<$pcs_nickname>>! Meet us at the community centre library tonight at 20:00. See you then." Then, they all start leaving and going to class, saying they look forward to seeing you tonight.'
 		
 		grupvalue[1] = min(rand(600,650),grupvalue[1])
 		grupvalue[2] = min(rand(625,625),grupvalue[2])
@@ -359,9 +359,9 @@ if $ARGS[0] = 'nerd warn 1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "Hey <<$pcs_nickname>>, is everything okay with you?"'
-	'Before you can answer, Julia chimes in. "You''re acting a lot like the others. Does that mean that you don''t want to hangout with us anymore?"'
-	'You are again interrupted before you can speak. "Look <<$pcs_nickname>>. We like you and want you to stay, but if you want to hang out with us, just act like you want to hang out with us? That''s all we''re saying." Feofan says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other nerds question whether you belong in the group or not...'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "Hey, <<$pcs_nickname>>, is everything okay with you?"'
+	'Before you can answer, Julia chimes in. "You''re acting a lot like the others. Does that mean you don''t want to hang out with us anymore?"'
+	'You are again interrupted before you can speak. "Look, <<$pcs_nickname>>. We like you and want you to stay, but if you want to hang out with us, just act like you want to hang out with us? That''s all we''re saying." Feofan says before the bell rings, and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other nerds question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -371,9 +371,9 @@ if $ARGS[0] = 'nerd warn 2':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "<<$pcs_nickname>>, we talked about this, but you''re still acting out." Artem says with disdain.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "<<$pcs_nickname>>, we talked about this, but you''re still acting out," Artem says with disdain.'
 	'Before you can answer, Julia chimes in. "Yeah, we''re all worried about you. What''s wrong? Is there anything we can do to help? Please just ask."'
-	'You are again interrupted before you can speak. "<<$pcs_nickname>> I don''t know what''s wrong, but if you don''t want to hang out with us, just say so. In any case, we hope things get better for you." Deofan says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other nerds question whether you belong in the group or not. You better fix things fast or risk being kicked out...'
+	'You are again interrupted before you can speak. "<<$pcs_nickname>>, I don''t know what''s wrong, but if you don''t want to hang out with us, just say so. In any case, we hope things get better for you." Deofan says before the bell rings, and you all hurry to class. You can''t help but worry. Your recent activity has made the other nerds question whether you belong in the group. You better fix things fast or risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -383,8 +383,8 @@ if $ARGS[0] = 'nerd slut warn':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "Hey <<$pcs_nickname>>, what''s going on with you? We''ve all heard some pretty disturbing rumors about you... If they''re even half true... I just don''t know what to say. You always seemed like such a nice girl." Feofan says with a hint of disappointment.'
-	'Before you can answer, Petka chimes in. "<<$pcs_nickname>>, you need to get yourself under control or you won''t be able to hang out with us anymore." The bell rings and you all hurry to class, but you can''t help but worry. It seems your recent activity has made the other nerds question whether you belong in the group or not. You better fix things fast or risk being kicked out...'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "Hey, <<$pcs_nickname>>, what''s going on with you? We''ve all heard some pretty disturbing rumours about you... If they''re even half true... I just don''t know what to say. You always seemed like such a nice girl." Feofan says with a hint of disappointment.'
+	'Before you can answer, Petka chimes in. "<<$pcs_nickname>>, you need to get yourself under control, or you won''t be able to hang out with us anymore." The bell rings, and you all hurry to class, but you can''t help but worry. Your recent activity has made the other nerds question whether you belong in the group. You better fix things fast or risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -393,12 +393,12 @@ if $ARGS[0] = 'gopnik':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joingopnik.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek and Lena. Vitek gives you a hungry once over and Lena gives you a smirk. "Hey <<$pcs_nickname>>, we''ve been talking and you seem like you have the right attitude to hang with us. So what do you say, want to come to one of our exclusive parties tonight?" They seem to be waiting on your response.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek and Lena. Vitek gives you a hungry once-over, and Lena gives you a smirk. "Hey, <<$pcs_nickname>>, we''ve been talking, and you seem like you have the right attitude to hang with us. So what do you say? Want to come to one of our exclusive parties tonight?" They seem to be waiting on your response.'
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
-		'You shake your head. "I like hanging out with you guys, but I''m just not in the partying mood tonight.""'
-		'Vitek''s eyes darken. "What, are you too good for us all of a sudden? Well fuck you then!" With that, he storms away. Lena looks at you with a derogatory stare before following her brother, leaving you behind to wonder if you made the right choice.'
+		'You shake your head. "I like hanging out with you guys, but I''m just not in the partying mood tonight."'
+		'Vitek''s eyes darken. "What, are you too good for us all of a sudden? Well, fuck you then!" With that, he storms away. Lena looks at you with a derogatory stare before following her brother, leaving you behind to wonder if you made the right choice.'
 		grupvalue[4] = rand(600,650)
 		gs 'gschool_socialchg', 'group_rel_change','gopniks', -5
 		gs 'stat'
@@ -408,9 +408,9 @@ if $ARGS[0] = 'gopnik':
 	act 'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joingopnik.jpg"></center>'
-		'You nod your head. "Yeah that sounds great, I love hanging out and maybe getting a little wasted."'
+		'You nod your head. "Yeah, that sounds great. I love hanging out and maybe getting a little wasted."'
 		'Vitek smirks and glances at Lena, leaving you wondering what they mean. "Lena will let you know where and when." With that, he turns and walks off, but you can''t help but feel you missed something, which makes you feel a little nervous.'
-		'Lena leans over. "Meet me and Lera after school at the apartment garages at eight this evening." She smiles like she knows something you don''t, but without a further word or letting you ask anything, she briskly walks away.'
+		'Lena leans over. "Meet Lera and me after school at the apartment garages at eight this evening." She smiles like she knows something you don''t, but she briskly walks away without a further word or letting you ask anything.'
 		gopnik_initiation = 1
 		gopnik_initiation_day = daystart
 		gs 'stat'
@@ -424,9 +424,9 @@ if $ARGS[0] = 'gopnik warn 1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek, Lena, Lera and Dan. Vitek gives you a once over. "What the fuck is up with you, <<$pcs_nickname>>?"'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek, Lena, Lera and Dan. Vitek gives you a once-over. "What the fuck is up with you, <<$pcs_nickname>>?"'
 	'Before you can answer, Lena chimes in. "You''ve been acting like a little submissive bitch lately. Grow a fucking pair and get your shit together!"'
-	'You are again interrupted before you can speak. "Look <<$pcs_nickname>>. If you want to hang out with us, just act like it okay? That''s all we''re saying." Lera says before the bell rings and the group disperses. You can''t help but worry. It seems your recent activity has made the other gopniks question whether you belong in the group or not...'
+	'You are again interrupted before you can speak. "Look, <<$pcs_nickname>>. If you want to hang out with us, just act like it, okay? That''s all we''re saying." Lera says before the bell rings, and the group disperses. You can''t help but worry. It seems your recent activity has made the other Gopnik question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -437,8 +437,8 @@ if $ARGS[0] = 'gopnik warn 2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
 	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek, Lena, Lera and Dan. Lena shoves you into your locker. "What the fuck bitch? You deaf or something, or do you just think you''re too good for us?"'
-	'Before you can answer, Dan chimes in. "I told you she didn''t belong, this bitch is too soft." he says as he plays with your hair. "I don''t know why we let Vasily talk us into letting her hang out with us anyways. I mean maybe if she sucked a few more cocks we could look the other way..." he adds with a laugh.'
-	'You are again interrupted before you can speak. "Cool it, Dan. <<$pcs_nickname>>, get your shit together or you''re out, simple as that." Vitek says before the bell rings and the group disperses. You can''t help but worry. It seems your recent activity has made the other gopniks question whether you belong in the group or not. You better fix things fast or you risk being kicked out...'
+	'Before you can answer, Dan chimes in. "I told you she didn''t belong. This bitch is too soft," he says as he plays with your hair. "I don''t know why we let Vasily talk us into letting her hang out with us anyways. I mean, maybe if she sucked a few more cocks we could look the other way..." he laughs.'
+	'You are again interrupted before you can speak. "Cool it, Dan. <<$pcs_nickname>>, get your shit together, or you''re out, simple as that." Vitek says before the bell rings, and the group disperses. You can''t help but worry. Your recent activity has made the other Gopnik question whether you belong in the group. You better fix things fast, or you risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -448,13 +448,13 @@ if $ARGS[0] = 'gopnik slut warn':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Pauline, Lena, Lera and Dan. Dan stands uncomfortably close and wraps an arm around your hip before pulling you in closer. "Hey slut. Sucked any cocks today? I can give you another one..." he says with a laugh.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Pauline, Lena, Lera and Dan. Dan stands uncomfortably close and wraps an arm around your hip before pulling you closer. "Hey, slut. Sucked any cocks today? I can give you another one..." he says with a laugh.'
 	'Before you can answer, Lera chimes in. "Maybe she just wants to be a slut."'
-	'You are again interrupted before you can speak. "We don''t need another Nush, one slut is enough." Pauline says in reply.'
+	'You are again interrupted before you can speak. "We don''t need another Nush. One slut is enough." Pauline says in reply.'
 	'Lera fires back. "Hey, she isn''t a slut! She just likes to fuck. It''s not like she lets just anyone fuck her. Not like <<$pcs_nickname>> here." She gives Dan a pointed look, which makes him give Lera a sour look in return.'
 	*nl
-	'Pauline rolls her eyes. "Whatever. If you want to lick her ass so bad go ahead and do it, you carpet muncher."'
-	'Before Lera can reply, Lena steps between the girls. "That''s enough, we''re not here to bitch about this shit." She then turns to you. "And you, chill the fuck out and stop being the town bicycle or you''re out, got it?" They then turn and walk off, still chatting among themselves as the bell rings. You can''t help but worry. It seems your recent activity has made the other gopniks question whether you belong in the group or not. You better fix things fast or you risk being kicked out...'
+	'Pauline rolls her eyes. "Whatever. If you want to lick her ass so bad, go ahead and do it, you carpet muncher."'
+	'Before Lera can reply, Lena steps between the girls. "That''s enough. We''re not here to bitch about this shit." She then turns to you. "And you, chill the fuck out and stop being the town bicycle, or you''re out, got it?" They then turn and walk off, still chatting as the bell rings. You can''t help but worry. Your recent activity has made the other Gopnik question whether you belong in the group. You better fix things fast, or you risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -462,7 +462,7 @@ if $ARGS[0] = 'coolkid outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
-	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to speak, Irina cuts you off. "Save it, we don''t care. I don''t know what happened, but you use to be cool. Now? Well you made your choice. You''re no longer welcome to hang out with us." With that Irina turns and walks away as Dimka gives you a final look and shakes his head.'
+	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to speak, Irina cuts you off. "Save it. We don't care. I don't know what happened, but you used to be cool. Now? Well, you made your choice. You''re no longer welcome to hang out with us." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
 	'"Now you''re where you always belonged. With the other losers." he says before leaving as well. You hear the other students laughing as you look around. Having been publicly disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 
@@ -490,9 +490,9 @@ if $ARGS[0] = 'jock outcast':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
 	if christinaQW['blackmail'] = 2 or christinaQW['fight'] = 1:
-		'Lazar and Albina walk up to you and Albina scoffs at you dismissively. "It seems like you care more about being a social reject than anything else, so fuck off and go hang out with the other losers where you belong. We''re not your friends anymore, and don''t try to pretend otherwise." She gives you a pitiful once over before forcefully shoving you aside and walking away. A disappointed looking Lazar just shakes his head at you before catching up with Albina, where you hear them clearly mocking you. Having been publicly disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+		'Lazar and Albina walk up to you, and she scoffs at you dismissively. "It seems like you care more about being a social reject than anything else, so fuck off and go hang out with the other losers where you belong. We''re not your friends anymore, and don''t try to pretend otherwise." She gives you a pitiful once-over before forcefully shoving you aside and walking away. A disappointed-looking Lazar just shakes his head at you before catching up with Albina, where you hear them clearly mocking you. Having been publicly disavowed by your clique, the other students are ready to prey on your weakness, and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	else
-		'Christina, Lariska and Lina walk up to you. Lariska and Lina are looking at you like you did something wrong while Christina is smirking. She shoves you hard up against your locker. "What are you doing here bitch? You belong with the loser crowd now, so fuck off." she says with a laugh and Lariska and Lina join in openly mocking you. "Stay away from us or I''ll show you what happens to little bitches who don''t know their place." Christina warns before they turn and walk away. Having been publicly disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+		'Christina, Lariska and Lina walk up to you. Lariska and Lina look at you like you did something wrong while Christina smirks. She shoves you hard up against your locker. "What are you doing here bitch? You belong with the loser crowd now, so fuck off." She laughs, and Lariska and Lina join in openly mocking you. "Stay away from us, or I''ll show you what happens to little bitches who don''t know their place," Christina warns before they turn and walk away. Having been publicly disavowed by your clique, the other students are ready to prey on your weakness, and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	end
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
@@ -519,7 +519,7 @@ if $ARGS[0] = 'nerd outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
-	'You try to find your friends, but most seem to be hiding or hurry off when you approach. You finally manage to catch up to Gerasim, but as you''re about to say something he turns to you. "Please go away, I can''t be seen hanging out with you. I''ve got enough problems without you making it worse. None of us want to be around you anymore." He sighs when he sees the dejected look on your face. "I''m sorry I really am, but this is your own fault. Please just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+	'You try to find your friends, but most seem to be hiding or hurry off when you approach. You finally manage to catch up to Gerasim, but as you''re about to say something, he turns to you. "Please go away. I can''t be seen hanging out with you. I''ve got enough problems without you making them worse. None of us wants to be around you anymore." He sighs when he sees the dejected look on your face. "I''m sorry, I really am, but this is your fault. Please just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. Finally, you grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
 	grupvalue[1] = min(rand(600,650),grupvalue[1])
@@ -545,7 +545,7 @@ if $ARGS[0] = 'gopnik outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
-	'As you approach your locker, Pauline, Lera and Lena walk up next to you. Pauline looks like she''s preparing to beat you up while Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. Nooo, you had to become a spineless cunt afraid of her own shadow, so stay the fuck away from us or I''ll beat the shit out of you!" With that, Pauline shoves you against your locker and walks away. Lena gives you a final look of disgust and shoves you again while Lera gives you a few parting words before walking away. "You''re so pathetic even the nerds will kick your ass now." Having been publicly disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+	'As you approach your locker, Pauline, Lera, and Lena walk up next to you. Pauline looks like she''s preparing to beat you up, while Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently, hanging out, partying and having a good time wasn''t enough for you. Nooo, you had to become a spineless cunt afraid of her own shadow, so stay the fuck away from us, or I''ll beat the shit out of you!" With that, Pauline shoves you against your locker and walks away. Lena gives you a final look of disgust and pushes you again while Lera gives you a few parting words before walking away. "You''re so pathetic. Even the nerds will kick your ass now." Having been publicly disavowed by your clique, the other students are ready to prey on your weakness, and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
 	grupvalue[1] = min(rand(625,675),grupvalue[1])
@@ -572,7 +572,7 @@ if $ARGS[0] = 'gopnik miss':
 	'<center><b><font color = maroon>School Hall</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big20.jpg"></center>'
 	'Just as you approach your locker, Lena shoves you against it. "Where the fuck were you bitch? We waited almost an hour for you!"'
-	'You start to answer, but before you can even get a single word out, she shoves you again. "It doesn''t matter, we changed our mind about you. You''re not welcome. So get lost." she snarls before storming off. Maybe if you try to earn their respect again they will give you a second chance.'
+	'You start to answer, but she shoves you again before you can even get a single word out. "It doesn''t matter. We changed our mind about you. You''re not welcome. So get lost." she snarls before storming off. If you try to earn their respect again, they will give you a second chance.'
 	minut += 1
 	grupvalue[4] = rand(675,725)
 	old_grupvalue[4] = grupvalue[4]

+ 1 - 0
locations/hookahlounge.qsrc

@@ -4,6 +4,7 @@
 !!I intend on adding 2 NPCs, a Muslim woman and a man of undecided origin. Unclear at the moment on what their connection is.
 !!Possibility to unlock more drugs to take using the hookah as relationship with Muslim woman progresses.
 !!I have an idea to possibly enable Sveta to work at the Hookah Lounge in the future
+!!I want something where on repeat visits, Aliyyah (the woman at the counter) greets Sveta by name instead of by "ma'am"
 if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'hookahlounge'

+ 2 - 2
locations/hunter_favors.qsrc

@@ -222,7 +222,7 @@ if $ARGS[0] = 'creekside_gangbang_request':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax3.jpg"></center>'
 			'You politely refuse, saying you don''t owe them anything, but the men don''t accept a no, and you can see they''re clearly not satisfied with your answer.'
-			'"Sveta, don''t fuck around with us. Deep inside, you know you need to repay us," said Andrei, grabbing you by the hair.'
+			'"<<$pcs_firstname>>, don''t fuck around with us. Deep inside, you know you need to repay us," said Andrei, grabbing you by the hair.'
 			minut += 5
 			hunter_collective_opinion -= 25
 			hunter_sexual_comfort += 15
@@ -598,7 +598,7 @@ if $ARGS[0] = 'yard_bondage':
 						gs 'stat'
 
 						'"Well," you respond. "Do I look like some sex toy to you?" you reply. "What is next? You just randomly fuck me whenever?"'
-						'"You are not exactly all pure and innocent, Sveta," he says. "I think you are just being a bitchy cocktease", and walks away'
+						'"You are not exactly all pure and innocent, <<$pcs_firstname>>," he says. "I think you are just being a bitchy cocktease", and walks away'
 						act 'Further': gt 'swamp_yard', 'start'
 					end
 				end

+ 3 - 0
locations/intro_initialization.qsrc

@@ -430,6 +430,9 @@ else
 		gm_school[49] = 1
 		gm_school_h[49] = 120
 		gm_school_b[49] = pcs_hips
+		market_outfits[17] = 1
+		market_outfits_h[17] = 60
+		market_outfits_b[17] = pcs_hips
 	elseif school_clothing = 3:
 		gm_school[25] = 1
 		gm_school_h[25] = 120

+ 12 - 14
locations/journal_work.qsrc

@@ -1,14 +1,11 @@
 # journal_work
-! Created 12/9/22 
-! 12/9/22 Initial code
-! Authored by Hooded Silence
-! Game Character work section. This is the container file for all work roles in game. Used to track income, work days and other relevant data.
-! V .01 Refactored code from Journal section into it''s own section to make legibility easier.
-!
-! Work Variables:
-!
-! employed[qw] = Work tracker if employed. To be set on starting or leaving a job.
-
+!! Created 12/9/22 
+!! 12/9/22 Initial code
+!! Authored by Hooded Silence
+!! Game Character work section. This is the container file for all work roles in game. Used to track income, work days and other relevant data.
+!! V .01 Refactored code from Journal section into it''s own section to make legibility easier.
+!! V. 02 New job schedule system integrated
+!!
 
 if $ARGS[0] = 'start':
 
@@ -18,8 +15,11 @@ if $ARGS[0] = 'start':
 	$jumploc = 'worktab'
 	gs 'journal', 'journalmenu'
 	'<center><h2>Work</h2></center>'
-	if employedqw['status'] = 0:
+	if emp_job[active] < 1:
 		'You need to find a job or get training to develop your career. Check the Quests or Information section.'
+	else
+		function_sw = 2
+		gs 'emp_functions', 'gen_schedule'
 	end
 	
 	if workPTU > 2:'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between 14:00 and 16:00. Your salary is 300 <b>₽</b> per day.'
@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. The salary shall be issued once a week, on Fridays.'
 	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. The salary shall be issued once a week, on Fridays.'
 	if (work = 1 or cheatWork = 1) and workFabrika = 1:'You work as a seamstress in the factory in Pavlovsk. Work is every weekday, with weekends off. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and TourGuide = 1:'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b> .'
+	!!if (work = 1 or cheatWork = 1) and TourGuide = 1:'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b> .'
 	if workrin = 1:'You are working at the market in Arthur''s tent as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of 08:00. Salary depends on sales.'
 	if maidqw = 1:
 		'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from 16:00 to 19:00 and your salary is 250 <b>₽</b> plus tips.'
@@ -144,6 +144,4 @@ if $ARGS[0] = 'start':
 		end
 	end
 end
-
-
 --- journal_work ---------------------------------

+ 30 - 30
locations/katja_chat.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'start':
 
 	if npc_sex['A14'] > 0:
 		if katjaQW['slut'] >= 100:
-			'Katja embraces you and gives you quick kiss on the lips. "How are you, <<$pcs_nickname>>? It''s great to see you," she says after letting you go.'
+			'Katja embraces you and gives you a quick kiss on the lips. "How are you, <<$pcs_nickname>>? It''s great to see you," she says after letting you go.'
 			'"I''m good," you answer. "How about you?"'
 			'"I''m doing fine. In fact, even better now that you''re here," she replies.'
 		elseif katjaQW['slut'] >= 50:
@@ -110,9 +110,9 @@ if $ARGS[0] = 'start':
 		act 'Say you can''t stay to chat': gt $loc, $loc_arg
 	else
 		if fame['city_slut'] > 200:
-			'"This is not the place to attract boys," Katja says in a mocking tone. "Take your antics somewhere else!"'
+			'"This is not the place to attract boys," Katja says mockingly. "Take your antics somewhere else!"'
 			'"Maybe I am not hunting for boys but redheaded girls this time," you reply in jest.'
-			'"Stop it! I''m not interested," she says in a tone less harsh than you expected.'
+			'"Stop it! I''m not interested," she says, in a tone less harsh than you expected.'
 			'"Maybe you should be," you say with a smirk. "I could definitely teach you a thing or two about how to have fun."'
 			'Katja''s face grows red and her breath hitches, defying the stern look on her face.'
 			if npc_rel['A14'] > 40:
@@ -122,18 +122,18 @@ if $ARGS[0] = 'start':
 				act 'Leave': gt $loc, $loc_arg			
 			end
 		elseif npc_rel['A14'] > 60:
-			'"Hi <<$pcs_nickname>>, great to see you. How is it going?" Katja asks.'
+			'"Hi, <<$pcs_nickname>>. Great to see you. How is it going?" Katja asks.'
 			'"It''s going good," you reply. "How about you?"'
 			'"I''m good," Katja says.'
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 			act 'Say you don''t have time to chat': gt $loc, $loc_arg
 		elseif npc_rel['A14'] < 25:
-			'"What are you doing here?" Katja says. "I don''t have time for bullies like you." She then turns around and ignores you.'
+			'"What are you doing here?" Katja asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			'"Hi <<$pcs_nickname>>," Katja says, looking awkwardly at you, like she is trying to determine why you approached her.'
-			'"Hi Katja," you say. "How are you?"'
-			'"I''m good," she says and her composure loosens up a little.'
+			'"Hi, <<$pcs_nickname>>," Katja says, looking awkwardly at you like she is trying to determine why you approached her.'
+			'"Hi, Katja," you say. "How are you?"'
+			'"I''m good," she says, and her composure loosens a little.'
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 			act 'Say you don''t have time to chat': gt $loc, $loc_arg
 		end
@@ -148,7 +148,7 @@ if $ARGS[0] = 'uni_cafe':
 
 	if npc_sex['A14'] > 0:
 		if katjaQW['slut'] >= 100:
-			'Katja get up and gives you quick kiss on the lips. "How are you, <<$pcs_nickname>>? It''s great to see you," she says after sitting down again.'
+			'Katja gets up and gives you a quick kiss on the lips. "How are you, <<$pcs_nickname>>? It''s great to see you," she says after sitting down again.'
 			'"I''m good," you answer. "How about you?"'
 			'"I''m doing fine. In fact, even better now that you''re here," she replies.'
 		else
@@ -157,7 +157,7 @@ if $ARGS[0] = 'uni_cafe':
 			'"I''m doing fine. In fact, even better now that you''re here," she replies.'
 		end
 		if uni_lunch_bought = 1:
-			'You sit down and start eating your lunch with Katja while the two of you are talking'
+			'You sit down and start eating your lunch with Katja while you are talking.'
 			act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 		else
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -165,14 +165,14 @@ if $ARGS[0] = 'uni_cafe':
 		end
 	else
 		if fame['city_slut'] > 200:
-			'"This is not the place to attract boys," Katja says in a mocking tone. "Take your antics somewhere else!"'
+			'"This is not the place to attract boys," Katja says mockingly. "Take your antics somewhere else!"'
 			'"Maybe I am not hunting for boys but redheaded girls this time," you reply in jest.'
-			'"Stop it! I''m not interested," she says in a tone less harsh than you expected.'
+			'"Stop it! I''m not interested," she says, in a tone less harsh than you expected.'
 			'"Maybe you should be," you say with a smirk. "I could definitely teach you a thing or two about how to have fun."'
 			'Katja''s face grows red and her breath hitches, defying the stern look on her face.'
 			if npc_rel['A14'] > 40:
 				if uni_lunch_bought = 1:
-					'You sit down and start eating your lunch with Katja while the two of you are talking'
+					'You sit down and start eating your lunch with Katja while you are talking.'
 					act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 				else
 					act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -182,25 +182,25 @@ if $ARGS[0] = 'uni_cafe':
 				act 'Leave': gt 'uni_cafe'		
 			end
 		elseif npc_rel['A14'] > 60:
-			'"Hi <<$pcs_nickname>>, great to see you. How is it going?" Katja asks.'
+			'"Hi, <<$pcs_nickname>>.Great to see you. How is it going?" Katja asks.'
 			'"It''s going good," you reply. "How about you?"'
 			'"I''m good," Katja says.'
 			if uni_lunch_bought = 1:
-				'You sit down and start eating your lunch with Katja while the two of you are talking'
+				'You sit down and start eating your lunch with Katja while you are talking.'
 				act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 			else
 				act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 				act 'Say you can''t stay to chat': gt 'uni_cafe'
 			end
 		elseif npc_rel['A14'] < 25:
-			'"What are you doing here?" Katja says. "I don''t have time for bullies like you." She then turns around and ignores you.'
+			'"What are you doing here?" Katja asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
 			act 'Leave': gt 'uni_cafe'
 		else
 			'"Hi <<$pcs_nickname>>," Katja says, looking awkwardly at you, like she is trying to determine why you approached her.'
 			'"Hi Katja," you say. "How are you?"'
-			'"I''m good," she says and her composure loosens up a little.'
+			'"I''m good," she says, and her composure loosens a little.'
 			if uni_lunch_bought = 1:
-				'You sit down and start eating your lunch with Katja while the two of you are talking'
+				'You sit down and start eating your lunch with Katja while you are talking.'
 				act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 			else
 				act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -216,24 +216,24 @@ if $ARGS[0] = 'chat':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if locat['katja'] = 26:
 		if $university['enrolled_in'] = 'teaching_studies':
-			'Katja says you need to leave for class now so that you aren''t late.'
+			'Katja says you need to leave for class now, so you aren''t late.'
 			hour -= 1
 			if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 			act 'Say you aren''t going to class and leave': hour += 1 & gt $loc, $loc_arg
 		else
-			'Katja says that she needs to leave now so that she isn''t late for class.'
+			'Katja says she needs to leave now, so she isn''t late for class.'
 			hour -= 1
 			if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 			act 'Say goodbye': hour +=1 & gt $loc, $loc_arg
 		end
 	elseif locat['katja'] = 50:
 		if $university['enrolled_in'] = 'teaching_studies':
-			'Katja says that you need to leave for class now so that you aren''t late for the exam.'
+			'Katja says that you need to leave for class now, so you aren''t late for the exam.'
 			hour -= 1
 			if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 			act 'Say you aren''t going to the exam and leave': hour += 1 & gt $loc, $loc_arg
 		else
-			'Katja says that she needs to leave for class now so that she isn''t late for her exam.'
+			'Katja says she needs to leave for class now, so she isn''t late for her exam.'
 			hour -= 1
 			if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 			act 'Say goodbye': hour +=1 & gt $loc, $loc_arg
@@ -285,12 +285,12 @@ if $ARGS[0] = 'chat1':
 	!!end
 
 	if locat['katja'] = 24: 
-		'Katja grabs a magazine lying on the table, opens it and hands it to you. "Look at that dress, <<$pcs_nickname>>. I think it would look very good on you," she says. It is indeed a nice dress, but before you can respond, she is already flipping pages to another dress.'
+		'Katja grabs a magazine lying on the table, opens it and hands it to you. "Look at that dress, <<$pcs_nickname>>. I think it would look perfect on you," she says. It is a lovely dress, but before you can respond, she is already flipping pages to another dress.'
 		'Katja spends the next few minutes showing you clothes that she thinks would suit you or would just like for herself.'
 		if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 		if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 	elseif locat['katja'] = 25:
-		'Katja suddenly gestures to a tall brunette in a long dress walking by. "Look at her! She is so pretty in that dress. I wish I had that," she says longingly. You''re unsure if she meant that she wants the dress or the girl.'
+		'Katja suddenly gestures to a tall brunette in a long dress walking by. "Look at her! She is so pretty in that dress. I wish I had that," she says longingly. You''re unsure if she meant she wanted the dress or the girl.'
 		'You spend the next several minutes talking with Katja about the clothes and makeup of the girls who pass you by.'
 		if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 		if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
@@ -316,7 +316,7 @@ if $ARGS[0] = 'first_meet':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'"Are you studying at uni?" you ask.'
 	'"Yes, I''m '+iif(year = 2017 and month < 10, 'going to study', 'studying')+' to become a teacher," Katja says. "What about you. Are you also studying here?"'
-	'"I''m '+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher.', ' '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university')+',')+'" you tell Katja.'
+	'"I''m '+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher,', ' '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university,')+',')+'" you tell Katja.'
 	act 'Talk about something else': gt 'katja_chat', 'chat1'
 end	
 
@@ -324,15 +324,15 @@ end
 if $ARGS[0] = 'sofia1':
 	sofiaQW['QWstage'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'"So what do you think about my roommate?" Katja asks with a curious look on her face.'
+	'"So, what do you think about my roommate?" Katja asks with a curious look on her face.'
 	'"She seems nice," you answer. "But she sure does talk a lot."'
 	'"She talks constantly; she never shuts up! Like she has nobody else to talk to except me," Katja complains.'
 	'"Is that true?" you ask.'
-	'"Maybe. I don''t think she''s made any friends since she moved here. So she probably only has me and her boyfriend," Katja says. "If she just had something interesting to say it might be a bit more bearable," Katja continues.'
+	'"Maybe. I don''t think she''s made any friends since she moved here. So she probably only has her boyfriend and me," Katja says. "If she just had something interesting to say, it might be a bit more bearable," Katja continues.'
 	'"She never says anything interesting?" you ask.'
-	'"Well, sometimes she talks about her classes, which isn''t too boring or she''ll tell me about something she saw or experienced that day," Katja says. "But mostly she just tells the same stories from her stupid hometown in the fucking middle of nowhere, or even worse, just fawns over her boyfriend." The redhead looks at you and smiles slightly, "At least she knows you now, so maybe she''ll start bothering you instead so I can get a little bit of peace."'
-	'"Hopefully she can make some more friends soon," you say with a laugh.'
-	'"I doubt it," Katja says. "She is constantly hanging out with her boyfriend and I don''t think he wants her to meet other girls. She also goes back to her hometown on Thursday nights and stays until Sunday, so she doesn''t have much time to meet anyone."'
+	'"Well, sometimes she talks about her classes, which isn''t too boring, or she''ll tell me about something she saw or experienced that day," Katja says. "But mostly, she just tells the same stories from her stupid hometown in the fucking middle of nowhere, or even worse, just fawns over her boyfriend." The redhead looks at you and smiles slightly, "At least she knows you now, so maybe she''ll start bothering you instead so I can get a little bit of peace."'
+	'"Hopefully, she can make some more friends soon," you laughingly.'
+	'"I doubt it," Katja says. "She is constantly hanging out with her boyfriend, and I don''t think he wants her to meet other girls. She also returns to her hometown on Thursday nights and stays until Sunday, so she doesn''t have much time to meet anyone."'
 	'"You''re not too fond of her boyfriend?" you ask.'
 	'"I don''t know," she says. "There''s something about him that feels a little bit off, but I shouldn''t speak ill of people you don''t even know. So let''s wait until after you meet him."'
 	act 'Talk about something else': gt 'katja_chat', 'chat1'

+ 3 - 1
locations/mey_home.qsrc

@@ -197,9 +197,10 @@ if $ARGS[0] = '2':
 	$menu_loc = 'mey_home'
 	$menu_arg = '2'
 	menu_off = 0
+	$location_type = 'bathroom'
+	$bathtype = 'glass shower and tub'
 	cls
 	gs'stat'
-	$location_type = 'bathroom'
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
 	*nl
@@ -207,6 +208,7 @@ if $ARGS[0] = '2':
 	'Above the beautiful vanity and sink there is a huge <a href="exec:gt ''mirror'',''start''">mirror</a>.'
 	!acts copy from [shulgabath]
 	act 'Return to the hallway': minut += 1 & gt 'mey_home', 'start'
+	gs 'selfplay', 'suction_dildo'
 	gs 'din_van', 'private'
 end
 

+ 26 - 26
locations/misha.qsrc

@@ -6,14 +6,14 @@ if $ARGS[0] = '1':
 	gs 'themes', 'indoors'
 	gs 'boyStat','A54'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/misha.pre0,<<rand(0,1)>>.jpg"></center>'
-	'You enter Uncle Misha''s apartment. He lets you in and you take a seat, as he glances down the hallway once more to see if anyone saw you enter. Content that the hallway is empty, he closes the door behind him. He then immediately reaches for his pants and pulls out his large cock with a lewd grin on his face.'
-	'Uncle Misha approaches you, his cock bobbing up and down. Noticing your reluctance he puts his hand below your chin and makes you look him in the eye: "Come on girl, we both know why you''re here. You want to service my hard cock. Get to it."'
+	'You enter Uncle Misha''s apartment. He lets you in, and you take a seat as he glances down the hallway once more to see if anyone saw you walk in. Content that the hallway is empty, he closes the door behind him. He immediately reaches for his pants and pulls out his giant cock with a lewd grin.'
+	'Uncle Misha approaches you, his cock bobbing up and down. Noticing your reluctance, he puts his hand below your chin and makes you look him in the eye: "Come on, girl, we both know why you''re here. You want to service my hard cock. Get to it."'
 	gs 'stat'
 	act 'Take his dick in your mouth':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/misha0,<<rand(0,7)>>.jpg"></center>'
-		'Even though the size of his large cock intimidates you a little, you nod. He''s right... you wouldn''t have been here if this wasn''t what you wanted. Right?'
-		'You take your uncle''s penis in your hand, giving it a few short tugs. A bead of precum forms on the head of his dick, and you take that as your cue to really get involved. You move your head closer to his penis and close your lips around it, licking the dollop of precum off. It actually tastes kind of nice. You can feel his dick stiffen further in your mouth, and the thought of you being responsible for this gives you an odd sense of accomplishment.'
+		'Even though the size of his giant cock intimidates you a little, you nod. He''s right... you wouldn''t have been here if this wasn''t what you wanted. Right?'
+		'You take your uncle''s penis in your hand, giving it a few short tugs. A bead of precum forms on the head of his dick. You accept that as your cue to get involved. You move your face closer to his penis and close your lips around it, licking a dollop of precum off. It actually tastes kind of nice. You can feel his dick stiffen further in your mouth, and the thought of you being responsible for this gives you an odd sense of accomplishment.'
 		gs 'arousal', 'hj', 5, 'sub'
 		gs 'arousal', 'bj', 2
 		gs 'stat'
@@ -22,10 +22,10 @@ if $ARGS[0] = '1':
 			gs 'arousal', 'bj', 10, 'sub'
 			dmishaday = daystart
 			gs 'stat'
-			'He''s content just letting you suck him off for a bit, especially when you gather your courage and start to apply your skills. After a while he pulls back though, saying: "Alright <<$pcs_nickname>>, that was nice but not what I had in mind for today. It''s time for the main course!"'
+			'He''s content just letting you suck him off for a bit, especially when you gather your courage and start to apply your skills. Then, after a while, he pulls back, saying: "Alright, <<$pcs_nickname>>, that was nice but not what I had in mind for today. It''s time for the main course!"'
 			act 'Uncle Misha put his condom on': $temp = {gs 'dinsex','boy_puts_his_condom'} & xgt 'misha','1_2nd_part'
 			if prezik > 0:act 'You put your condom on his cock': $temp = {gs 'dinsex','pc_puts_condom'} & xgt 'misha','1_2nd_part'
-			act 'You tell Misha that he need not a condom': $temp = '' & xgt 'misha','1_2nd_part'
+			act 'You tell Misha that he doesn''t need a condom': $temp = '' & xgt 'misha','1_2nd_part'
 		end
 	end
 
@@ -36,8 +36,8 @@ if $ARGS[0] = '1':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/misha.exit0,0.jpg"></center>'
-			'You have no intentions of ''servicing him'', and stand up. Although he has always been nice to you, you know from the stories your mother told that uncle Misha is used to getting his way, and that he can get rather violent when he doesn''t. You try to placate him: "I''m sorry uncle, I didn''t mean to lead you on. I merely wanted to see if you were up for a chat."'
-			'Fortunately, he''s not upset with you at all. The smug grin on uncle Misha never leaves his face, his cock still hanging out of his pants. "No problem <<$pcs_nickname>>, I recognized that look in your eyes when I pulled my dick out. You''ll be back. They all come back." You try to ignore his laughter as you pull the door shut behind you.'
+			'You have no intentions of ''servicing him'' and stand up. Although he has always been pleasant to you, you know from the stories your mother told that uncle Misha is used to getting his way and can get rather violent when he doesn''t. So you try to placate him: "I''m sorry, uncle, I didn''t mean to lead you on. I merely wanted to see if you were up for a chat."'
+			'Fortunately, he''s not upset with you at all. The smug grin on uncle Misha never leaves his face, his cock still hanging out of his pants. "No problem, <<$pcs_nickname>>. I recognized that look in your eyes when I pulled my dick out. You''ll be back. They all come back." You ignore his laughter as you pull the door shut behind you.'
 			act 'Exit to the stairwell':gt'pod_ezd','etaj_2'
 		end
 	else
@@ -59,8 +59,8 @@ if $ARGS[0] = '1_2nd_part':
 		gs 'cum_call', 'face', $boy, 1,'','',20
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/misha.cum0,<<rand(0,1)>>.jpg"></center>'
 		'Panting heavily, your uncle Misha pulls his hard cock away from your pussy.'
-		'He motions for you to get on your knees, his breathing is ragged and his face flustered. Once you''re in position, he furiously masturbates his dick as you sit there waiting for his load, not sure whether to close your eyes or to keep looking at him. You decide to be brave and look him in the eye, which turns him on a great deal. He rewards you by focusing on your mouth and making sure not to cum near your eyes. You do what feels right in the moment and stick out your tongue, trying to catch at least some of it.'
-		'Uncle Misha takes a minute to catch his breath and admire his handiwork on your face, before leaning down and kissing you on the forehead. He throws a couple of crumpled bills on the floor. "Very nice, <<$pcs_nickname>>. Here, take these for your efforts", he says as you scramble to pick them up. Indicating he''s done with you now, he expects you to leave.'
+		'He motions for you to get on your knees. His breathing is ragged, and his face is flustered. Once you''re in position, he furiously masturbates his dick as you sit there waiting for his load, not sure whether to close your eyes or to keep looking at him. You decide to be brave and look him in the eye, which turns him on a great deal. He rewards you by focusing on your mouth and making sure not to cum near your eyes. You do what feels right and stick out your tongue, trying to catch at least some of it.'
+		'Uncle Misha takes a minute to catch his breath and admire his handiwork on your face before leaning down and kissing you on the forehead. He throws a couple of crumpled bills on the floor. "Very nice, <<$pcs_nickname>>. Here, take these for your efforts", he says as you scramble to pick them up. Indicating he''s done with you now, and he expects you to leave.'
 		gs 'arousal', 'end'
 		money = money + 200
 		npc_sex[$boy] += 1
@@ -72,8 +72,8 @@ end
 if $ARGS[0] = '2':
 	gs 'themes', 'indoors'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/father/sex/father.misha.pre0,0.jpg"></center>'
-	'They both drop their pants to their ankles, revealing their hard cocks.'
-	'Your stepfather instructs you, "Well, <<$pcs_nickname>>, given your history I''m sure you know what to do with these. Get started."'
+	'They both drop their pants to their ankles, revealing their stiff cocks.'
+	'Your stepfather instructs you, "Well, <<$pcs_nickname>>, given your history, I''m sure you know what to do with these. Get started."'
 	gs 'stat'
 	act 'Get on your knees and suck them off':
 		*clr & cla
@@ -86,7 +86,7 @@ if $ARGS[0] = '2':
 		npc_rel['A28']+=3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/father/sex/father.misha0,<<rand(0,1)>>.jpg"></center>'
 		'You meekly nod and fall to your knees in front of them, reaching for their hard dicks.'
-		'Since they have been talking about ''punishment'' non-stop, you do your best to keep them happy. Maybe they''ll go easy on you? You obediently put your lips around your stepfather''s dick, diligently sucking him off while you massage your uncle''s rod with your hand at the same time. A while later, the roles are reversed and your uncle Misha''s dick is deep down your throat as you try to keep your stepfather happy too.'
+		'Since they have been talking about ''punishment'' non-stop, you do your best to keep them happy. Maybe they''ll go easy on you? You obediently put your lips around your stepfather''s dick, diligently sucking him off while you massage your uncle''s rod with your hand at the same time. A while later, the roles are reversed, and your uncle Misha''s dick is deep down your throat as you try to keep your stepfather happy.'
 		gs 'arousal', 'bj', 5,'dick[1]', 'sub', 'deepthroat', 'group'
 		gs 'arousal', 'hj', 5,'dick[2]', 'sub', 'group'
 		minut -= 5
@@ -98,9 +98,9 @@ if $ARGS[0] = '2':
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/father/sex/father.misha1,<<rand(0,5)>>.jpg"></center>'
-			'If your goal was to avoid punishment, you were way too eager to achieve that. Your uncle Misha notices how eager you are to comply and snorts: "Hmm, look at her... this is hardly punishment. She looks like she''s the happiest girl in the world, sucking our dicks like that."'
-			'Your stepfather agrees: "You''re right, <<$pcs_nickname>> should be punished properly." Then turning his attention to you he says: "Go on <<$pcs_nickname>>, spread those cute little legs of yours. It''s time for your real punishment."'
-			'You open your legs wide and <<lcase(mid($boydesc[2],1,1))>><<mid($boydesc[2],2,len($boydesc[2])-1)>> enters your pussy, while you suck your <<lcase(mid($boydesc[1],1,1))>><<mid($boydesc[1],2,len($boydesc[1])-1)>>. Neither of them are too gentle about it, and within seconds you find yourself gagging on cock on one end, and being roughly pounded at the other. After a while they change positions. And then again, and again... you can tell this is definitely not the first time they used a girl together. You''re surprised at the amount of positions they manage to fuck you in, but at the same time are too horny to care and just enjoy your ''punishment''.'
+			'If your goal was to avoid punishment, you were too eager to achieve that. Your uncle Misha notices how eager you are to comply and snorts: "Hmm, look at her... this is hardly a punishment. She looks like the happiest girl in the world, sucking our dicks like that."'
+			'Your stepfather agrees: "You''re right. <<$pcs_nickname>> should be punished properly." Then turning his attention to you, he says: "Go on, <<$pcs_nickname>>, spread those cute little legs of yours. After that, it''s time for your real punishment."'
+			'You open your legs wide and <<lcase(mid($boydesc[2],1,1))>><<mid($boydesc[2],2,len($boydesc[2])-1)>> enters your pussy, while you suck your <<lcase(mid($boydesc[1],1,1))>><<mid($boydesc[1],2,len($boydesc[1])-1)>>. Neither of them is too gentle about it. Within seconds, you find yourself gagging on cock on one end and being roughly pounded at the other. After a while, they change positions. And then again, you can tell this is definitely not the first time they used a girl together. You''re surprised at the number of positions they manage to fuck you in, but at the same time, are too horny to care and just enjoy your "punishment".'
 			gs 'arousal', 'bj', 15,'dick[1]', 'sub', 'deepthroat', 'group', 'rough'
 			gs 'arousal', 'vaginal', 15,'dick[2]', 'sub', 'group', 'rough'
 			gs 'arousal', 'bj', 15,'dick[2]', 'sub', 'deepthroat', 'group', 'rough'
@@ -119,7 +119,7 @@ if $ARGS[0] = '2':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/misha.cum0,<<rand(0,1)>>.jpg"></center>'
 					gs 'cum_call', 'mouth', $boy[1], 1
 					gs 'cum_call', 'face', $boy[2], 1
-					'Eventually they''re close enough to reach orgasm, and they tell you to get on your knees and take it on your face like a good little slut. You simply get down on your knees and do everything they say, having way too much of a good time to cause any trouble. They drop their loads on your face one at a time, while you try to lick off any bits of cum that drop close enough to your mouth. Being fully satisfied by you, they drop back into their chairs and resume their drinking, not paying any more attention to you.'
+					'Eventually, they''re close enough to reach orgasm, telling you to get on your knees and take it on your face like a good little slut. You simply get down on your knees and do everything they say, having way too much of a good time to cause any trouble. They drop their loads on your face one at a time while you try to lick off any bits of cum that drop close enough to your mouth. Then, being fully satisfied by you, they drop back into their chairs and resume their drinking, not paying any more attention to you.'
 					gs 'arousal', 'end'
 					gs 'stat'
 				elseif stepmisha = 1:
@@ -130,7 +130,7 @@ if $ARGS[0] = '2':
 					!!Misha in pussy, father in ass
 					gs 'cum_call', '', $boy[2], 1
 					gs 'cum_call', 'anus', $boy[1], 1
-					'Finally uncle Misha fills up your pussy, while your stepfather comes inside your ass.'
+					'Finally, uncle Misha fills up your pussy, while your stepfather comes inside your ass.'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -142,7 +142,7 @@ if $ARGS[0] = '2':
 					!!father in pussy, Misha in ass
 					gs 'cum_call', '', $boy[1], 1
 					gs 'cum_call', 'anus', $boy[2], 1
-					'Finally your stepfater fills up your pussy, while uncle Misha comes inside your ass.'
+					'Finally, your stepfather fills up your pussy, while uncle Misha comes inside your ass.'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -156,8 +156,8 @@ if $ARGS[0] = '2':
 					gs 'cum_call', '', $boy[1], 1
 					gs 'cum_call', '', $boy[2], 1
 					npc_rel['A28'] += 2
-					'Finally they both force their cocks in your pussy at the same time, and push up inside of you. The gravity helps them force you down on them to the hilt, but you still feel extremely full with their dicks.'
-					'For a few minutes your pussy feels really tight while you just moan and hang on, while they piston inside of your tight cunt, but in the end they both cum inside of you at the same time.'
+					'Finally, they force their cocks in your pussy simultaneously and push up inside you. The gravity helps them move you down on them to the hilt, but you still feel incredibly complete with their dicks.'
+					'For a few minutes, your pussy feels tight while you moan and hang on while they piston inside your tight cunt, but in the end, they both cum inside of you simultaneously.'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -193,7 +193,7 @@ if $ARGS[0] = '2':
 					gs 'cum_call', '', $boy[2], 1
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/garage/father/sex/firstguy.mp4"></video></center>'
 					'"Seriously, come already!" says <<lcase(mid($boydesc[1],1,1))>><<mid($boydesc[1],2,len($boydesc[1])-1)>>, while watching his brother fucking you.'
-					'"Hang on, I''m soon going to cum inside her puss... ahh... yeah, thats it!"'
+					'"Hang on, I''m soon going to cum inside her puss... ahh... yeah, that''s it!"'
 					'<<ucase(mid($boydesc[2],1,1))>><<mid($boydesc[2],2,len($boydesc[2])-1)>> pulls out of your pussy, causing the pumped-in sperm to start to flow out, but it doesn''t have much time.'
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/garage/father/sex/secondguy.mp4"></video></center>'
 					'<<ucase(mid($boydesc[1],1,1))>><<mid($boydesc[1],2,len($boydesc[1])-1)>> immediately jumps to the newly available hole, and stuff his prick inside.'
@@ -210,8 +210,8 @@ if $ARGS[0] = '2':
 					gs 'cum_call', 'anus', $boy[1], 1
 					gs 'cum_call', 'anus', $boy[2], 1
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/garage/father/sex/firstguy.mp4"></video></center>'
-					'"Seriously, come already!" says <<$boydesc[2]>>, while watching his brother fucking you.'
-					'"Hang on, I''m soon going to cum inside her ass... ahh... yeah, thats it!"'
+					'"Seriously, come already!" says <<$boydesc[2]>>, watching his brother fucking you.'
+					'"Hang on, I''m soon going to cum inside her ass... ahh... yeah, that''s it!"'
 					'<<ucase(mid($boydesc[1],1,1))>><<mid($boydesc[1],2,len($boydesc[1])-1)>> pulls out of your gaping anus, causing the pumped-in sperm to start to flow out, but it doesn''t have much time.'
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/garage/father/sex/secondguy.mp4"></video></center>'
 					'<<ucase(mid($boydesc[2],1,1))>><<mid($boydesc[2],2,len($boydesc[2])-1)>> immediately jumps to the newly available hole, and stuff his prick inside.'
@@ -230,8 +230,8 @@ if $ARGS[0] = '2':
 					gs 'cum_call', 'anus', $boy[1], 1
 					npc_rel['A28'] += 2
 					gs 'stat'
-					'Finally they both force their cocks in your ass at the same time, and pushes up inside of you. The gravity helps them force you down on them to the hilt, but you still feel extremely full with their dicks.'
-					'For a few minutes your anus feels really tight while you just moan and hang on, while they piston inside of your ass, but in the end they both cum inside of you at the same time.'
+					'Finally, they both force their cocks in your ass simultaneously and push up inside of you. The gravity helps them move you down on them to the hilt, but you still feel incredibly complete with their dicks.'
+					'For a few minutes, your anus feels tight while you moan and hang on while they piston inside of your ass, but in the end, they both cum inside you simultaneously.'
 					gs 'arousal', 'end'
 					gs 'stat'
 				end

+ 146 - 146
locations/natbel_friend.qsrc

@@ -8,16 +8,16 @@ if $ARGS[0] = 'go_for_walk':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/walk1.jpg"></center>'
-	'You both head of as friends to hang out together whilst going on a walk around town. On the way Natasha says "I like walking around with you as I''m not into sports too much and I do like isn''t the exercise. It''ll help keep my figure if I stay in shape."' 
-	'You look at her and feel that a compliment is in order as she has a lovely figure "Well Natasha I think that you have a lovely figure! Umm... Maybe at some time you might like to go for a jog with me?"'
-	'Natasha is clearly unsure about your suggestion and you barely get a "Yeah maybe..." response. You think to yourself that at least she didn''t say no and it might be fun.'
+	'You both head off as friends to hang out together whilst going on a walk around town. On the way, Natasha says, "I like walking around with you as I''m not into sports too much, and I do like isn''t the exercise. It''ll help keep my figure if I stay in shape."' 
+	'You look at her and feel that a compliment is in order as she has a lovely figure. "Well, Natasha, I think that you have a lovely figure! Umm... Maybe you might like to go for a jog with me sometime?"'
+	'Natasha is unsure about your suggestion, and you barely get a "Yeah, maybe..." response. You think that at least she didn''t say no, and it might be fun.'
 
 	act 'Suggest going to the cafe':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/walk2.jpg"></center>'
-		'A while into your walk you have an idea and say "Natasha, my <<$npc_nickname[''A29'']>> works at Borislav''s cafe near the station so I can get free food and drinks there. Shall we go over and pop in for a drink?"'
-		'Natasha nods her agreement "Yes <<$pcs_nickname>>..." You give her a quizzical look and she restarts "Yes <<$pcs_nickname>> that would be very nice but only if you''re sure as we shouldn''t take advantage of their offer."'
-		'You agree and reply "Yes you''re right. It''s nice of Slava to have made the offer to me so how about we just have a milkshakes each?"' 
+		'A while into your walk, you have an idea and say, "Natasha, my <<$npc_nickname[''A29'']>> works at Borislav''s cafe near the station, so I can get free food and drinks there. So let''s go over and pop in for a drink.'
+		'Natasha nods her agreement. "Yes, <<$pcs_nickname>>..." You give her a quizzical look, and she restarts, "Yes, <<$pcs_nickname>>, that would be very nice, but only if you''re sure, as we shouldn''t take advantage of their offer."'
+		'You agree and reply, "Yes, you''re right. It''s nice of Slava to have made the offer to me, so how about we just have a milkshake each?"' 
 		'Natasha smiles and nods enthusiastically. "Now that''s a great idea!"' 
 
 		act 'Go to the cafe':
@@ -39,7 +39,7 @@ if $ARGS[0] = 'go_for_walk':
 			gs 'stat'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/cafe1.jpg"></center>'
-			'You both head off to the cafe. Once you arrive you tell Natasha to have a seat while you go and get a couple of shakes. You thank Slava for them and take them back to the table with Natasha. You both sit and enjoy the shakes, chilling out having a nice chat about whatever comes to mind including Natasha''s interest in the latest fashion. "So Natasha I hear that you are interested in fashion, maybe we can have a look at some clothes together in a store or just flick through a magazine or two." Natasha smiles and you spend some time where she tells you about some of the latest fashions. Nearly a hour later you decide to...'
+			'You both head off to the cafe. Once you arrive, you tell Natasha to have a seat while you go and get a couple of shakes. You thank Slava for them and take them back to the table with Natasha. You both sit and enjoy the shakes, chilling out and having a friendly chat about whatever comes to mind, including Natasha''s interest in the latest fashion. "So Natasha, I hear that you are interested in fashion. Maybe we can look at some clothes together in a store or just flick through a magazine or two." Natasha smiles, and you spend some time where she tells you about some of the latest fashions. Nearly an hour later, you decide to...'
 
 			act 'Return to her room': gt 'natbelapt', 'natroom'
 		end
@@ -51,30 +51,30 @@ if $ARGS[0] = 'go_for_walk':
 		gs 'stat'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/walk2.jpg"></center>'
-		'You both hang out as good friends whilst you have nice walk around town laughing and joking with each other and chatting about all sorts; just two girls enjoying each others company as best friends should. During your walk Natasha says "I''m really enjoying this just spending time with you and that the walk will be good for my figure."' 
-		'You look at her and say "I can''t see any problems there you have a lovely figure Natasha."'
-		'She tells you "Well I don''t get a chance to do much walking or exercise in general as I have to help at home a lot and doesn''t give me much time to myself which gets me down at times."'
+		'You both hang out as good friends whilst you have a nice walk around town, laughing and joking with each other and chatting about all sorts; just two girls enjoying each other''s company as best friends should. During your walk, Natasha says, "I''m really enjoying this just spending time with you and that the walk will be good for my figure."' 
+		'You look at her and say, "I can''t see any problems. You have a lovely figure, Natasha."'
+		'She tells you, "Well, I don''t get a chance to do much walking or exercise in general as I have to help at home a lot, and it doesn''t give me much time to myself, which sometimes gets me down."'
 
 		act 'Keep walking and talking':
 			minut += 10
 			gs 'stat'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/walk3.jpg"></center>'
-			'As the two of you keep walking, you respond with "Well how about we go out and about a bit more often in the future?"'
-			'Natasha responds with a smile "Yes I''d love that."'
-			'After a while, Natasha looks a little sad and confides in you "You know Svetka I don''t have many friends who want to spend time with me other than some of the other nerds and all they want to do is play games and study."' 
-			'You think about what she''s just said and respond kindly "Well you''re a very clever young lady and you should be proud of your ability."' 
-			'She smiles at you but says "Yes but I feel that there must be more to life than studying." She continues "I''m also not much into games like the role play stuff the rest do".' 
+			'As the two of you keep walking, you respond with, "Well, how about we go out and about a bit more often in the future?"'
+			'Natasha smiles, "Yes, I''d love that."'
+			'After a while, Natasha looks a little sad. Then, finally, she confides in you, "You know, <<$pcs_nickname>>, I don''t have many friends who want to spend time with me other than some of the other nerds, and all they want to do is play games and study."' 
+			'You think about what she''s just said and respond kindly, "Well, you''re a very clever young lady, and you should be proud of your ability."' 
+			'She smiles at you but says, "Yes, but I feel that there must be more to life than studying." She continues, "I''m also not much into games like the role-playing stuff the rest do."' 
 
 			act 'Finish your walk':
 				minut += 10
 				gs 'stat'
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/walk4.jpg"></center>'
-				'You shoulder bump her as the two sit for a moment whilst still talking. "Well I don''t mind games but not all the time there''s much more to explore, you''re right! Although I''ve often thought of taking up chess to exercise the mind".' 
-				'Getting up you then continue your walk and chat and you then ask her about what interests her, "So Natasha, what does interest you, I''ve heard some chat that you like fashion."'
-				'She smiles and excitedly tells you "Yes I love fashion!" She then pauses and suddenly the smile vanishes and she looks sad as she continues "It''s just frustrating that as I can''t afford anything and have to rely on hand downs".' 
-				'This clearly upsets her so you give her a hug and smile saying "Well Natasha you mustn''t give up! Things can get better, you might just need to give it time." Forty five minutes later you are back in her apartment, hanging out in her room once more.'
+				'You bump shoulders with her as the two sit for a moment whilst still talking. "Well, I don''t mind games, but not all the time. There''s much more to explore, you''re right! Although I''ve often thought of taking up chess to exercise the mind".' 
+				'Getting up, you then continue your walk and chat, asking her what interests her, "So Natasha, what does interest you? I''ve heard some chat that you like fashion."'
+				'She smiles and excitedly tells you, "Yes, I love fashion!" She then pauses, and suddenly the smile vanishes. She looks sad as she continues, "It''s just frustrating that I can''t afford anything and have to rely on hand downs".' 
+				'This clearly upsets her, so you give her a hug and smile, saying, "Well, Natasha, you mustn''t give up! Things can get better. You might just need to give it time." Forty-five minutes later, you are back in her apartment, hanging out in her room again.'
 
 				act 'Return to her room': gt 'natbelapt', 'natroom'
 			end
@@ -88,24 +88,24 @@ if $ARGS[0] = 'go_to_park':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/park1.jpg"></center>'
-	'You both head to the park and walk around enjoying nature and each other''s company while you chat about whatever comes to mind taking into account the wonders of nature around you. She spots a shy squirrel at the base of the tree and as you carefully approach it takes fright and rapidly climbs the tree and disappears from sight prompting you both to giggle as clearly your stealth approach didn''t work too well.'
-	'You decide to spend some quality time together chatting so you ask Natasha about her interests "So Natasha I believe that you are interested in fashion and makeup?"'
-	'Natasha gives you a wry smile "Well yes I love fashion and would love to get some new clothes as I know that I''m not viewed too kindly by some of our classmates, however, regrettably we simply don''t have much money and I have to help my mum out as she works hard but the pay is poor and we struggle."' 
-	'You know a lot of your fellow students can be assholes, especially to nerds and outcasts, but you also know some of them are not, despite what Natasha might think.'
+	'You both head to the park and walk around, enjoying nature and each other''s company. At the same time, you chat about whatever comes to mind considering the wonders of nature around you. Then, she spots a shy squirrel at the base of the tree. As you carefully approach, it takes fright and rapidly climbs the tree and disappears from sight, prompting you both to giggle as your stealth approach didn''t work too well.'
+	'You decide to spend quality time chatting, so you ask Natasha about her interests. "So Natasha, I believe you are interested in fashion and makeup?"'
+	'Natasha gives you a wry smile. "Well, yes, I love fashion and would love to get some new clothes as I know that I''m not viewed too kindly by some of our classmates, however, regrettably, we simply don''t have much money, and I have to help my mum out as she works hard, but the pay is poor, and we struggle."' 
+	'You know many fellow students can be assholes, especially nerds and outcasts. Still, you also know some of them are not, despite what Natasha might think.'
 
 	act 'Disagree':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/park2.jpg"></center>'
-		'You give her a friendly smile and let her know "Well not all your classmates feel that way, and I don''t just mean the nerds, maybe we can do some stuff together and who knows... Maybe we''ll have to work on your image?" You continue "So how come you''re in the nerd group? You''re clever but you''re not a ''typical'' nerd... I can''t think of any of them other than Julia who''d like fashion and even she doesn''t seem to use makeup much and you''re not into the games they play and don''t want to spend all your free time studying... That doesn''t sound like a nerd to me!"'
+		'You give her a friendly smile and tell her, "Well, not all your classmates feel that way, and I don''t just mean the nerds. Maybe we can do some stuff together, and who knows... Maybe we''ll have to work on your image?" You continue, "So how come you''re in the nerd group? You''re clever, but you''re not a ''typical'' nerd... I can''t think of any of them other than Julia who''d like fashion, and even she doesn''t seem to use makeup much. You''re not into the games they play and don''t want to spend all your free time studying... That doesn''t sound like a nerd to me!"'
 
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/park3.jpg"></center>'
-			'"No, you''re right Sveta, I''m not! I guess that because I''m poor and don''t have the nice new clothes I wouldn''t be considered by the popular kids as my image won''t fit and pretty much the same with the jocks as I also don''t have much time for sports so I don''t even know if I''d like it."' 
-			'You look at her and ponder what she''s just said as she continues "I love walking around with you and chatting as I don''t get much of an opportunity to do this and her fellow nerds just aren''t into this kind of stuff."' 
+			'"No, you''re right, <<$pcs_nickname>>, I''m not! Because I''m poor and don''t have nice new clothes, I wouldn''t be considered by the popular kids as my image won''t fit. Pretty much the same with the jocks, as I also don''t have much time for sports, so I don''t even know if I''d like it."' 
+			'You look at her and ponder what she''s just said as she continues, "I love walking around with you and chatting as I don''t get much of an opportunity to do this and my fellow nerds just aren''t into this kind of stuff."' 
 			*nl
-			'As she pauses and looks at you, you give her a friendly hug and finally get a chance to respond "OK well first off we can do more walks and so on after school if you''d like and if you''re free. Also if you want to go for a jog or do some yoga I''d be happy if you''d like to join me. As regards the popular kids and the jocks who knows what the future holds, just don''t give up on your dreams. They''re important!"' 
-			'Natasha smiles and looks at you contentedly. forty five minutes later you are back in her apartment, hanging out in her room once more.'
+			'As she pauses and looks at you, you give her a friendly hug and finally get a chance to respond, "Okay, well, first off, we can do more walks after school if you''d like and if you''re free. Also, if you want to go for a jog or do some yoga, I''d be happy if you''d like to join me. Who knows what the future holds for the popular kids and the jocks? Just don''t give up on your dreams. They''re important!"' 
+			'Natasha smiles and looks at you contentedly. Forty-five minutes later, you are back in her apartment, hanging out in her room again.'
 
 			act 'Return to her room': gt 'natbelapt', 'natroom'
 		end
@@ -114,18 +114,18 @@ if $ARGS[0] = 'go_to_park':
 	act 'Agree':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/park4.jpg"></center>'
-		'You smile at her and agree "Yeah well I can''t disagree with you there, most are assholes! They can be cruel at times which I know isn''t what you need if you''re feeling down in the first place!"'
-		'Natasha is a little surprised at your response and looks at you "You know what Sveta? I know this may sound horrible and it''s not meant that way but it''s comforting in a way to know that I''m not the only one!"'
-		'You ponder that you both feel in pretty much the same place and slowly respond "Look Natasha clearly I don''t feel that way about you; maybe we can help each other get into a better place..." You continue ""So how come you''re in the nerd group? You''re clever but you''re not a ''typical'' nerd... I can''t think of any of them other than Julia who''d like fashion and even she doesn''t seem to use makeup much and you''re not into the games they play and don''t want to spend all your free time studying... That doesn''t sound like a nerd to me!"'
+		'You smile at her and agree, "Yeah, I can''t disagree with you there. Most are assholes! They can be cruel at times which I know isn''t what you need if you''re feeling down in the first place!"'
+		'Natasha is a little surprised at your response and looks at you. "You know what, <<$pcs_nickname>>? I know this may sound horrible, and it''s not meant that way, but it''s comforting to know I''m not the only one!"'
+		'You ponder that you both feel in the same place and slowly respond, "Look, Natasha, clearly I don''t feel that way about you; maybe we can help each other get into a better place..." You continue ""So how come you''re in the nerd group? You''re clever, but you''re not a "typical" nerd... I can''t think of any of them other than Julia who''d like fashion, and even she doesn''t seem to use makeup much. You''re not into the games they play and don''t want to spend all your free time studying... That doesn''t sound like a nerd to me!"'
 
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/park3.jpg"></center>'
-			'"No, you''re right Sveta, I''m not! I guess that because I''m poor and don''t have the nice new clothes I wouldn''t be considered by the popular kids as my image won''t fit and pretty much the same with the jocks as I also don''t have much time for sports so I don''t even know if I''d like it."' 
-			'You look at her and ponder what she''s just said as she continues "I love walking around with you and chatting as I don''t get much of an opportunity to do this and her fellow nerds just aren''t into this kind of stuff."' 
+			'"No, you''re right, <<$pcs_nickname>>, I''m not! I guess that because I''m poor and don''t have nice new clothes I wouldn''t be considered by the popular kids as my image won''t fit. Pretty much the same with the jocks, as I also don''t have much time for sports, so I don''t even know if I''d like it."' 
+			'You look at her and ponder what she''s just said as she continues, "I love walking around with you and chatting as I don''t get much of an opportunity to do this, and my fellow nerds just aren''t into this kind of stuff."' 
 			*nl
-			'As she pauses and looks at you, you give her a friendly hug and finally get a chance to respond "OK well first off we can do more walks and so on after school if you''d like and if you''re free. Also if you want to go for a jog or do some yoga I''d be happy if you''d like to join me. As regards the popular kids and the jocks who knows what the future holds, just don''t give up on your dreams. They''re important!"' 
-			'Natasha smiles and looks at you contentedly. forty five minutes later you are back in her apartment, hanging out in her room once more.'
+			'As she pauses and looks at you, you give her a friendly hug and finally get a chance to respond, "Okay, well, first off, we can do more walks and so on after school if you''d like and if you''re free. Also, if you want to go for a jog or do some yoga, I''d be happy if you''d like to join me. Who knows what the future holds for the popular kids and the jocks? Just don''t give up on your dreams. They''re important!"' 
+			'Natasha smiles and looks at you contentedly. Forty-five minutes later, you are back in her apartment, hanging out in her room again.'
 
 			act 'Return to her room': gt 'natbelapt', 'natroom'
 		end
@@ -151,34 +151,34 @@ if $ARGS[0] = 'go_to_del_greco':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/delparco1.jpg"></center>'
-	'You both head to the park and walk around enjoying the open space and the greenery which is in marked contrast to your estate whilst making the most of each other''s company as friends. After a while you suggest that you both pop into Del Parco for a drink and you get a couple of Kvass. You pay 240<b>₽</b> for both yours and Natasha''s. It''s a really nice restaurant and you both love it there.' 
-	'Natasha expresses her gratitude to you. "Thanks for this Svetka, you really didn''t have to."' 
+	'You both head to the park and walk around. Enjoying the open space and the greenery, which is in marked contrast to your estate, whilst making the most of each other''s company as friends. After a while, you suggest you go to Del Parco for a drink and get a couple of Kvass. You pay 240<b>₽</b> for both yours and Natasha''s. It''s a charming restaurant, and you both love it there.' 
+	'Natasha expresses her gratitude to you. "Thanks for this, <<$pcs_nickname>>. You really didn''t have to."' 
 
 	act 'Be friendly':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/delparco2.jpg"></center>'
-		'You respond "I know; I just wanted to treat my friend. Maybe we can do more stuff like this in the future if you like?"'	
+		'You respond, "I know; I just wanted to treat my friend. Maybe we can do more like this in the future if you like?"'	
 		'Natasha smiles contentedly and shyly nods her agreement.' 
-		'While having your drink you say to Natasha "I can see that you haven''t got much in the way of modern fashionable clothes; maybe we can go shopping together at some point?"'
+		'While having your drink, you say to Natasha, "I can see that you haven''t got much in the way of modern fashionable clothes; maybe we can go shopping together at some point?"'
 		*nl
-		'Natasha looks sad and responds "There''s nothing I''d like more but I simply can''t afford it. Sometimes I kid myself but that''s when I''ve borrowed money and I need to stop doing that as it keeps getting on top of me." She takes a deep breath and continues, "It''s so frustrating as I love fashion and want to be a cool girl but if I''m honest it''s simply out of reach and it makes it pretty difficult to even have a friend let alone a boyfriend!'
-		'You sympathise and let her know that having a boyfriend isn''t the answer to everything as a boyfriend relationship comes with it''s own difficulties and challenges although with some benefits too. There is a brief silence as you both think inwardly reflect further on your own lives.'
-		'You nod and give her hand a friendly squeeze and smiling at her say "Well who knows what the future may hold." forty five minutes later you decide to...'
+		'Natasha looks sad and responds, "There''s nothing I''d like more, but I simply can''t afford it. Sometimes I kid myself, but that''s when I''ve borrowed money, and I need to stop doing that as it keeps getting on top of me." She takes a deep breath and continues, "It''s so frustrating as I love fashion and want to be a cool girl. But, if I''m honest, it''s simply out of reach, making it difficult to even have a friend, let alone a boyfriend!'
+		'You sympathise and tell her that having a boyfriend isn''t the answer to everything. A boyfriend relationship comes with difficulties and challenges, although with some benefits. There is a brief silence as you both think inwardly and reflect further on your own lives.'
+		'You nod, give her hand a friendly squeeze, and, smiling at her, say, "Well, who knows what the future may hold." Forty-five minutes later, you decide to...'
 	end
 	act 'Be flirty':
 		NatbelQW['romance'] += 1
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/Hands.jpg"></center>'
-		'You reach over and place your hand on hers and squeeze it gentle, leaving your hand holding hers. "I know; I just wanted to treat you, you mean a lot to me. Maybe we can do more stuff like this in the future if you like?"'
-		'Natasha smiles then after a moment, she looks around at the other people around, after which she gently pulls her hand away. You can tell it made her a little uncomfortable but she didn''t seem to mind it to much. "There''s nothing I''d like more but I simply can''t afford it. Sometimes I kid myself but that''s when I''ve borrowed money and I need to stop doing that as it keeps getting on top of me."'
+		'You reach over, place your hand on hers, and gently squeeze it, leaving your hand holding hers. "I know; I just wanted to treat you. You mean a lot to me. Maybe we can do more like this in the future if you like?"'
+		'Natasha smiles, then after a moment, she looks around at the other people, after which she gently pulls her hand away. You can tell it made her uncomfortable, but she didn''t seem to mind it too much. "There''s nothing I''d like more, but I simply can''t afford it. Sometimes I kid myself, but that's when I've borrowed money, and I need to stop doing that as it keeps getting on top of me."'
 		*nl
-		'Natasha continues, "You know Sveta this has been great... A lovely walk with a real friend who speaks to me as a person rather than judging me." She lets out a big sigh, "Also some time when I can just switch off."'
-		'You are a little confused and look at her quizzically "Well I don''t judge but I like you, you are a good friend who is nice to me. That means a lot."'
-		'"You know Sveta it''s also nice that you made the choice to come here with me and took me out of the flat. Sometimes I have difficulty making even the smallest decision." Natasha smiles at you and squeezes your hand, "You know it''s nice that I can spend some time where I didn''t have to think or make decisions, just enjoy life."'
+		'Natasha continues, "You know, <<$pcs_nickname>>, this has been great... A lovely walk with a real friend who speaks to me as a person rather than judging me." She lets out a big sigh, "Also, sometime when I can just switch off."'
+		'You are a little confused and look at her quizzically. "Well, I don''t judge, but I like you. You are a good friend who is nice to me. That means a lot."'
+		'"You know, <<$pcs_nickname>>, it''s also nice that you chose to come here with me and took me out of the flat. Sometimes I have difficulty making even the smallest decision." Natasha smiles at you and squeezes your hand, "You know it''s nice that I can spend some time where I don''t have to think or make decisions and just enjoy life."'
 		*nl
-		'You look at her and understand that her life if pretty much a constant struggle and can sympathise as although your family are not well off they are in a better position than Natasha and her mum. "You know what Natasha you can have some down time with me, I like being with you and caring for you. I don''t mind making decisions... You probably don''t want to know some of the stuff I''ve had to do to get ahead."'
-		'Natasha looks at you and goes to respond then thinks better of it and just gives you a lovely smile and squeezes your hand again.'
-		'"OK Natasha it''s been lovely but I guess it''s time to head back."'
+		'You look at her and understand her life is a constant struggle and can sympathise. Although your family are not well off, they are in a better position than Natasha and her mum. "You know what, Natasha, you can have some downtime with me. I like being with you and caring for you. I don''t mind making decisions... You probably don''t want to know some of the stuff I''ve had to do to get ahead."'
+		'Natasha looks at you and goes to respond, then thinks better of it and just gives you a lovely smile and squeezes your hand again.'
+		'"Okay, Natasha, it''s been lovely, but I guess it''s time to head back."'
 
 		act 'Return to her room': gt 'natbelapt', 'natroom'
 	end
@@ -192,10 +192,10 @@ if $ARGS[0] = 'go_to_park_and_work':
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/flyers1.jpg"></center>'
-	'You both head of to the park having a friendly chat talking about school, current affairs and so on and spend an hour handing out flyers. Whilst you don''t get to spend too much time together as you are both busy with your job.'
-	'However, you do manage to have a brief chat about your interests and Natasha responds telling you "Well... mine is mainly fashion."' 
-	'When she sees you looking at her and not responding she continues "Although I''m in the nerds group I don''t really fit in with them and really don''t consider myself at home there. I think that there''s more to life than studying and the games they play in their games night so I don''t join them."' 
-	'You are not quite sure how to respond but do your best to reassure her giving her a friendly smile you say "Well look I''m your friend and let''s see where the journey takes us." After an hour you are both a bit richer richer and you can...'
+	'You both head off to the park, chat about school and current affairs, and spend an hour handing out flyers. But, unfortunately, you only get to spend a little time together as you are both busy with your job.'
+	'However, you have a brief chat about your interests, and Natasha responds, "Well... mine is mainly fashion."' 
+	'When she sees you looking at her and not responding, she continues, "Although I''m in the nerds'' clique, I don''t really fit in with them and don''t consider myself at home there. I think there''s more to life than studying and the games they play on their games night, so I don''t join them."' 
+	'You are unsure how to respond but do your best to reassure her. Giving her a friendly smile, you say, "Well, look, I''m your friend and let''s see where the journey takes us." After an hour, you are both a bit richer, and you can...'
 
 	act 'Return to her room': gt 'natbelapt', 'natroom'
 end
@@ -210,9 +210,9 @@ if $ARGS[0] = 'shopping_spree':
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha8.jpg"></center>'
 	'"So, Natasha," you start. "Have you decided on which hairstyle you''d like?"'
-	'"Well, I''m still a little undecided," she says. "Since you''re paying, I''d like to know what you think."'
-	'You sit by her and look through her choices. She''s circled a few and you both spend a few minutes deciding which one would look best for her.'
-	'"Thank you, <<$pcs_nickname>>. I''m sure it''ll look awesome. I just hope that you''ll be happy with the result too."'
+	'"Well, I''m still a little undecided," she says. "Since you''re paying, I''d like your thoughts."'
+	'You sit by her and look through her choices. She''s circled a few, and you spend a few minutes deciding which would look best for her.'
+	'"Thank you, <<$pcs_nickname>>. I''m sure it''ll look awesome. I hope that you''ll be happy with the result too."'
 	'You smile at her, "I''m sure I will be. So, are you ready for our trip?"'
 	'"Oh, yes!" she beams. "I''ve been so looking forward to this!"'
 	act 'Head out':
@@ -220,7 +220,7 @@ if $ARGS[0] = 'shopping_spree':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha9.jpg"></center>'
 		'You both stand up to leave.'
 		'"Oh, before I forget," she says.'
-		'You turn to her and notice her pulling out a small handful of bills from her purse. "I really wanted to contribute as much as I could, so I did some odd jobs handing out flyers. Now I can at least pay for our food while we''re out."'
+		'You turn to her and notice her pulling out a small handful of bills from her purse. "I wanted to contribute as much as possible, so I did some odd jobs handing out flyers. So now I can at least pay for our food while we''re out."'
 		'"Oh, that sounds great. Thanks!" you offer. "It''ll be a lovely end to our trip before we head home."'
 
 		act 'Go to the market':
@@ -230,7 +230,7 @@ if $ARGS[0] = 'shopping_spree':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pav_market_day.jpg"></center>'
 			'Arriving at the market, you and Natasha browse the selection of clothes available. However, nothing stands out.'
 			'You lean over to Natasha. "Um, I don''t think that there''s much here today. What do you say we go ahead and get your hair done, then we''ll head over to G&M and see if there''s something nice there?"'
-			'Natasha looks at you sadly, "Well, I agree there''s nothing that I like here but G&M is way more expensive."'
+			'Natasha looks at you sadly, "Well, I agree there''s nothing that I like here, but G&M is way more expensive."'
 			'"You let me worry about that," you tell her. "Come on, let''s go."'
 			'She hesitates for a second, "But..."'
 			'You give her an amused look.'
@@ -242,16 +242,16 @@ if $ARGS[0] = 'shopping_spree':
 				money -= 700
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha10a.jpg"></center>'
-				'You grab Natasha''s hand and head towards the commercial district and into A Cut Above.'
-				'Once inside, Natasha talks with a stylist and picks out her desired new hairstyle. She takes a seat and the stylist begins working.'
+				'You grab Natasha''s hand, head towards the commercial district, and into A Cut Above.'
+				'Once inside, Natasha talks with a stylist and picks out her desired new hairstyle. She takes a seat, and the stylist begins working.'
 				'Nearly half an hour later, a smiling and clearly delighted Natasha has had her hair styled and cut. She calls you over to show you the result.'
 				
 				act 'Check out the new Natasha':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha10b.jpg"></center>'
-					'You approach Natasha, who is admiring herself in the mirror. "So, what do you think, <<$pcs_nickname>>?" she asks, doing a slow turn on her heels. "Do you like it?"'
-					'"Natasha, that really suits you," you say. "It looks even better than I thought it would from the pictures."'
-					'The two of you thank the stylist for his work and you pay him 700₽ and you say to him "Guess I know where to come when I need mine done."'
+					'You approach Natasha, who is admiring herself in the mirror. "So, what do you think, <<$pcs_nickname>>?" she asks, taking a slow heel turn. "Do you like it?"'
+					'"Natasha, that really suits you," you say. "It looks better than I thought it would from the pictures."'
+					'The two of you thank the stylist for his work, and you pay him 700<b></b>, and you say to him, "Guess I know where to come when I need mine done."'
 					'You turn back to Natasha, "Time to go find you a pretty dress!"'
 					!! Note to coder please replace the headshot of Natasha with image 10b going forward.
 		
@@ -262,20 +262,20 @@ if $ARGS[0] = 'shopping_spree':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/Natasha11.jpg"></center>'
 						'The two of you make your way to G&M and start looking for clothes, with a focus on dresses.'
-						'You spend several minutes picking and choosing between various outfits until you have a small assortment of clothes that you can both agree on. Natasha steps into the dressing room to change, stepping out to show off each dress.'
-						'Natasha has difficulty choosing between three of the outfits and asks for you to make the final choice. You decide on a nice party dress. "Okay, <<$pcs_nickname>>," she says, smiling. "Then that''s the one. It''ll look much nicer than what I''ve currently got at home."'
-						'You take the 1300₽ dress and head to the register to pay for it while Natasha gets dressed.'
+						'You spend several minutes picking and choosing between various outfits until you have a small assortment of clothes that you can both agree on. Finally, Natasha steps into the dressing room to change, showing off each dress.'
+						'Natasha has difficulty choosing between three outfits and asks you to make the final choice. Finally, you decide on a lovely party dress. "Okay, <<$pcs_nickname>>," she says, smiling. "Then that''s the one. It''ll look much nicer than what I currently have at home."'
+						'You take the 1300<b></b> dress and head to the register to pay for it while Natasha gets dressed.'
 
 						act 'Wait for Natasha':
 							*clr & cla
 							minut += 35
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha12.jpg"></center>'
-							'Natasha meets you at the front of the store and takes you by the hand. "Come on, <<$pcs_nickname>>," she says. "Let''s go."'
-							'As she leads you away from the store, she continues, "This bit is a small thank you for such a wonderful present. I simply can''t keep expecting you to pay for me all the time and I want to contribute. I''m going to keep passing out flyers as well as a cleaning job, so long as the hours are flexible."'
+							'Natasha meets you at the front of the store and takes you by hand. "Come on, <<$pcs_nickname>>," she says. "Let''s go."'
+							'As she leads you from the store, she continues, "This bit is a small thank you for such a wonderful present. I simply can''t keep expecting you to always pay for me. I want to contribute. So I''ll keep passing out flyers and a cleaning job, so long as the hours are flexible."'
 							'"I appreciate the gesture, Natasha. Maybe we''ll be able to do this again soon?" you suggest. "Just make sure that your jobs don''t get in the way of your schoolwork."'
 							'"Yes, Mum," she replies sarcastically.'
-							'You giggle and reply "Yep, well it''s self interest too. I need help with my homework!"'
+							'You giggle and reply, "Yep, it''s self-interest too. I need help with my homework!"'
 							'The two of you laugh between yourselves as you make your way to the park.'
 
 							act 'Natasha takes you to Del Parco':
@@ -293,22 +293,22 @@ if $ARGS[0] = 'shopping_spree':
 								gs 'stat'
 
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha13.jpg"></center>'
-								'You enter the cafe, still hand in hand. You find a table and Natasha orders the two of you a coffee and a Reuben sandwich to split.'
+								'You enter the cafe, still hand in hand. You find a table, and Natasha orders the two of you a coffee and a Reuben sandwich to split.'
 								'While waiting on your food, you talk to Natasha about your day.'
 								'"Well, Natasha," you start, "today was pretty fun, I think. Did you enjoy it?"'
-								'She reaches across the table and squeezes your hand, "I really have, <<$pcs_nickname>>. My life was in a complete mess until you came along. You''ve given me hope and so much happiness in the short time we''ve been together."'
-								'You enjoy your meal, sharing some inconsequential small talk between bites. When you''re finished, Natasha gets up to pay for the meal and you two leave the cafe together.'
+								'She reaches across the table and squeezes your hand, "I really have, <<$pcs_nickname>>. My life was a complete mess until you came along. You''ve given me hope and happiness in our short time together."'
+								'You enjoy your meal, sharing some inconsequential small talk between bites. When you''re finished, Natasha gets up to pay for the dinner, and you two leave the cafe together.'
 								*nl
 								act 'Walk through the park':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha14.jpg"></center>'
 									'While walking back through the park, you notice Natasha looking downwards.'
 									'"Natasha, what''s wrong?" you ask. "I thought we were having fun together?"'
-									'She quickly looks back up at you, apologetically. "I was, but," she looks back down. "I''m just a bit sad that it''s ending. I can''t remember another time like this that I got so spoiled other than with my mum when she could afford it."'
-									'You pull her towards you and, holding her face gently, you reassure her. "Well, I enjoyed it too. Anyway, it''s not the end, we can still hang out together. Also, you never know, we might get to do something like this again in the future."'
-									'After a pause, you continue. "And I guess we need to think about how we want to develop our relationship. We''re both young and I don''t want to mess it up by wanting too much too soon."'
+									'She quickly looks back up at you apologetically. "I was, but," she looks back down. "I''m just a bit sad that it''s ending. I can''t remember another time like this that I got so spoiled other than with my mum when she could afford it."'
+									'You pull her towards you and hold her face gently. You reassure her. "Well, I enjoyed it too. Anyway, it''s not the end. We can still hang out together. Also, you never know. We might get to do something like this again in the future."'
+									'After a pause, you continue. "And I guess we need to think about how we want to develop our relationship. We''re both young, and I don''t want to mess it up by wanting too much too soon."'
 									'Natasha looks at you and smiles, "Yes, <<$pcs_nickname>>, I know."'
-									'You return to the Five Eight Estate and drop off Natasha at her apartment.'
+									'You return to Five Eight Estate and drop off Natasha at her apartment.'
 									act 'Return to Five Eight': gt 'pav_complex', 'start'
 								end
 							end
@@ -328,20 +328,20 @@ if $ARGS[0] = 'love_jct':
 	disco_invite = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha15.jpg"></center>'
-	'You smile at Natasha, "Okay, first off, I really like you and really enjoyed our shopping trip. Hopefully you did too?"'
-	'"Oh yes, <<$pcs_nickname>>," she smiles back. "It was lovely to spend that time with you; let alone get so spoiled."'
-	'You nod. "I guess we need to have a chat about where we go from here." You take a quick breath. "The thing is Natasha, from what I''ve heard, you''re attracted to guys so I don''t know how a romantic relationship with me would sit with you."'
-	'Natasha looks a little apprehensive. "Well, it''s true that I''ve been attracted to guys but honestly I just feel let down by them. I''ve never enjoyed a date with a guy as much as I did our time together." She stares down at the floor. "I guess you''ve heard the nasty rumours going around school about me sucking guys off when I couldn''t pay them back on time," she pauses and holds her hand up, indicating she wants to continue.'
+	'You smile at Natasha, "Okay, first off, I really like you and enjoyed our shopping trip. Hopefully, you did too?"'
+	'"Oh yes, <<$pcs_nickname>>," she smiles back. "It was lovely to spend that time with you, let alone get so spoiled."'
+	'You nod. "I guess we need to chat about where we go from here." You take a quick breath. "The thing is, Natasha, from what I''ve heard, you''re attracted to guys, so I don''t know how a romantic relationship with me would sit with you."'
+	'Natasha looks a little apprehensive. "Well, I''ve indeed been attracted to guys, but honestly, I just feel let down by them. I''ve never enjoyed dating a guy as much as I did our time together." She stares down at the floor. "I guess you''ve heard the nasty rumours going around school about me sucking guys off when I couldn''t pay them back on time," she pauses and holds her hand up, indicating she wants to continue.'
 	*nl
-	'She sighs before continuing. "They aren''t true but I have been very stupid in the past." She lets out a deep sigh. "I hope you won''t think too poorly of me but I fell for Lazar''s charms and went on a couple of dates with him. At first, he was sweet and even talked about me becoming his girlfriend. I was such an idiot and let him make love to me."'
-	'By now she''s in tears and you move over to comfort her. "I think I can guess the rest. After that, he backed off and there was no more talk of being his girlfriend?"'
+	'She sighs before continuing. "They aren''t true, but I have been foolish in the past." She lets out a deep sigh. "I hope you won''t think too poorly of me, but I fell for Lazar''s charms and went on a couple of dates with him. At first, he was sweet and even talked about me becoming his girlfriend. But, I was such an idiot and let him make love to me."'
+	'By now, she''s in tears, and you move over to comfort her. "I think I can guess the rest. After that, he backed off, and there was no more talk of being his girlfriend?"'
 	'Natasha confirms your suspicion by nodding her head.'
 	'You gently rub at her back, "Look, it''s in the past and wasn''t your fault. You''re not the first girl to fall for a sleazy guy''s charms."'
 	*nl
-	'She takes a moment to recompose herself. "I tried going on dates with other guys, but one kept blowing me off and I caught another one cheating on me with another girl. I put off the idea of ever dating again. But," she looks at you, her eyes still glistening, "After the other day, with you, I think I''d like to give it another try."'
+	'She takes a moment to recompose herself. "I tried going on dates with other guys, but one kept blowing me off, and I caught another cheating with another girl. So I put off the idea of ever dating again. But," she looks at you, her eyes still glistening, "After the other day with you, I think I''d like to give it another try."'
 	'You try to lighten the mood a bit with a joke. "I don''t know, Natasha, you aren''t exactly a cheap date."'
-	'Her eyes light up and a big smile crosses her face. "<<$pcs_nickname>>, do you mean the shopping trip was our first date?"'
-	'The question catches you off guard; you''re not certain you meant ''date'' literally. Before you can think anymore about it, Natasha starts to bring her face closer to yours.'
+	'Her eyes light up, and a big smile crosses her face. "<<$pcs_nickname>> do you mean the shopping trip was our first date?"'
+	'The question catches you off guard; you''re not sure you meant "date" literally. Before you can think about it, Natasha starts to bring her face closer to yours.'
 
 	act 'Kiss her to confirm she''s your girlfriend':
 		*clr & cla
@@ -349,21 +349,21 @@ if $ARGS[0] = 'love_jct':
 		NatbelQW['FriendLover'] += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha16.jpg"></center>'
-		'You push yourself forward and your lips meet with Natasha''s. There''s a sudden jolt coursing through you and it must be the same for her; you feel her tense for a brief moment before relaxing into your kiss.'
-		'Time seems to stand still for a bit until you both gently pull apart.'
-		'You both hesitantly pull back. You slowly open your eyes and see her doing the same.'
-		'You stare at one another for a few seconds. "Does that answer your question?" you ask, slyly.'
-		'Natasha sighs contentedly and smiles at you happy you sealed her being your girlfriend with the kiss.'
-		'"Well I guess the taking things slow didn''t last too long. However, I don''t want to ruin a good thing so I think, at least for now, we should take our time," you tell her.'
+		'You push yourself forward, and your lips meet with Natasha''s. There''s a sudden jolt coursing through you, and it must be the same for her; you feel her tense for a brief moment before relaxing into your kiss.'
+		'Time seems to stand still until you both gently pull apart.'
+		'You both hesitantly pull back. Then, you slowly open your eyes and see her doing the same.'
+		'You stare at one another for a few seconds. "Does that answer your question?" you ask slyly.'
+		'Natasha sighs contentedly and smiles at you, happy you sealed her being your girlfriend with the kiss.'
+		'"Well, taking things slowly lasted only a short time. However, I don''t want to ruin a good thing, so I think, at least for now, we should take our time," you tell her.'
 		*nl
 		'"Mmm, yeah," Natasha says, licking her lips. "We should take things slow." She smacks her lips...'
 		'Natasha leans in and starts kissing you again. You find it increasingly difficult to resist and start kissing her back.'
-		'"Umm very... slow..." Natasha says in a husky voice as you momentarily break to catch your breath before you resume your kissing and cuddling.'
-		'Time seems to stand still while you make out, but you eventually manage to pull yourself away.'
-		'"I do mean it though," you say, trying to catch your breath. "We need to think carefully about what we want and how we want our relationship to progress."'
+		'"Umm, very... slow..." Natasha says in a husky voice as you momentarily break to catch your breath before you resume kissing and cuddling.'
+		'Time seems to stand still while you make out, but you eventually pull yourself away.'
+		'"I do mean it, though," you say, trying to catch your breath. "We need to think carefully about what we want and how we want our relationship to progress."'
 		'"I know, <<$pcs_nickname>>," she replies.'
 		'You continue, "Well, Natasha, I think I''d better head off now before things get too steamy."'
-		'Natasha sighs contentedly and smiles at you and nods as you get up to leave.'
+		'Natasha sighs contentedly and smiles at you, and nods as you get up to leave.'
 		act 'Keep talking': gt 'natbel_chat', 'chat'
 		act 'Stop talking': gt 'natbelapt', 'natroom'
 	end
@@ -375,10 +375,10 @@ if $ARGS[0] = 'love_jct':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha17.jpg"></center>'
 		'Realizing things have seriously escalated, you pull yourself back. "Wait, Natasha. I''m sorry, this is a bit too fast for me."'
 		'Natasha stops herself, blinking in confusion.'
-		'"It''s not that I don''t like you," you offer. "You''re a great friend and I find myself wondering if we could be more. I''m just not sure what I want yet and don''t want to ruin what we''ve got."'
-		'You see disappointment spreading across her face. "I''m not saying ''no''," you say while reaching out for her hands. "I''m just saying let''s take things slowly. I wouldn''t want to do anything to jeopardize my friendship with you. I cherish that too much."'
-		'A small amount of relief starts to return to Natasha''s face. "Your friendship means the world to me too, <<$pcs_nickname>>. You''re right, I wouldn''t want to lose that either."'
-		'"Okay, well let''s just be sure and give ourselves a little time."'
+		'"It''s not that I don''t like you," you offer. "You''re a great friend, and I wonder if we could be more. I''m just unsure what I want yet and don''t want to ruin what we''ve got."'
+		'You see disappointment spreading across her face. "I''m not saying "no," you say while reaching out for her hands. Let''s take things slowly. I wouldn''t want to do anything to jeopardize my friendship with you. I cherish that too much."'
+		'A small amount of relief starts to return to Natasha''s face. "Your friendship means the world to me, too, <<$pcs_nickname>>. You''re right. I wouldn''t want to lose that either."'
+		'"Okay, let''s just be sure and give ourselves a little time."'
 		'Natasha still looks sad but nods at you in confirmation.'
 		act 'Keep talking': gt 'natbel_chat', 'chat'
 		act 'Stop talking': gt 'natbelapt', 'natroom'
@@ -393,32 +393,32 @@ if $ARGS[0] = 'disco_1':
 	disco_invite = 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha18.jpg"></center>'
-	'After some general chat you decide to ask Natasha to go to the disco with you next Saturday so you can see her in her new dress. "So Natasha, how about I pick you up next Saturday evening and we go to the disco together?"'
-	'Natasha breaks out into a huge grin, "Yes, I''d love that, <<$pcs_nickname>>! Thank you."'
-	'You continue, "Right, well I''m not sure what time I''ll be able to get here yet so..."'
-	'A smiling Natasha interrupts "Don''t worry about the time, <<$pcs_nickname>>. As you know, I don''t often get the chance to go anyway so I''ll tell my mum during the week so she won''t worry if I''m not home."'
-	'"Good! I''ll see you then and you WILL wear your new dress... Okay?!" you say with extra emphasis on the ''WILL'' leaving her in no doubt that there''s only one correct answer."'
-	'"Yes, I''d love to. I''m not sure I''d be brave enough to do so if I went on my own so I''m happy you''ll be with me."'
+	'After some general chat, you ask Natasha to go to the disco next Saturday so you can see her in her new dress. "So Natasha, how about I pick you up next Saturday evening, and we go to the disco together?"'
+	'Natasha breaks out with a huge grin, "Yes, I''d love that, <<$pcs_nickname>>! Thank you."'
+	'You continue, "Right, well, I''m not sure when I''ll be able to get here yet, so..."'
+	'A smiling Natasha interrupts, "Don''t worry about the time, <<$pcs_nickname>>. As you know, I don''t often get the chance to go anyway, so I''ll tell my mum during the week so she won''t worry if I''m not home."'
+	'"Good! I''ll see you then, and you <b>will</b> wear your new dress... Okay?!" you say, leaving her no doubt that there''s only one correct answer."'
+	'"Yes, I''d love to. However, I''m not sure I''d be brave enough if I went on my own, so I''m happy you''ll be with me."'
 	'You continue, "One thing though..."'
 	'Natasha looks at you quizzically.'
 	!! If Sveta is a Gopnik
 	if grupTipe = 4:
-		'I know that you have reasons to be scared of the Gopniks but I hope I''ve proven that I''m not going to bully you... Well, unless you break the rules!" you say with a small giggle.'
+		'I know you have reasons to be scared of the Gopnik, but I hope I''ve proven that I''m not going to bully you... Unless you break the rules!" you say with a slight giggle.'
 		'Natasha looks apprehensive as she has understood the implications of what you are saying.'
-		'You continue. "Okay, well enough of this nonsense with you disappearing into the crowd when I approach you. If you do that to me again, I won''t be happy and will need to think seriously about our relationship."'
-		'A very sad and worried Natasha looks at you and replies, "Yes, I know <<$pcs_nickname>>. That wasn''t one of my finest actions. I''m so sorry and yes of course I''ll dance with you. In fact it''ll be my pleasure to do so." She pauses for a second.'
-		'"I''m so happy you weren''t put off by my rudeness."'
-		'You smile reassuringly at her. "Look, I do understand and at least you weren''t as rude as some of the others. Don''t let it worry you; I''m looking forward to dancing with you in your new outfit."'
+		'You continue. "Okay, well enough of this nonsense with you disappearing into the crowd when I approach you. If you do that to me again, I won''t be happy and will need to rethink seriously about our relationship."'
+		'A very sad and worried Natasha looks at you and replies, "Yes, I know, <<$pcs_nickname>>. That wasn''t one of my finest actions. I''m so sorry, and yes, I''ll dance with you. In fact, it''ll be my pleasure to do so." She pauses for a second.'
+		'"I''m so happy you weren''t offended by my rudeness."'
+		'You smile reassuringly at her. "Look, I understand, and at least you weren''t as rude as some others. Don''t let it worry you; I''m looking forward to dancing with you in your new outfit."'
 	elseif grupTipe = 5:
-		'I know that I''m not exactly everyone''s favorite person but I hope I''ve proven that I''m a good friend," you tell her.'
+		'I know I''m not everyone''s favourite person, but I hope I''ve proven that I''m a good friend," you tell her.'
 		'Natasha looks apprehensive as she has understood the implications of what you are saying.'
-		'"Okay, well enough of this nonsense with you disappearing into the crowd when I approach you. If you do that to me again, I won''t be happy and will need to think seriously about our relationship."'
-		'A very sad and worried Natasha looks at you and replies. "Yes, I know <<$pcs_nickname>>. That wasn''t one of my finest actions. I''m so sorry and yes of course I''ll dance with you. In fact it''ll be my pleasure to do so." She pauses for a second.'
-		'"I''m so happy you weren''t put off by my rudeness."'
-		'You smile reassuringly at her. "Look, I do understand and at least you weren''t as rude as some of the others. Don''t let it worry you. I''m looking forward to dancing with you in your new outfit."'
+		'"Okay, well enough of this nonsense with you disappearing into the crowd when I approach you. If you do that to me again, I won''t be happy and will need to seriously rethink our relationship."'
+		'A very sad and worried Natasha looks at you and replies. "Yes, I know, <<$pcs_nickname>>. That wasn''t one of my finest actions. I''m so sorry, and yes, I''ll dance with you. In fact, it''ll be my pleasure to do so." She pauses for a second.'
+		'"I''m so happy you weren''t offended by my rudeness."'
+		'You smile reassuringly at her. "Look, I understand, and at least you weren''t as rude as some others. So don''t let it worry you. I''m looking forward to dancing with you in your new outfit."'
 	else
 	!! If svets is a cool kid, jock or nerd
-		'"When we get there your first dance is with me," you tell Natasha.'
+		'"When we get there, your first dance is with me," you tell Natasha.'
 		'"Okay, <<$pcs_nickname>>. It''ll be my pleasure."'
 	end		
 	act 'Keep talking': gt 'natbel_chat', 'chat'
@@ -433,7 +433,7 @@ if $ARGS[0] = 'disco_2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha19.jpg"></center>'
 	'You see that Natasha is wearing her dress. "Yep, that was definitely the right choice, Natasha. It looks great on you."'
-	'Natasha smiles, "Thanks, and thank you for getting it for me. It''s so much nicer than any of my others. I''m almost ready to go, I just need a few minutes to put some makeup on."'
+	'Natasha smiles, "Thanks, and thank you for getting it for me. It''s so much nicer than any of my others. I''m almost ready to go. I just need a few minutes to put some makeup on."'
 	'She walks over to a mirror and starts applying her makeup.'
 	if  pcs_makeup <= 1:
 		'She eyes you from the reflection in the mirror, "Would you like me to put some makeup on you as well? You''ll look even lovelier."'
@@ -472,10 +472,10 @@ if $ARGS[0] = 'disco_2_cont':
 
 	!!On arrival Sveta dances with Natasha. Please use the scene in 'zNat dance', enclosed.
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/natasha_sveta_dance.jpg"></center>'
-	'After arriving at the disco, you have a couple of dances together then head over to a table and chat.'
+	'After arriving at the disco, you have a couple of dances together, then head over to a table and chat.'
 	'Katja and Mefodiy approach the two of you and comment on Natasha''s new look and dress, leaving her beaming with happiness.'
 	*nl
-	'A few hours later, Natasha turns to you. "<<$pcs_nickname>>, I''ve really enjoyed myself tonight but I really should get home soon so my mum doesn''t worry. Would you please walk me home?"'
+	'A few hours later, Natasha turns to you. "<<$pcs_nickname>>, I''ve really enjoyed myself tonight, but I should get home soon, so my mum doesn''t worry. Would you please walk me home?"'
 	'"Of course, Natasha. I''ve had a lovely time as well," you tell her. "It''s so nice to see that at least some of our classmates taking notice of your new look."'
 	'You take her by the hand and walk back to her apartment.'
 	*nl
@@ -486,14 +486,14 @@ if $ARGS[0] = 'disco_2_cont':
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha20.jpg"></center>'
-		'Realizing that she wants to kiss you, you hesitate and gently kiss her on the forehead. "Thank you for tonight, I hope you enjoyed it as much as me. Maybe we can do this again soon?"'
-		'Natasha looks a little disappointed but smiles at you, "Yes, I know, <<$pcs_nickname>>. We need to take it slow and think about what we want from our relationship."'
+		'Realizing that she wants to kiss you, you hesitate and gently kiss her on the forehead. "Thank you for tonight. I hope you enjoyed it as much as me. Maybe we can do this again soon?"'
+		'Natasha looks slightly disappointed but smiles at you, "Yes, I know, <<$pcs_nickname>>. But, we need to take it slow and think about what we want from our relationship."'
 		'You nod and take a step back.'
-		'Natasha continues, "Well, the decision is yours and I''ll respect it. But I think by now you know that I''d like for us to be more than friends."'
-		'"I''d like that, too," you tell her. "We''re already best friends and I don''t want to spoil anything but rushing it."'
-		'After a brief pause and a nervous giggle you try to soften the blow and continue. "I''m not as clever as you so it takes me longer to process things and I really didn''t expect to feel like this so quickly."'
+		'Natasha continues, "Well, the decision is yours, and I''ll respect it. But I think by now you know that I''d like us to be more than friends."'
+		'"I''d like that, too," you tell her. "We''re already best friends, and I don''t want to spoil anything by rushing it."'
+		'After a brief pause and a nervous giggle, you try to soften the blow and continue. "I''m not as clever as you, so it takes me longer to process things, and I didn''t expect to feel like this so quickly."'
 		'Natasha smiles at you and nods. "Tonight was great. See you soon."'
-		'"Yes it was, see you soon."'
+		'"Yes, it was. See you soon."'
 		act 'Return to Five Eight': gt 'pav_complex', 'start'
 	end	
 	!!The Quest journal needs to be updated: Maybe you should have kissed Natasha.
@@ -505,19 +505,19 @@ if $ARGS[0] = 'disco_2_cont':
 		NatbelQW['FriendLover'] = 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha16.jpg"></center>'
-		'Natasha pulls you over to the couch still holding onto your hand.'
+		'Natasha pulls you over to the couch, still holding onto your hand.'
 		'You both sit down as she turns towards you, smiling, "I just want to say thank you, <<$pcs_nickname>>, for taking me to the disco tonight and again for my wonderful day out with you."'
-		'You''ve decided that you want Natasha as your girlfriend. Her face is not far from yours so you lean in to kiss her.'
-		'Pushing yourself forward your lips meet with Natasha''s. There''s a sudden jolt coursing through you and it must be the same for her as you feel her tense for a brief moment before relaxing into your kiss.'
+		'You''ve decided that you want Natasha as your girlfriend. Her face is not far from yours, so you lean in to kiss her.'
+		'Pushing yourself forward, your lips meet with Natasha''s. There''s a sudden jolt coursing through you, and it must be the same for her as you feel her tense for a brief moment before relaxing into your kiss.'
 		'You both hesitantly pull back. You slowly open your eyes and see her doing the same.'
 		'You stare at each other for a brief moment before speaking.'
-		'"Well, I''ve been thinking things over, Natasha. I don''t want to risk losing our friendship, but I''m ready to give dating a try. Let''s just take it one day at a time and try not to rush things, okay?"'
-		'"Mmm, yeah, well..." Natasha says, moistening her lips. She holds you gently but firmly and slowly brings her face close to yours. "We should..." Natasha leans forward and starts kissing you again. "Take... things..." She holds you close as she makes out with you. Finding it impossible to resist you start kissing her back. "Slow..."'
-		'Time seems to stand still while you make out, but you eventually manage to pull yourself away.'
-		'Licking her lips again Natasha looks lovingly at you. "Was that slow enough for you?"'
-		'You giggle still caressing her face, "That was..." You start leaning towards her again before catching yourself and pulling back. "Wow! Unexpected... Wonderful..." You pause momentarily.'
-		'Then you continue, "I do mean it though," you say, still trying to catch your breath and trying your best to look serious. "We need to think carefully about what we want and how we want our relationship to progress."'
-		'"I know, <<$pcs_nickname>>," she replies still licking her lips and savouring the taste of your kiss.'
+		'"Well, I''ve been thinking things over, Natasha. I don''t want to risk losing our friendship, but I''m ready to try dating. So let''s take it one day at a time and try not to rush things, okay?"'
+		'"Mmm, yeah, well..." Natasha says, moistening her lips. She holds you gently but firmly, bringing her face close to yours. "We should..." Natasha leans forward and starts kissing you again. "Take... things..." She holds you close as she makes out with you. Finding it impossible to resist, you start kissing her back. "Slow..."'
+		'Time seems to stand still while you make out, but you eventually pull yourself away.'
+		'Licking her lips again, Natasha looks lovingly at you. "Was that slow enough for you?"'
+		'You giggle, still caressing her face, "That was..." You start leaning towards her again before catching yourself and pulling back. "Wow! Unexpected... Wonderful..." You pause momentarily.'
+		'Then you continue, "I do mean it, though," you say, still trying to catch your breath and trying your best to look serious. "We need to think carefully about what we want and how we want our relationship to progress."'
+		'"I know, <<$pcs_nickname>>," she replies, still licking her lips and savouring the taste of your kiss.'
 		act 'Keep talking': gt 'natbel_chat', 'chat'
 		act 'Return to her room': gt 'natbelapt', 'natroom'
 	end
@@ -530,18 +530,18 @@ if $ARGS[0] = 'kissing_games':
 	NatbelQW['FriendLover'] = 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha16.jpg"></center>'
-	'You both sit on the couch as she turns towards you, smiles and says "I just want to say thank you <<$pcs_nickname>> for taking me to the disco tonight and again for my wonderful day out with you."'
-	'You''ve decided that you want Natasha as your girlfriend. Her face is not far from yours so you lean in to kiss her.'
-	'Pushing yourself forward your lips meet with Natasha''s. There''s a sudden jolt coursing through you and it must be the same for her as you feel her tense for a brief moment before relaxing into your kiss.'
+	'You both sit on the couch as she turns towards you, smiles, and says, "I just want to say thank you, <<$pcs_nickname>>, for taking me to the disco tonight and again for my wonderful day out with you."'
+	'You''ve decided that you want Natasha as your girlfriend. Her face is not far from yours, so you lean in to kiss her.'
+	'Pushing yourself forward, your lips meet with Natasha''s. There''s a sudden jolt coursing through you, and it must be the same for her as you feel her tense for a brief moment before relaxing into your kiss.'
 	'You both hesitantly pull back. You slowly open your eyes and see her doing the same.'
 	'You stare at each other for a brief moment before speaking.'
-	'"Well, I''ve been thinking things over, Natasha. I don''t want to risk losing our friendship, but I''m ready to give dating a try. Let''s just take it one day at a time and try not to rush things, okay?"'
-	'"Mmm, yeah, well..." Natasha says, moistening her lips. She holds you gently but firmly and slowly brings her face close to yours. "We should..." Natasha leans forward and starts kissing you again. "take... things..." She holds you close as she makes out with you. Finding it impossible to resist you start kissing her back. "Slow..."'
-	'Time seems to stand still while you make out, but you eventually manage to pull yourself away.'
-	'Licking her lips Natasha looks lovingly at you. "Was that slow enough for you?"'
-	'You giggle still caressing her face, "That was..." You start leaning towards her again before catching yourself and pulling back. "Wow! Unexpected... Wonderful..." You pause momentarily.'
-	'Then you continue, "I do mean it though," you say, still trying to catch your breath and look serious. "We need to think carefully about what we want and how we want our relationship to progress."'
-	'"I know, <<$pcs_nickname>>," she replies still licking her lips and savouring the taste of your kiss.'
+	'"Well, I''ve been thinking things over, Natasha. I don''t want to risk losing our friendship, but I''m ready to try dating. Let''s just take it one day at a time and try not to rush things, okay?"'
+	'"Mmm, yeah, well..." Natasha says, moistening her lips. She holds you gently but firmly, bringing her face close to yours. "We should..." Natasha leans forward and starts kissing you again. "take... things..." She holds you close as she makes out with you. Finding it impossible to resist, you start kissing her back. "Slow..."'
+	'Time seems to stand still while you make out, but you eventually pull yourself away.'
+	'Licking her lips, Natasha looks lovingly at you. "Was that slow enough for you?"'
+	'You giggle, still caressing her face, "That was..." You start leaning towards her again before catching yourself and pulling back. "Wow! Unexpected... Wonderful..." You pause momentarily.'
+	'Then you continue, "I do mean it, though," you say, still trying to catch your breath and look serious. "We need to think carefully about what we want and how we want our relationship to progress."'
+	'"I know, <<$pcs_nickname>>," she replies, still licking her lips and savouring the taste of your kiss.'
 	act 'Keep talking': gt 'natbel_chat', 'chat'
 	act 'Return to her room': gt 'natbelapt', 'natroom'
 end

+ 1 - 1
locations/npcstatic6.qsrc

@@ -202,7 +202,7 @@ hotcat_rating['A<<npctemp>>'] = 8
 npctemp = 262
 $npc_dna['A<<npctemp>>'] = '0'
 $npc_firstname['A<<npctemp>>'] = 'Aliyyah'
-$npc_nickname['A<<npctemp>>'] = 'Aliyyah'
+$npc_nickname['A<<npctemp>>'] = 'Allie'
 $npc_lastname['A<<npctemp>>'] = 'Najjar'
 $npc_notes['A<<npctemp>>'] = 'Proprietor of the Hookah Lounge.'
 npc_dob['A<<npctemp>>'] = 19910314

+ 6 - 0
locations/obj_din.qsrc

@@ -164,6 +164,12 @@ if $ARGS[0] = 'cheattabs':
 	else
 		$cheat_tab_list += '<th><a href="exec:menu_page = 9 & gs ''NPCChanger'', ''Start''">NPC Editor</a></th>'
 	end
+	
+	if menu_page = 15:
+		$cheat_tab_list += '<th>NPC Finder</th>'
+	else
+		$cheat_tab_list += '<th><a href="exec:menu_page = 15 & gs ''NPCFinder''">NPC Finder</a></th>'
+	end
 
 	$cheat_tab_list += '<tr>'
 

+ 7 - 8
locations/pav_clinic.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if (pcs_teeth > -1 and (dentistday + 90 < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
+		if (pcs_teeth > -1 and (dentistday < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
 			act 'Go to the dentist':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
@@ -150,7 +150,6 @@ if $ARGS[0] = '':
 				if pcs_brace = 1:
 					pcs_brace = 0
 					pcs_teeth -= 1
-					dentistday = daystart
 					'The dentist spends 15 minutes to take of you brace and clean up. You look at the mirror afterward and you teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
 					gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 					gs 'stat'
@@ -182,11 +181,11 @@ if $ARGS[0] = '':
 									pcs_missing_teeth = 0
 									'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 								elseif pcs_teeth > 0:
-									dentistday = daystart
+									dentistday = daystart + 180
 									pcs_brace = 1
-									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 								else
-									dentistday = daystart
+									dentistday = daystart + 90
 									pcs_teeth = -1
 									'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 								end
@@ -205,12 +204,12 @@ if $ARGS[0] = '':
 									pcs_missing_teeth = 0
 									'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 								elseif pcs_teeth > 0:
-									dentistday = daystart
+									dentistday = daystart + 180
 									pcs_brace = 1
-									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 								else
 									pcs_teeth = -1
-									dentistday = daystart
+									dentistday = daystart + 90
 									'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 								end
 								gs 'AppearanceSystem', 'UpdateBaseAppearnce'

+ 4 - 4
locations/pav_disco_gopniks.qsrc

@@ -848,7 +848,7 @@ if $ARGS[0] = 'arkadi':
 		elseif grupTipe = 5:
 			'"Don''t even try it." he bluntly states when he sees you.'
 			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
-		elseif npc_rel['A158'] >= 50 and fame['pav_slut'] < 300:		
+		elseif npc_rel['A156'] >= 50 and fame['pav_slut'] < 300:		
 			'"Hey Arkadi, I thought I''d come by and hang out with you for a bit."'
 			'"Oh yeah? Want a drink?" He offers you the bottle.'
 			gs 'willpower', 'drink', 'resist', 'medium'
@@ -878,7 +878,7 @@ if $ARGS[0] = 'arkadi':
 				'You know he loves the city, so you ask him questions about it and he''s more than happy to answer them.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			end
-		elseif npc_rel['A158'] <= 20 and fame['pav_slut'] < 300:
+		elseif npc_rel['A156'] <= 20 and fame['pav_slut'] < 300:
 			if grupTipe = 4:
 				'"Hey Arkadi, I thought I''d just come by and hang out with you for a bit."'
 				'He snorts and grabs his crotch. "Why don''t you suck my dick instead?"'
@@ -940,7 +940,7 @@ if $ARGS[0] = 'lavrenti':
 			elseif grupTipe = 5:
 				'You''re sure he seen you, but is ignoring you as he moves between a few girls who are dancing near him. He''s a very good dancer and they don''t seem to mind at all as they all start dancing together.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
-			elseif npc_rel['A154'] <= 20 or fame['pav_slut'] >= 300:
+			elseif npc_rel['A155'] <= 20 or fame['pav_slut'] >= 300:
 				'You''re sure he seen you, but is ignoring you as he moves between a few girls who are dancing near him. He''s a very good dancer and they don''t seem to mind at all as they all start dancing together.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			else 
@@ -996,7 +996,7 @@ if $ARGS[0] = 'lavrenti':
 							*clr & cla
 							minut += 15
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big155.jpg"></center>'
 							'"Want to dance?" you ask with a smile.'
 							'He pauses before nodding. "Sure, why not." Lavrenti leads you out onto the dance floor and you start dancing together.'
 							act 'Go and dance': gt 'pav_disco_gopniks', 'lavrenti_dance'

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 153 - 153
locations/pav_disco_sex.qsrc


+ 1 - 1
locations/pav_factory.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'tailor':
 	$menu_arg = 'tailor'
 	menu_off = 0
 	gs'stat'
-	'There is a small wooden counter and a sign that says, "If you can't wear it, we'll adjust it."'
+	'There is a small wooden counter and a sign that says, "If you can''t wear it, we''ll adjust it."'
 	'Behind the counter, an elderly man inspects some repaired clothes. He stops and smiles gently, greeting you.'
 	'"Hello there, young lady. Do you want to adjust some of your clothing? It''ll cost you <b>₽</b>500 per item."'
 

+ 23 - 51
locations/pav_park.qsrc

@@ -220,58 +220,20 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
-		*nl
-		'With the weather being pleasant and sunny, the park is full of people enjoying the weather. You could play some music, practise performing songs and maybe make some money too.'
-		ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
-
-		if pcs_inhib < 30:
-			if pcs_inhib < 10:
-				$diff = 'hard'
-			elseif pcs_inhib < 20:
-				$diff = 'medium'
-			else
-				$diff = 'easy'
-			end
-
-			gs 'willpower', 'skill', 'self', $diff
-			will_cost = (will_cost * 3) - (pcs_perform)
-			if will_cost <= pcs_willpwr:
-				act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)':
-					inhib_exp += rand(1,3)
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					gs 'music_buskingevents', 'busking', 'pav'
-					if rand(0,100) > 75 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
-						gt 'music_gigstarts', 'delparco_start', 'pav_park'
-					end
-				end
-			else
-				act 'Start busking (<<ml_buskingtime>> minutes) (<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 'Start busking (<<ml_buskingtime>> minutes)':
-				gs 'music_buskingevents', 'busking', 'pav'
-				if rand(0,100) > 75 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
-					gt 'music_gigstarts', 'delparco_start', 'pav_park'
-				end
-			end
-		end
-	end
+	gs 'music_actions', 'music_icon'
 
 	if month >= 6 and month <=8 and TourGuide = 0 and (work = 0 or cheatWork = 1):
 		if hour >= 8 and hour <= 18:
 			act 'Apply for the Tour Guide job (0:30)':gt 'tour_guide', 'tourstart'
 		end
-	elseif month >= 6 and month <=8 and TourGuide = 1:
+	elseif month >= 6 and month <=8 and emp_job_status[1] = 1 and (emp_job_status[1] ! 4 or emp_job_status[1] ! 5):
 		if hour >= 8 and hour <= 12:
 			act 'Work as Tour Guide (8:00)':gt 'tour_guide', 'tourstart'
 		end
-	elseif month >= 9 and month <= 5 and TourGuide = 1:
-		TourGuide = 0
+	elseif emp_job_status[1] = 1:
+		!! out of season
 		work = 0
-	elseif month >= 9 and month <= 5 and TourGuide = 3:
-		TourGuide = 0
+		emp_job_status[1]  = 4
 	end
 
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
@@ -335,6 +297,9 @@ if $ARGS[0] = 'start':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
+	!-- Random prostitution solicitation check ------------------------ 
+	if prostitute['blocked'] = 0 : gs 'prostitution_functions', 'check_solicitation_event'
+
 	gs 'camera', 'check_location'
 end
 
@@ -419,18 +384,16 @@ if $ARGS[0] = 'run':
 end
 
 if $ARGS[0] = 'run_reactions':
-	*clr & cla
 	menu_off = 1
-	minut -10
 	if hour >= 20:
 		'With it being so late, there isn''t anyone in the park to see you, but it doesn''t matter. The thrill and pleasure are still there. When you''re finished, you make sure to pull your top back down.'
-		gs 'arousal', 'flashlite', 10
+		gs 'arousal', 'flashlite', -10
 		gs 'arousal', 'end'
 		gs 'stat'
 	else
 		if rand(0,1) = 0:
 			'Despite being daytime, you go unnoticed during your run. However, you still find yourself aroused and excited by the thought of being seen by a stranger or someone you know. When you''re finished, you make sure to pull your top back down.'
-			gs 'arousal', 'flashlite', 10
+			gs 'arousal', 'flashlite', -10
 			gs 'arousal', 'end'
 			gs 'stat'
 		else
@@ -444,7 +407,7 @@ if $ARGS[0] = 'run_reactions':
 			'"Just another crazy slut."'
 			*nl
 			'You continue your run until their catcalling can''t be heard anymore.'
-			gs 'arousal', 'flashlite', 10
+			gs 'arousal', 'flashlite', -10
 			gs 'arousal', 'end'
 			gs 'stat'
 		end
@@ -520,16 +483,25 @@ end
 if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
 if (hour >= 20 or hour < 6) and (pcs_sleep <= 30 or cheatNoSleep ! 0):
-	if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
+	!! Will add a call that will tell if the player has a place to stay at in a given town/city.
+	pavlovsk_home = func('homes_properties', 'has_access', 'shared_apartment') or func('homes_properties', 'has_access', 'meynold_household') or func('homes_properties', 'has_access', 'parents_home') or func('homes_properties', 'has_access', 'lyceum_dorm')
+	if pavlovsk_home = 0 and workPTU <= 2 and HotelRoom < 1:
 		!nowhere to live in town
-		'It''s pretty dark now, and you have nowhere to stay nearby. Maybe you should try to sleep on a bench?'
+		if money >= 500 or karta+bankDebtLimit >= 500:
+			'It''s pretty dark now, maybe you could try to get a room in the hotel.'
+		else	
+			'It''s pretty dark now, and you have nowhere to stay nearby. Maybe you should try to sleep on a bench?'
+		end
 		if mid($start_type,1,2) = 'sg': 'Or try your luck and go to Uncle Shulgin''s Apartment?'
-	elseif home_owned[2] = 1 and (hour >= 22 or hour < 6):
+	elseif pavlovsk_home = 1 and (hour >= 22 or hour < 6):
 		'It''s pretty dark outside, and you feel tired. Maybe you should head home.'
+	elseif hotelRoom['pav_hotel'] > 0:
+		'It''s pretty dark outside, and you feel tired. Maybe you should head back to the hotel.'
 	else
 		'It''s pretty dark now, and you feel tired. Maybe you should try sleeping on a bench?'
 	end
 	act 'Sleep on a bench': gt 'pav_park','sleeping_park_bench'
+	killvar 'pavlovsk_home'
 end
 ! New park content added Nutluck - 14/10/2022
 

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 180 - 184
locations/pav_parkev.qsrc


+ 69 - 69
locations/pav_train_market.qsrc

@@ -28,19 +28,19 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/grinok.jpg"></center>'
 	end
 	*nl
-	'This small open air market is located near the train station.'
+	'This small open-air market is located near the train station.'
 	*nl
-	'On one of the stalls has a sign "Cash paid for secondhand clothes", here you can sell <a href="exec:gs ''portnoi''">all of your unwanted clothes</a>.'
+	'A sign on one of the stalls says, "Cash paid for secondhand clothes"; you can sell <a href="exec:gs ''portnoi''">all your unwanted clothes here</a>.'
 	
 	
 	if arturQW = 1 and (week = 6 or week = 7) and hour < 12: act 'Wait for Arthur to arrive':hour = 12 & gt 'pav_train_market', 'start'
 	*nl
 	if hour >= 8 and hour <= 18:
-		'The market stalls are buzzing with shoppers. Everyone seems to be in a good mood and you can hear back and forth bargaining as you pass by.'
+		'The market stalls are buzzing with shoppers. Everyone seems to be in a good mood, and you can hear back-and-forth bargaining as you pass by.'
 		if fame['pav_slut'] >= 100 and rand(0,9) = 0:
 			menu_off = 1
 			gs 'stat'
-			'An Armenian man comes up to you and in broken Russian says, "You girl who like men, no? Come meet real men have good time."'
+			'An Armenian man comes up to you and, in broken Russian, says, "You girl who like men, no? Come meet real men, have good time."'
 			act 'Reject him':
 				*clr & cla
 				'You pretend not to understand what he is saying, smiling and shaking your head as you move away from him.'
@@ -77,8 +77,8 @@ if $ARGS[0] = 'start':
 				gobQW = 1
 				minut += 15
 				gs'stat'
-				'You stand quietly by the entrance to the market, waiting for customers and displaying your tapestries. Shortly buyers start to gather, but a large, muscular man approaches you and says, "It is illegal to trade in the market without a trader''s license, but I may be interesting in buying your tapestries, 1000 <b>₽</b> apiece. Come and see me at my stall."'
-				'Not wanting to get into trouble, you pack your stuff away. The man was already gone, but you saw which direction he went and he should be easy to find.'
+				'You stand quietly by the entrance to the market, waiting for customers and displaying your tapestries. Shortly buyers start to gather, but a large, muscular man approaches you and says, "It is illegal to trade in the market without a trader''s license, but I may be interested in buying your tapestries, 1000<b>₽</b> apiece. So come and see me at my stall."'
+				'Not wanting to get into trouble, you pack your stuff away. The man was already gone, but you saw which direction he went, and he should be easy to find.'
 				act 'Leave':gt 'pav_train_market', 'start'
 			end
 		elseif gobelen > 0 and gobQW >= 1:
@@ -87,13 +87,13 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				minut += 15
 				gs'stat'
-				'You go to the man who offered to buy your tapestries for 1000 <b>₽</b>. You find him by his stall, smiling.'
+				'You go to the man who offered to buy your tapestries for 1000<b>₽</b>. You find him by his stall, smiling.'
 				if gobQW = 2:
 					'Roman welcomes you. He is interested and businesslike as he asks what you have for sale.'
 				elseif gobQW = 1:
 					gobQW = 2
 					minut += 5
-					'The man greets you and introduces himself as Roman, you tell him that your name is <<$pcs_nickname>>. After a brief chat Roman says that he is interested in seeing what you have for sale.'
+					'The man greets you and introduces himself as Roman. You tell him that your name is <<$pcs_nickname>>. After a brief chat, Roman says he wants to see what you have for sale.'
 				end
 				act 'Leave':gt 'pav_train_market', 'start'
 				act'Show your tapestry':
@@ -101,13 +101,13 @@ if $ARGS[0] = 'start':
 					gobelen -= 1
 					money += 1000
 					gs'stat'
-					'You show your tapestry to Roman and he gives you five hundred for it. You take the money and give him the tapestry.'
+					'You show your tapestry to Roman, and he gives you five hundred. You take the money and give him the tapestry.'
 					act 'Leave':gt 'pav_train_market', 'start'
 				end
 				if gobelen > 1:
 					act'Sell all of your tapestries':
 						*clr & cla
-						'You show Roman your tapestries and he gives you <<gobelen * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
+						'You show Roman your tapestries, and he gives you <<gobelen * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
 						money += gobelen * 1000
 						gobelen = 0
 						gs'stat'
@@ -123,36 +123,36 @@ if $ARGS[0] = 'start':
 			menu_off = 1
 			lookwine = daystart
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/chinese_stall01.jpg"></center>'
-			'You were looking through the market when you came upon a stall selling Chinese foods. On a shelf behind the old woman minding the stall there are a number of bottles.'
+			'You were looking through the market when you found a stall selling Chinese foods. There are several bottles on a shelf behind the old woman minding the stall.'
 			act 'Ask about wang-goo':
 				cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/chinese_stall01.jpg"></center>'
 				'You asked the old woman if she has any rice wine to sell. She smiles at you and points to a basket filled with rice.'
 				'"Onry 2 <b>₽</b>, hundred glam." she said in badly accented Russian, "You buy?"'
 				'"No," you reply, "I need rice wine, rice wine."'
-				'She looks at you in confusion for a moment then suddenly brightened, "Ah!" she exclaims, "Come, come!"'
-				'The old woman hurries to the other side of the stall as you follow her to where a number of smoked piglets are hung in a row.'
-				'"Here," the old woman crowed handing you one of the pigs, "Nice swine, vely nice swine."'
-				'"No, not nice swine," you sigh out in despair, "Rice! Wine."'
+				'She looks at you in confusion for a moment, then suddenly brightens, "Ah!" she exclaims, "Come, come!"'
+				'The old woman hurries to the other side of the stall as you follow her to where several smoked piglets are hung in a row.'
+				'"Here," the old woman crowed, handing you one of the pigs, "Nice swine, vely nice swine."'
+				'"No, not nice swine," you sigh in despair, "Rice! Wine."'
 				'"Yes, yes," the woman counters, "Nice swine, only 5 <b>₽</b>."'
 				*nl
-				'Just as you were about to give up, a young Chinese boy about your brother''s age arrives.'
-				'"I am sorry, my grandmother does not speak much Russian." he says as he steps beside the old woman who started to speak rapidly to him in what you assume is Chinese.'
+				'Just as you are about to give up, a young Chinese boy about your brother''s age arrives.'
+				'Just as you are about to give up, a young Chinese boy about your brother''s age arrives.'
 				'"My grandmother asks why you don''t like the piglets?" he translates as the old woman stops.'
 				'"I don''t want a pig," you reply in relief as his Russian is quite good, "I am looking for rice wine, wang-goo."'
 				'"Ah, huangjiu!" he exclaims as he turns to his grandmother and starts speaking in Chinese.'
 				'The old woman glares at you, hangs back the smoked pig and shuffles over to the shelf with the bottles. She finally picks up one of them and brings it over to you.'
-				'"Why you not say wanted rice wine." she asked in aggrieved tones, "500 <b>₽</b>."'
+				'"Why you not say wanted rice wine." she asked in aggrieved tones, "500<b>₽</b>."'
 				if money >= 500:
 					act 'Buy the wine':
 						*clr & cla
 						money -= 500
 						ricewine = 1
-						'You hand the woman the money and she gives you the wine.'
+						'You hand the woman the money, and she gives you the wine.'
 						act 'Leave': gt 'pav_train_market', 'start'
 					end
 				else
-					'You are chocked by the high price and realize that you cannot afford the wine. You apologize and turn away.'
+					'You are shocked by the high price and realize you cannot afford the wine. You apologize and turn away.'
 					
 					act 'Leave the market': gt 'pav_train_market', 'start'
 					
@@ -162,10 +162,10 @@ if $ARGS[0] = 'start':
 						minut += 15
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/market_boy01.jpg"></center>'
 						'You continue to wander through the market for another 15 minutes when the boy from the Chinese stall comes up to you.'
-						'"Hey, you really want that rice wine?" he asks after checking to make sure that no one is watching.'
+						'"Hey, you really want that rice wine?" he asks after checking to ensure no one is watching.'
 						'"Yes," you answer him, "But it''s too expensive. I can''t afford it."'
 						'"How about we make a deal." he says, "Go to the porn dealer and buy me a porn magazine and I''ll get you the wine."'
-						if pornmarkonce = 0: pornmarkonce = 1 & '"Where can I find the porn dealer?" you ask and he happily gives you directions.'
+						if pornmarkonce = 0: pornmarkonce = 1 & '"Where can I find the porn dealer?" you ask, and he happily gives you directions.'
 						
 						act 'Refuse':
 							'You decline his offer as he upsettingly walks away.'
@@ -202,10 +202,10 @@ if $ARGS[0] = 'start':
 				porndeal = 2 & ! to close the ricewine event
 				ricewine = 1
 				'"Do you have the wine?" you counter.'
-				'He pulls the bottle out of his backpack and you trade items.'
+				'He pulls the bottle out of his backpack, and you trade items.'
 				act 'Leave': gt 'pav_train_market', 'start'
 			else
-				'You tell him that you haven''t had time to pick up the magazine yet but you were working on it.'
+				'You tell him you haven''t had time to pick up the magazine yet, but you were working on it.'
 				act 'Leave': gt 'pav_train_market', 'start'
 			end 
 		elseif porndeal = 1 and ricewine ! 1 and porndealday = daystart and lookboy = 0:
@@ -214,7 +214,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			lookboy = 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/chinese_stall01.jpg"></center>'
-			'You look around the market for the boy from the Chinese stall, but you can''t find him. You decide to look for him another day.'
+			'You look around the market for the boy from the Chinese stall, but you can''t find him. So you decide to look for him another day.'
 			act 'Leave': gt 'pav_train_market', 'start'
 		end
 
@@ -291,7 +291,7 @@ if $ARGS[0] = 'events':
 	gs 'stat'
 	'<center><h2>Market</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/brodit'+rand(1,16)+'.jpg"></center>'
-	'You wander around the market taking in the sounds and colours but nothing catches your eye.'
+	'You wander around the market, taking in the sounds and colours, but nothing catches your eye.'
 	
 	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
@@ -323,7 +323,7 @@ if ARGS[0] = 1:
 		pcs_mood += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'
-		'You give the beggar a few rubles which he kindly thanks you for.'
+		'You give the beggar a few rubles, which he kindly thanks you for.'
 		act 'Stop wandering': gt 'pav_train_market', 'start'
 		if hour >= 8 and hour <= 18:
 			act 'Wander around the market': gt 'pav_train_market','events'
@@ -354,37 +354,37 @@ if ARGS[0] = 3:
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/book.jpg"></center>'
 	end
-	'You find a stall selling various books, there are fantasy books, science fiction and romance novels, all of which costs only 350 <b>₽</b> each.'
+	'You find a stall selling various books. There are fantasy, science fiction and romance novels, all of which cost only 350<b>₽</b> each.'
 	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
 		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= 350:
-		act 'Buy a fantasy book (350 <b>₽</b>)':
+		act 'Buy a fantasy book (350<b>₽</b>)':
 			*clr & cla
 			minut += 15
 			money -= 350
 			f_book += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
-			'You bought a fantasy book for 350 <b>₽</b>.'
+			'You bought a fantasy book for 350<b>₽</b>.'
 			act 'Leave':gt 'pav_train_market', 'start'
 		end
 	end
 	if money >= 350:
-		act 'Buy a science fiction book (350 <b>₽</b>)':
+		act 'Buy a science fiction book (350<b>₽</b>)':
 			*clr & cla
 			minut += 15
 			money -= 350
 			f_book += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
-			'You bought a science ficiton book for 350 <b>₽</b>.'
+			'You bought a science ficiton book for 350<b>₽</b>.'
 			act 'Leave':gt 'pav_train_market', 'start'
 		end
 	end
 	if money >= 350:
-		act 'Buy a romance novel (350 <b>₽</b>)':
+		act 'Buy a romance novel (350<b>₽</b>)':
 			*clr & cla
 			minut += 15
 			money -= 350
@@ -403,7 +403,7 @@ if ARGS[0] = 4:
 	pavmarket_porn = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-	'You find a small stall that has many shelves with a large variety of porn magazines, a pack of brand new porn playing cards, and you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
+	'You find a small stall with many shelves, a large variety of porn magazines, and a pack of brand-new porn playing cards. In addition, you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
 	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
 		act 'Wander around the market': gt 'pav_train_market','events'
@@ -424,7 +424,7 @@ if ARGS[0] = 4:
 	end
 	if porndeal = 1:
 		if money >= 400:
-			act 'Buy a porn magazine for the Chinese boy (400 <b>₽</b>)':
+			act 'Buy a porn magazine for the Chinese boy (400<b>₽</b>)':
 				*clr & cla
 				minut += 5
 				money -= 400
@@ -450,7 +450,7 @@ if ARGS[0] = 4:
 				act 'Look through a magazine':
 					cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
+					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with sizeable erect penis engaging in sexual acts with either half-naked or fully naked women. Most of them look close to your own age. You feel yourself getting aroused looking at the images.'
 					act 'Leave':gt 'pav_train_market', 'start'
 					act 'Look for something else':gt 'pav_train_market', 4
 					act 'Ask for the price':
@@ -458,7 +458,7 @@ if ARGS[0] = 4:
 						minut += 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-						'Blushing profusely right down to your roots, you approach the porn dealer and stammeringly ask him the price on the magazines. The porn dealer smiles at you and says, "All magazines are 400 <b>₽</b> each."'
+						'Blushing profusely down to your roots, you approach the porn dealer and stammeringly ask him the price of the magazines. The porn dealer smiles at you and says, "All magazines are <b>400₽</b> each."'
 						act 'Leave':gt 'pav_train_market', 'start'
 						act 'Look for something else':gt 'pav_train_market', 4
 						if money >= 400:
@@ -470,7 +470,7 @@ if ARGS[0] = 4:
 								TimesBuyPorno += 1
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-								'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
+								'You try not to look into the porn dealer''s eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
 								act 'Leave':gt 'pav_train_market', 'start'
 								act 'Buy something else':gt 'pav_train_market', 4
 							end
@@ -482,7 +482,7 @@ if ARGS[0] = 4:
 				act 'Look through a magazine':
 					cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
+					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with sizeable erect penis engaging in sexual acts with either half-naked or fully naked women. Most of them look close to your own age. You feel yourself getting aroused looking at the images.'
 					act 'Leave':gt 'pav_train_market', 'start'
 					act 'Look for something else':gt 'pav_train_market', 4
 					if money >= 400:
@@ -494,7 +494,7 @@ if ARGS[0] = 4:
 							TimesBuyPorno += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-							'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
+							'You try not to look into the porn dealer''s eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
 							act 'Leave':gt 'pav_train_market', 'start'
 							act 'Buy something else':gt 'pav_train_market', 4
 						end
@@ -505,7 +505,7 @@ if ARGS[0] = 4:
 				act 'Look through a magazine':
 					cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
+					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with sizeable erect penis engaging in sexual acts with either half-naked or fully naked women. Most of them look close to your own age. You feel yourself getting aroused looking at the images.'
 					act 'Leave':gt 'pav_train_market', 'start'
 					act 'Look for something else':gt 'pav_train_market', 4
 					if money >= 400:
@@ -517,7 +517,7 @@ if ARGS[0] = 4:
 							TimesBuyPorno += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-							'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
+							'You try not to look into the porn dealer''s eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
 							act 'Leave':gt 'pav_train_market', 'start'
 							act 'Buy something else':gt 'pav_train_market', 4
 						end
@@ -530,7 +530,7 @@ if ARGS[0] = 4:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/sextoys.jpg"></center>'
-		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses without a dildo. "Only 500 <b>₽</b>each."'
+		'He lets you step behind the counter to get a better look. As you do, he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700<b>₽</b> each." You also see a small selection of vibrators in various colours, mostly pink. "Only 700<b>₽</b> each." To one side, you see many butt plugs, rubber and metal. "Only 700<b>₽</b> each." Near the bottom are several strap-on harnesses without a dildo. "Only 500<b>₽</b> each."'
 		act 'Leave':gt 'pav_train_market', 'start'
 		act 'Look for something else':gt 'pav_train_market', 4
 		if money >= 700 and middildo = 0:
@@ -543,7 +543,7 @@ if ARGS[0] = 4:
 				TimesBuyPorno += 1
 				'<center><img <<$set_imgh>> src="images/pc/items/sextoys/15cm.jpg"></center>'
 				if pcs_inhib < 35:
-					'You buy a dildo and hastily hide it, while your face blushes with embarrassment.'
+					'You buy a dildo and hastily hide it while your face blushes with embarrassment.'
 				else
 					'You buy a dildo and calmly hide it.'
 				end
@@ -561,7 +561,7 @@ if ARGS[0] = 4:
 				TimesBuyPorno += 1
 				'<center><img <<$set_imgh>> src="images/pc/items/sextoys/15cm.jpg"></center>'
 				if  pcs_inhib < 35:
-					'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
+					'You buy the dildo and hastily hide it while your face blushes with embarrassment.'
 				else
 					'You buy the dildo and calmly hide it.'
 				end
@@ -569,7 +569,7 @@ if ARGS[0] = 4:
 				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		elseif money >= 1000 and suction_dildo > 0:
-			act 'Buy another 15cm suction dildo (1000 <b>₽</b>)':
+			act 'Buy another 15cm suction dildo (1000<b>₽</b>)':
 				cla
 				minut += 5
 				suction_dildo += 1
@@ -578,7 +578,7 @@ if ARGS[0] = 4:
 				TimesBuyPorno += 1
 				'<center><img <<$set_imgh>> src="images/pc/items/sextoys/15cm.jpg"></center>'
 				if  pcs_inhib < 35:
-					'You buy the dildo and hastily hide it, while your face blushes with embarrassment.'
+					'You buy the dildo and hastily hide it while your face blushes with embarrassment.'
 				else
 					'You buy the dildo and calmly hide it.'
 				end
@@ -587,7 +587,7 @@ if ARGS[0] = 4:
 			end
 		end
 		if money >= 700 and vibrator = 0:
-			act 'Buy vibrator (700 <b>₽</b>)':
+			act 'Buy vibrator (700<b>₽</b>)':
 				cla
 				minut += 5
 				vibrator = 1
@@ -595,7 +595,7 @@ if ARGS[0] = 4:
 				pcs_horny += 10
 				TimesBuyPorno += 1
 				if pcs_horny >= 50 and fame['pav_slut'] < 150:
-					'You buy a vibrator and hastily hide it, while your face blushes with embarrassment.'
+					'You buy a vibrator and hastily hide it while your face blushes with embarrassment.'
 				else
 					'You buy a vibrator and calmly hide it.'
 				end
@@ -604,7 +604,7 @@ if ARGS[0] = 4:
 			end
 		end
 		if money >= 700 and analplug = 0:
-			act 'Buy butt plug (700 <b>₽</b>)':
+			act 'Buy butt plug (700<b>₽</b>)':
 				cla
 				minut += 5
 				money -= 700
@@ -614,7 +614,7 @@ if ARGS[0] = 4:
 				TimesBuyPorno += 1
 				'<center><img <<$set_imgh>> src="images/pc/items/sextoys/bp_small.jpg"></center>'
 				if pcs_horny >= 50 and fame['pav_slut'] < 150:
-					'You buy a butt plug and hastily hide it, while your face blushes with embarrassment.'
+					'You buy a butt plug and hastily hide it while your face blushes with embarrassment.'
 				else
 					'You buy a butt plug and calmly hide it.'
 				end
@@ -624,7 +624,7 @@ if ARGS[0] = 4:
 		end
 		if middildo > 0:
 			if money >= 500 and strapon = 0:
-				act 'Buy strap-on harness (500 <b>₽</b>)':
+				act 'Buy strap-on harness (500<b>₽</b>)':
 					cla
 					minut += 5
 					strapon = 1
@@ -634,7 +634,7 @@ if ARGS[0] = 4:
 					TimesBuyPorno += 1
 					'<center><img <<$set_imgh>> src="images/pc/items/sextoys/harness.jpg"></center>'
 					if pcs_horny >= 50 and fame['pav_slut'] < 150:
-						'You buy a strap-on harness and hastily hide it, while your face blushes with embarrassment.'
+						'You buy a strap-on harness and hastily hide it while your face blushes with embarrassment.'
 					else
 						'You buy a strap-on harness and calmly hide it.'
 					end
@@ -644,7 +644,7 @@ if ARGS[0] = 4:
 			end
 		else
 			if money >= 1200 and strapon = 0 and middildo = 0:
-				act 'Buy strap-on harness with a 15cm dildo (1200 <b>₽</b>)':
+				act 'Buy strap-on harness with a 15cm dildo (1200<b>₽</b>)':
 					cla
 					minut += 5
 					strapon = 1
@@ -655,7 +655,7 @@ if ARGS[0] = 4:
 					TimesBuyPorno += 1
 					'<center><img <<$set_imgh>> src="images/pc/items/sextoys/harness.jpg"></center>'
 					if pcs_horny >= 50 and fame['pav_slut'] < 150:
-						'You buy a strap-on harness and hastily hide it, while your face blushes with embarrassment.'
+						'You buy a strap-on harness and hastily hide it while your face blushes with embarrassment.'
 					else
 						'You buy a strap-on harness and calmly hide it.'
 					end
@@ -692,14 +692,14 @@ if ARGS[0] = 6:
 		*clr & cla
 		minut += 5
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gadaet'+rand(1,2)+'.jpg"></center>'
-		'You agree and Gypsy takes your hand before she predicts you will have great happiness and lots of money. Afterwards, she promptly walks away.'
+		'You agree, and Gypsy takes your hand before she predicts you will have great happiness and lots of money. Afterwards, she promptly walks away.'
 		act 'Something''s wrong':
 			*clr & cla
 			money = 0
 			pcs_mood -= 50
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pusto.jpg"></center>'
-			'With a sneaking suspicion you start looking through your stuff. Your wallet is nowhere to be found!'
+			'With a sneaking suspicion, you start looking through your stuff. Unfortunately, your wallet is nowhere to be found!'
 			act 'Find the Gypsy':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/okliknut.jpg"></center>'
@@ -723,7 +723,7 @@ if ARGS[0] = 7:
 		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
-		act 'Buy the cosmetics (800 <b>₽</b>)':
+		act 'Buy the cosmetics (800<b>₽</b>)':
 			minut += 15
 			money -= tovpay
 			kosmetica += 50
@@ -745,7 +745,7 @@ if ARGS[0] = 8:
 		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
-		act 'Buy vitamins (105 <b>₽</b>)':
+		act 'Buy vitamins (105<b>₽</b>)':
 			minut += 15
 			vitamin += 20
 			money -= tovpay
@@ -767,7 +767,7 @@ if ARGS[0] = 9:
 		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
-		act 'Buy condoms (80 <b>₽</b>)':
+		act 'Buy condoms (80<b>₽</b>)':
 			minut += 15
 			prezik += 5
 			i = 5
@@ -794,7 +794,7 @@ if ARGS[0] = 10:
 		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
-		act 'Buy lip balm (100 <b>₽</b>)':
+		act 'Buy lip balm (100<b>₽</b>)':
 			*clr & cla
 			minut += 15
 			lipbalm += 30
@@ -811,10 +811,10 @@ if ARGS[0] = 11:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 	if arturKnow = 0:
-		'Someone suddenly calls out to you, "Hey pretty girl, do you want a fresh, juicy tangerine?"'
+		'Someone suddenly calls out, "Hey, pretty girl, do you want a fresh, juicy tangerine?"'
 		act 'Look': gt 'arturRinok','start'
 	else
-		'Someone suddenly calls out to you, "Hey <<$pcs_nickname>>, do you want a fresh, juicy tangerine?"'
+		'Someone suddenly calls out, "Hey, <<$pcs_nickname>>, do you want a fresh, juicy tangerine?"'
 		act 'Go and see Arthur': gt 'arturRinok','start'
 	end
 end
@@ -843,7 +843,7 @@ if ARGS[0] = 12:
 			minut+=10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/eat.jpg"></center>'
-			'The pie is still warm as the woman hands it over to you. Barely able to keep yourself away from it, you find a place to sit down and enjoy the pie.'
+			'The pie is still warm as the woman hands it over to you. Then, barely able to keep yourself away from it, you find a place to sit and enjoy the pie.'
 			act 'Continue walking through the market': gt 'pav_train_market','events'
 		end
 	else
@@ -863,7 +863,7 @@ if ARGS[0] = 13:
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vernutwallet.jpg"></center>'
-		'You call to the woman and hold out her wallet. She looks at you and releasing she gratefully takes her wallet back and walks away.'
+		'You call the woman and hold out her wallet. She looks at you and, realising, gratefully takes her wallet back and walks away.'
 		act 'Continue walking through the market': gt 'pav_train_market','events'
 	end
 	act 'Look through the purse':
@@ -872,7 +872,7 @@ if ARGS[0] = 13:
 		gs 'stat'
 		i = rand(40,200)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/zaglanut.jpg"></center>'
-		'You open the wallet and you see that there''s <<i>> <b>₽</b>'
+		'You open the wallet and you see that there''s <<i>><b>₽</b>'
 
 		gs 'willpower', 'misc', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -895,7 +895,7 @@ if ARGS[0] = 13:
 			pcs_mood += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/proverka.jpg"></center>'
-			'You catch up with the woman and telling her she dropped something you hand her the purse. The woman checks her money is still there and seeing that everything is in place, she thanks you and walked away.'
+			'You catch up with the woman, and telling her she dropped something, you hand her the purse. The woman checks that her money is still there, and seeing everything in place, she thanks you and walks away.'
 			act 'Stop wandering': gt 'pav_train_market', 'start'
 			if hour >= 8 and hour <= 18:
 				act 'Wander around the market': gt 'pav_train_market','events'
@@ -949,7 +949,7 @@ if ARGS[0] = 17:
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/meatlavka.jpg"></center>'
-	'You wander past a the meet seller and see a butcher working with an axe.'
+	'You wander past the meat seller and see a butcher working with an axe.'
 	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
 		act 'Wander around the market': gt 'pav_train_market','events'
@@ -962,7 +962,7 @@ if ARGS[0] = 18:
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dirka.jpg"></center>'
-	'As you walk past a stall you notice a small hole torn in the canvas.'
+	'As you walk past a stall, you notice a small hole torn in the canvas.'
 	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
 		act 'Wander around the market': gt 'pav_train_market','events'

+ 1 - 1
locations/pod_ezd.qsrc

@@ -910,7 +910,7 @@ end
 
 if $ARGS[0] = 'juliamil':
 	menu_off = 1
-	gs 'boyStat', 'A12'
+	gs 'npc_relationship', 'modify', 'A12', 'like'
 	minut +=5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'

+ 1 - 1
locations/selfplay.qsrc

@@ -298,7 +298,7 @@ if $ARGS[0] = 'shower_dildo_check':
 		act 'Ride your bathtub dildo':gt'selfplay','shower_bathtub_suction_dildo_ride'
 	end
 	if dyneval('result = <<$loc>>_glass_shower_dildo') = 1:
-		act 'Ride your wall mounted dildo':gt'selfplay','glass_shower_suction_dildo_ride'
+		act 'Ride your wall mounted dildo':gt'selfplay','glass_shower_suction_dildo_fuck'
 	elseif dyneval('result = <<$loc>>_bath_shower_dildo') = 1:
 		act 'Ride your wall mounted dildo':gt'selfplay','shower_bathtub_wall_dildo_fuck'
 	end

+ 3 - 2
locations/stat.qsrc

@@ -156,9 +156,10 @@ if boxing > 100: boxing = 100
 
 manamax = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 
-if $start_type[1] = 'magic':
+!! Set the massage displayed each time the magik attribute is increased.
+if $start_type[1] ! 'nomagic':
 	if pcs_magik > magikhigh:
-		magikhigh += 1
+		magikhigh = pcs_magik
 		rikudo += pcs_magik * 100
 		$stat_msg += '<BR><b>You feel like a strength has been revealed within you, and you gush with magic, lifting you to a new energy level.</b>'
 !!		This will be replaced when a more advanced physical system is made

+ 1 - 0
locations/succubus.qsrc

@@ -931,6 +931,7 @@ if $args[0] = 'sucwalkinggo':
 	minut += 180 + ((scfeed * 10) / succublvl)
 	pcs_health += 5 * (360 + ((scfeed * 10) / succublvl))
 	pcs_sleep += 15 * ((360 + ((scfeed * 10) / succublvl)) / 60)
+	pcs_condition['lack_of_sleep'] = 0
 	gs 'stat'
 	clr
 

+ 15 - 6
locations/tour_guide.qsrc

@@ -1,6 +1,7 @@
 # tour_guide
 ! Tour Guide - Full Time Summer Only Job
 
+
 if $ARGS[0] = 'tourstart':
 	CLOSE ALL
 	$loc = 'tour_guide'
@@ -10,7 +11,8 @@ if $ARGS[0] = 'tourstart':
 	$menu_arg = 'tourstart'
 	menu_off = 1
 	cla & *clr
-	if TourGuide = 0:
+	!! TourGuide = 0
+	if (emp_job_status[1] = 0  or emp_job_status[1] =4) and emp_job_status[1] ! 5:
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/office/tour_office.jpg"></center>'
@@ -19,17 +21,21 @@ if $ARGS[0] = 'tourstart':
 		'You answer a few questions the management team asks you and are offered a summer position at 100 <b>₽</b> an hour, 8 hours a day. Fresh uniforms are provided daily and training will be you shadowing another guide for the first couple of days to make sure you know the details required to lead your groups.'
 		'Like any teenager your only questions are about breaks and days off. The manager smiles, not surprised, and tells you that working is voluntary. If you do not show up then obviously you will not make any money that day, but otherwise no daily commitment is required from you. Breaks will be allowed if there are no groups to lead at that time and you will be given a small lunch everyday that you choose to work.'
 		act 'Accept the position':
+			gs 'emp_job_array', 'emp_tourist_guide'
 			if cheatWork = 1:
-				TourGuide = 1
+				!TourGuide = 1
+				gs 'emp_functions','emp_booking'
 				gt 'pav_park', 'start'
 			else
-				TourGuide = 1
+				!TourGuide = 1
+				gs 'emp_functions','emp_booking'
 				work = 1
 				gt 'pav_park', 'start'
 			end
 		end
 		act 'Change your mind': gt 'pav_park', 'start'
-	elseif TourGuide = 1:
+		!! TourGuide = 1
+	elseif emp_job_status[1] = 1:
 		*clr & cla
 		minut += 240
 		inhib_exp += rand(0,1)
@@ -395,7 +401,8 @@ if $ARGS[0] = 'resign':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/office/angry_boss.jpg"></center>'
 	'You let your boss know you have decided to quit your job for the rest of the summer. He is not pleased about you quitting, but manages to keep his temper and lets you know if you want to come back next summer he will at least consider it.'
 	act 'Resign':
-		TourGuide = 3
+		gs 'emp_functions','emp_terminate', 4
+		!! TourGuide = 3
 		work = 0
 		gt 'pav_park', 'start'
 	end
@@ -431,7 +438,8 @@ if $ARGS[0] = 'backroom':
 	end
 	act 'Take your punishment': gt 'tour_guide', 'spank'
 	act 'Quit your job':
-		TourGuide = 2
+		gs 'emp_functions','emp_terminate', 5
+		!! TourGuide = 2
 		work = 0
 		killvar 'riverbusted'
 		pcs_mood -= 25
@@ -510,5 +518,6 @@ if $ARGS[0] = 'after_spank':
 	act 'Leave the office': gt 'pav_park', 'start'
 end
 
+
 --- tour_guide ---------------------------------
 

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác