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

locations/albinahome.qsrc

@@ -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, 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.'
+	'The two of you keep playing games while trash-talking and 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? So, how about we make it a bit more interesting then?"'
+		'She laughs in response. "You''re that sure? 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.'
 		gs 'willpower', 'sex', 'resist', 'medium'
@@ -447,7 +447,8 @@ 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''s a little disappointed as she comes back over and lies down beside you again. "You''re 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
@@ -479,7 +480,7 @@ if $ARGS[0] = 'game_bet':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 	'You smile. "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 before she lies back beside you and picks her controller up. "Please! You''re so going to lose."' 
+	'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. "<i>Please</i>! 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
@@ -503,10 +504,10 @@ if $ARGS[0] = 'game_bet':
 			'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 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.'
+			'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. "You''re my bitch now, <<$pcs_nickname>>!" 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 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.'
+			'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. "You''re my bitch now, <<$pcs_nickname>>!" 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'
@@ -517,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 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.'
+		'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 before smiling and smacking your ass. "You''re my bitch now, <<$pcs_nickname>>!" 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

locations/beverage.qsrc

@@ -522,5 +522,98 @@ if $ARGS[0] = 'only_cost_esp':
 	gt 'food_menu'
 end
 
+if $ARGS[0] = 'only_cost_kva':
+	frost = 1
+	fat += 2
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 5
+	pcs_mood += 15
+	if pcs_hydra >= 100:
+		pcs_hydra += 30
+	else
+		pcs_hydra += 60
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_jui':
+	frost = 1
+	if alko > 0: alko -= 1
+	fat += 3
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 8
+	pcs_mood += 10
+	if pcs_hydra >= 100:
+		pcs_hydra += 40
+	else
+		pcs_hydra += 80
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_mil':
+	*clr & cla
+	frost = 1
+	fat += 6
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 5
+	pcs_mood += 20
+	pcs_energy += 5
+	if pcs_hydra >= 100:
+		pcs_hydra += 50
+	else
+		pcs_hydra += 100
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_wat':
+	frost = 1
+	if alko > 0: alko -= 1
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 10
+	if pcs_hydra >= 100:
+		pcs_hydra += 25
+	else
+		pcs_hydra += 50
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
 --- beverage ---------------------------------
 

locations/city_coffee_hole.qsrc

@@ -23,6 +23,7 @@ if $args[0]= 'inner':
 	$menu_arg = 'inner'
 	menu_off = 0
 	gs 'katja_meynold_schedule'
+	!!gs 'albina_uni_schedule'
 	gs 'stat'
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/inside.jpg"></center>'
@@ -33,8 +34,11 @@ if $args[0]= 'inner':
 	if locat['katja'] = 30 and (katjaQW['know_going_to_teaching_degree'] = 1 or mid($start_type,1,2) = 'sg'):
 		'You see your classmate <a href="exec:gt ''katja_chat'', ''coffee_hole''">Katja</a> sitting at a table with a pile of books, a cup of coffee and a plate of food.'
 	end
+	!!if locat['albina'] = 17 and AlbinaQW['know_albina_uni'] > 0 or mid($start_type,1,2) = 'sg'):
+		!!'You see <a href="exec:gt ''albina_uni'', ''coffee_hole''">Albina</a> sitting at a table with a woman who has her back turned to you.'
+	!!end
 	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and day = 2 and nerd_game['fixed_uni_day'] = 0 and hour >= 18:
-		'You see some familiar faces in the corner of the coffee shop. It is most of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds.</a> you went to school with back in Pavlovsk around a table. It looks like they are playing some sort of game.'
+		'You see some familiar faces sitting in one of the corners. Some of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds</a> you went to school with back in Pavlovsk are gathered around a table. It looks like they''re playing some sort of game.'
 	end
 
 	if nerd_game['game_day'] = daystart and hour = 18: act '<b>Join nerds</b>': gt 'nerd_game_night','game'
@@ -95,7 +99,7 @@ if $ARGS[0] = 'eat':
 		minut += 10
 		mood += 5
 		gs 'stat'
-		'You take your order and find an empty table. You quietly enjoy your order as you look around at the other people.	You feel your mood brighten as you enjoy the ambience of the place.'
+		'You take your order from the counter and find an empty table. You quietly enjoy the ambience of the place and feel your mood brightening as you look around.'
 	else
 		gs 'stat'
 		'You''re sitting at a table in the cafe. It''s nice here.'
@@ -115,7 +119,7 @@ if $ARGS[0] = 'post_komp':
 	mood += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafequiet.jpg"></center>'
-	'You''re sitting at a table in the coffee shop. You could use your laptop if you wanted, but should buy something more to eat or drink first.'
+	'You''re sitting at a table in the coffee shop. You could use your laptop if you wanted, but should buy something to eat or drink first.'
 	act 'Get up from table': gt 'city_coffee_hole', 'inner'
 end
 
@@ -312,7 +316,7 @@ if $ARGS[0] = 'photo_shoot':
 											minut +=5
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-											'You nod at her. "Sure thing, I should get going anyways. Thanks again. I''ll see you around campus, hopefully. If not, I''ll stop by sometime, and we can hang out." As she escorts you to the door, you ask; "Which room do you have over at the dorms?"'
+											'You nod at her. "Sure thing, I should get going anyway. Thanks again. I''ll see you around campus, hopefully. If not, I''ll stop by sometime, and we can hang out." As she escorts you to the door, you ask; "Which room do you have over at the dorms?"'
 											'She stops at the door without unlocking it. "I''m not. I was going to, but the boys wanted to get a place in the city, so we rented an apartment close to campus. Costs me less as I only have to pay a quarter of the bills than the dorm was going to cost. Living with three boys is a nightmare though, so I only regret it constantly," she says with a laugh.'
 											*nl
 											'"You should stop by sometime," she says and tells you where to find the place.'
@@ -473,7 +477,7 @@ if $args[0]= 'kendra':
 			npc_rel['A84'] = 45
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
-			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo and attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo who attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			else
 			  'You start talking with her. You tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			end

locations/clothing_attributes.qsrc

@@ -108,6 +108,9 @@ CloStyle = 0
 CloStyle2 = 0
 CloBimbo = 0
 CloInhibit = 0
+CloCoverFront = 0
+CloCoverBack = 0
+CloCoverTop = 0
 
 if $ARGS[0] = 'gm_outfits':
 	*P FUNC('$attributes_gm_outfits', $ARGS[0], ARGS[1])

locations/food.qsrc

@@ -1050,5 +1050,126 @@ if $ARGS[0] = 'only_stats_healthy_meal':
 	pcs_breath = 0
 end
 
+if $ARGS[0] = 'only_cost_pirosh':
+	*clr & cla
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += pcs_health/10
+	pcs_mood += 5
+	fat += 4
+	pcs_energy += 40
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_golub':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 5
+	fat += 8
+	pcs_energy += 60
+	if pcs_hydra >= 100:
+		pcs_hydra += 10
+	else
+		pcs_hydra += 20
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_pozhar':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 15
+	pcs_mood += 10
+	fat += 6
+	pcs_energy += 70
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_reuben':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 20
+	pcs_mood += 25
+	fat += 12
+	pcs_energy += 110
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bliny':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 5
+	fat += 8
+	pcs_energy += 50
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
 --- food ---------------------------------
 

locations/food_menu.qsrc

@@ -441,38 +441,38 @@ elseif $loc = 'uni_cafe':
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
-	$_eat['0,type'] = 'pirosh'
+	$_eat['0,type'] = 'only_cost_pirosh'
 	$_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
-	$_eat['1,type'] = 'bliny'
+	$_eat['1,type'] = 'only_cost_bliny'
 	$_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
-	$_eat['2,type'] = 'golub'
+	$_eat['2,type'] = 'only_cost_golub'
 	$_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
-	$_eat['3,type'] = 'pozhar'
+	$_eat['3,type'] = 'only_cost_pozhar'
 	$_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
-	$_eat['4,type'] = 'reuben'
+	$_eat['4,type'] = 'only_cost_reuben'
 	$_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,type'] = 'only_cost_wat'
 	$_drink['0,price'] = 'Free'
 	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,type'] = 'only_cost_kva'
 	$_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,type'] = 'only_cost_jui'
 	$_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
+	$_drink['0,type'] = 'only_cost_tea'
 	$_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
+	$_drink['2,type'] = 'only_cost_bco'
 	$_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,type'] = 'only_cost_mil'
 	$_drink['5,price'] = 200
 elseif $loc = 'city_coffee_hole':
 	$loc_arg = 'eat'

locations/journal.qsrc

@@ -465,10 +465,10 @@ if $ARGS[0] = 'uni':
 
 	j = 1
 	:semester_loop
-	if university['semester_passed'] = j:
+	if university['semester_passed'] >= j:
 		gs 'grades', 'assing_grade_description', 'uni_<<$university[''enrolled_in'']>>_semester_<<j>>'
 		*nl
-		'You passed the'+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', i*8-7,7))+' semester with the following grades:'
+		'You passed the'+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', j*8-7,7))+' semester with the following grades:'
 		k = 0
 		:class_loop
 		if $class_list_institution[k] = 'uni_<<$university[''enrolled_in'']>>_semester_<<j>>':
@@ -481,10 +481,12 @@ if $ARGS[0] = 'uni':
 	j += 1
 	if j < 8: jump 'semester_loop'
 	killvar 'j'
-
+	
 	if university['semester_passed'] = university['enrolled_in_semester'] and university['diploma'] = 0:
+		*nl
 		'You need to register for your next semester at the university administration'
 	elseif university['semester_week'] <= 0 and university['exam_week'] = 0:
+		*nl
 		'You currently have a break between semesters.'
 		if university['semester_week'] = -1:
 			'The next semester will start next week'
@@ -499,8 +501,10 @@ if $ARGS[0] = 'uni':
 
 	elseif university['semester_week'] > 0:
 		if university['semester_week'] < 11:
+			*nl
 			'You are in the '+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', university['semester_week']*8-7,7))+' week of the semester, which last 15 weeks.'
 		else
+			*nl
 			'You are in the '+str(university['semester_week'])+'th week of the semester which last 15 weeks.'
 		end
 
@@ -513,7 +517,7 @@ if $ARGS[0] = 'uni':
 
 		'<center><h2>Grades</h2></center>'
 
-		gs 'grades', 'assing_grade_description', $university['enrolled_in']
+		gs 'grades', 'assing_grade_description',  'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>'
 
 		j = 0
 		:grade_loop
@@ -535,6 +539,7 @@ if $ARGS[0] = 'uni':
 		killvar 'j'
 
 	elseif university['exam_week'] > 0:
+		*nl
 		'You are in the '+iif(university['exam_week'] = 1,'first','second')+' of the two weeks of exams. '+func('uni_programs', 'exam', 'schedule')
 		*nl
 		j = 0

locations/katja_chat.qsrc

@@ -69,6 +69,7 @@ end
 
 if $ARGS[0] = 'uni_cafe':
 	menu_off = 1
+	minut += 15
 	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'chat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'Katja looks up from her lunch as you try to sit down opposite her.'

locations/katja_dorm.qsrc

@@ -16,8 +16,8 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> ''S Dorm Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dorm_room.jpg"></center>'
-	'The dorm room has two beds the one on the left belongs to '+iif( sofiaQW['know'] = 0, 'Katja''s room mate', 'Sofia')+' and Katja''s is the one on the right. Above Katja''s bed is a full bookcase, and the wall is plastered with posters and notes'
-	'Her table is likewise full of stuff; in the middle of it sits her laptop. The side of '+iif( sofiaQW['know'] = 0, 'her room mate', 'Sofia')+' has a lot less stuff.'
+	'The dorm room has two beds. The one on the left belongs to '+iif( sofiaQW['know'] = 0, 'Katja''s room mate', 'Sofia')+' while the one on the right is Katja''s. Above Katja''s bed is a full bookcase, and the wall is plastered with posters and notes.'
+	'Her table is likewise full of stuff; in the middle of it sits her laptop. '+iif( sofiaQW['know'] = 0, 'Her room mate''s', 'Sofia')+' side of the room is a lot less cluttered.'
 
 	if locat['katja'] = 31:
 		'Katja is sitting at her desk.'
@@ -34,10 +34,10 @@ if $ARGS[0] = 'start':
 			'Katja is heading out the door to class and has no time to talk.'
 		end
 	elseif locat['katja'] = 51:
-		'Katja is moving around in her room setting up her laptop'
+		'Katja is moving around the room while setting up her laptop.'
 		act 'Talk to Katja': gt 'katja_dorm', 'movie_talk1'		
 	elseif locat['katja'] = 52:
-		'Katja is sitting at her bead, and have set up her laptop so she can watch a movie'
+		'Katja is sitting on her bed, having set up her laptop so she can watch a film.'
 		act 'Talk to Katja': gt 'katja_dorm', 'movie_talk2'	
 	else
 		'Katja is not in her room.'
@@ -71,11 +71,11 @@ if $ARGS[0] = 'talk':
 	if locat['katja'] ! 31:
 		if locat['katja'] = 20:
 			!! Katja wants to go to bed and shows you out
-			'"I''m of to bed know, so we can talk an other time" Katja says and shows you out.'
+			'"I''m off to bed now. Talk another time?" Katja asks as she shows you out.'
 			act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 		elseif locat['katja'] = 29:
 			!! Katja wants to go to the library to study
-			'"I need to do some studying at the library, wanna join me" Katja says.'
+			'"I need to do some studying at the library. Care to join me?" Katja asks.'
 			if week = 4:
 				if npc_sex['A14'] >= 1:
 					gs 'willpower', 'misc', 'force', 'easy'
@@ -90,15 +90,18 @@ if $ARGS[0] = 'talk':
 						menu_off = 1
 						gs 'willpower', 'pay', 'force'
 						minut += 10
-						'"Come on Katja. Let''s watch a movie instead, you can always study tomorrow . Why do you even need to study, you are so smart you know everything" you say "That not true, I only do so well in class because I study a lot" Katja answers, "Please" you plead trying to make puppy eyes to Katja, who have a hard time not laughing. "Okay, just this once" Katja finally relents.'
-						'"Go prepare some popcorn while I set up the movie" she says, and you go the to kitchen and prepare the popcorn while Katja sets up the movie, you then both set down on her bed and start to watch the movie Katja has selected.'
+						'"Come on, let''s watch a movie instead! You can always study tomorrow . Why do you even need to study anyway? You''re so smart that you know everything!" you say.' 
+						'"That''s not true. I only do so well in class because I study a lot," Katja answers.' 
+						'"Please?" you plead, trying to make puppy eyes at Katja, who has a hard time not laughing.' 
+						'"Okay, just this once." she finally relents. "Go prepare some popcorn while I set up my laptop."'
+						'You go to the kitchen and prepare the popcorn before you both settle down on her bed and watch the film Katja has selected.'
 						act 'Watch the movie': gt 'katja_dorm', 'watch_movie'
 					end
 				else
 					act 'Convince Katja to stay here and watch a movie (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			act 'say yes and go with her to the library': minut += 10 & gt 'katja_uni', 'library2' 
+			act 'Go to the library with Katja': minut += 10 & gt 'katja_uni', 'library2' 
 			act 'Say no and leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 		elseif locat['katja'] = 51:
 			gt 'katja_dorm', 'movie_talk1'	
@@ -261,7 +264,7 @@ if $ARGS[0] = 'chat':
 						minut += 5
 						'"Sounds fun," Katja says. "'+iif(katjaQW['simultanous_boys'] >= 2, 'It''ll be fun to have sex with several boys again', 'I think it''s time for me to try sex with two boys at once')+'."'
 						'You tell Lazar that you''ll come over, and when you turn back towards Katja, she has something in her hands. "Look what I have," she says and shows you two almost identically black bodysuits.'
-						'"I think it would be sexy if we were these matching bodysuits," she says. You agree and the two of you quickly change into the bodysuits before you head out the door and start walking towards Lazar''s house.'
+						'"I think it would be sexy if we wear these matching bodysuits," she says. You agree and the two of you quickly change into the bodysuits before you head out the door and start walking towards Lazar''s house.'
 						act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
 					else
 						'Katja suddenly looks nervous when you tell her that Ivan is at Lazar''s place. "I... I don''t think... I think .... It''s best if we wait for another time. I''m not ready for two guys at the same time."'
@@ -283,7 +286,7 @@ if $ARGS[0] = 'chat':
 
 	if katjaQW['birth_control_start_day'] = 0 and katjaQW['QWstage'] >= 6:
 		!!If you haven''t already told katja to use birthcontrol you can do so. This will prevent her from getting pregnant, and is necessary for taking to the park to have sex with random boys.
-		act 'Tell Katja that you think she should use birth control.': gt 'KatjaHomeTalk', 'preventation_talk'
+		act 'Tell Katja that you think she should use birth control': gt 'KatjaHomeTalk', 'preventation_talk'
 	end
 
 	if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
@@ -374,11 +377,11 @@ if $ARGS[0] = 'sofia_meet':
 	'"Sofia, this is <<$pcs_nickname>>, my '+iif($university['enrolled_in'] = 'teaching_studies', 'classmate and ', '')+'friend from school who was just about to leave," Katja replies before she turns to you. "<<$pcs_nickname>>, this is Sofia, my roommate."'
 	'"Hi <<$pcs_nickname>>, it''s so nice to meet Katja''s friends since she doesn''t seem to have a lot of them," Sofia says, which clearly makes Katja blush. "So '+iif( $university['enrolled_in'] = 'teaching_studies', 'you''re also studying to become a teacher like Katja', 'what are you studying')+'?" she asks.'
 	''+iif( $university['enrolled_in'] = 'teaching_studies', '"yes" ', '"I''m '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university')+'" ')+'you answer.'
-	'"Cool. I''m '+iif($university['enrolled_in'] = 'nursing', 'also studying to become a nurse. I do think I''ve seen you in class now that I think about it.', 'studying to become a nurse.')+' You must tell me all about yourself and what naughty things Katja was up to in school," she says, making Katja blush even more.'
+	'"Cool. I''m '+iif($university['enrolled_in'] = 'nursing', 'also studying to become a nurse. I think I''ve seen you in class now that I think about it.', 'studying to become a nurse.')+' You must tell me all about yourself and what naughty things Katja was up to in school," she says, making Katja blush even more.'
 	*nl
 	'"I''m sorry, but <<$pcs_nickname>> was just leaving," Katja says, looking at you as if trying to say she''s sorry.'
 	'"That''s right, I''ll be leaving now," you say.'
-	'"Nice meeting you," Sofia says "Wish we had more time to chat since I barely know anybody here; just Katja and my boyfriend Maxim. See you again soon. I''m sure we''ll become great friends," she continues.'
+	'"Nice meeting you," Sofia says. "Wish we had more time to chat since I barely know anybody here; just Katja and my boyfriend Maxim. See you again soon. I''m sure we''ll become great friends," she continues.'
 	'You say goodbye to Katja and as you leave the room, you hear Sofia continuing to talk the ear off of Katja.'
 	act 'Leave': gt 'uni_dorm', 'second_floor'
 end
@@ -413,7 +416,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 					minut += 5
 					cla
 					'"I''m not that into Lazar. I don''t think I want to have sex with him," you tell Katja.'
-					'"Why? He''s so handsome, and he seems to be more mature now. Yes, I know he is just with a girl to have sex. But that''s also what we want. I''m not looking for a relationship," Katja says.'
+					'"Why? He''s so handsome, and he seems to be more mature now. Yes, I know he''s just with a girl to have sex, but that''s also what we want. I''m not looking for a relationship," Katja says.'
 					'"I just don''t think that he''s a guy I want to have sex with," you respond.'
 					'"Okay," Katja says, but it doesn''t seem like she really accepts your answer.'
 					act 'Talk about something else': gt 'katja_dorm', 'talk'

locations/nerd_game_night.qsrc

@@ -276,7 +276,7 @@ if $ARGS[0] = 'keep_playing_on1':
 				'The time quickly flies by before Feofan interrupts and stops the game as it''s getting late and he has to get home.'
 				*nl
 				'You hear a disappointing sigh go through the room as everybody stops and closes their handbooks. The group is still buzzing and you chat for some time about the twists and turns during one of the encounters.'
-				'As you''re about to leave, Feofan speaks up. "Don''t worry, we''ll continue this story event next time." He then turns to you. "It was fun having you around, <<$pcs_nickname>>. I hope you had fun and will join us again next time." The group then gather up their books and walk out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+				'As you''re about to leave, Feofan speaks up. "Don''t worry, we''ll continue this story event next time." He then turns to you. "It was fun having you around, <<$pcs_nickname>>. I hope you had fun and will join us again next time." The group then gather up their books and head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 				act 'Leave': gt 'pav_commcenter', 'lobby'
 				act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 			end
@@ -417,7 +417,7 @@ if $ARGS[0] = 'keep_playing_on2':
 				'The tension rises before easing up as the others tease Petka about his unfortunate choice of words. You tell him you''re fine and to return to camp before you finish bathing, get dressed and head back yourself. After you do, the rest of the group follow your lead and one by one, their characters all go and bathe as well, apparently enjoying the more immersive role-playing you''re doing.'
 				*nl
 				'As the party beds down for the night, you and the others keep teasing Petka throughout the rest of the game as it nears the end.'
-				'"We''re out of time," Feofan announces and you and the rest of the group let out a sigh. "Don''t worry, there are lots of adventures left to explore. We''ll pick it up next time. Hopefully Petka will get to see <<$pcs_nickname>> naked again..." he says with a wink, which gets everyone laughing again as Petka blushes once more. The group then gather up their books and walk out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+				'"We''re out of time," Feofan announces and you and the rest of the group let out a sigh. "Don''t worry, there are lots of adventures left to explore. We''ll pick it up next time. Hopefully Petka will get to see <<$pcs_nickname>> naked again..." he says with a wink, which gets everyone laughing again as Petka blushes once more. The group then gather up their books and head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 				act 'Leave': gt 'pav_commcenter', 'lobby'
 				act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 			end
@@ -482,7 +482,7 @@ if $ARGS[0] = 'game_night3':
 								if $loc = 'city_coffee_hole':
 									'The whole group meets up and starts showing off what they got. "We didn''t manage to buy anything either. No one wanted to accept our gold!" Julia exhales.'
 									'"Yeah, we''ll have to save the gold for another time. We''ll surely come across someone that will accept it!" Artem exclaims while throwing an eye towards Feofan.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can always go find another adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can always go find another adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "I found the brothel, if that''s any consolation."'
 									'"Isn''t your character a girl?" Artem replies.'
@@ -500,7 +500,7 @@ if $ARGS[0] = 'game_night3':
 										act 'Back to the game':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 										end
@@ -508,13 +508,13 @@ if $ARGS[0] = 'game_night3':
 								else
 									'The whole group meets up and starts showing off what they got. "We didn''t manage to buy anything either. No one wanted to accept our gold!" Julia exhales.'
 									'"Yeah, we''ll have to save the gold for another time. We''ll surely come across someone that will accept it!" Artem exclaims while throwing an eye towards Feofan.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can always go find another adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can always go find another adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "I found the brothel, if that''s any consolation."'
 									'"Isn''t your character a girl?" Artem replies.'
 									'Petka blushes. "Yeah? So?"'
 									'Artem laughs. "Why would she need a brothel?"'
-									'Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+									'Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 									act 'Leave': gt 'pav_commcenter', 'lobby'
 									act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 								end
@@ -536,7 +536,7 @@ if $ARGS[0] = 'game_night3':
 								if $loc = 'city_coffee_hole':
 									'You meet up with a cheerful Julia and Zinaida. "Who knew that our usually quiet Zinaida was quite the sweet talker. She managed to get us some potions."'
 									'"And we got new weapons!" Artem chimes in.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "To top it off, I found the brothel!"'
 									'"Isn''t your character a girl?" Artem replies.'
@@ -554,7 +554,7 @@ if $ARGS[0] = 'game_night3':
 										act 'Back to the game':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 										end
@@ -562,13 +562,13 @@ if $ARGS[0] = 'game_night3':
 								else
 									'You meet up with a cheerful Julia and Zinaida. "Who knew that our usually quiet Zinaida was quite the sweet talker. She managed to get us some potions."'
 									'"And we got new weapons!" Artem chimes in.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "To top it off, I found the brothel!"'
 									'"Isn''t your character a girl?" Artem replies.'
 									'Petka blushes. "Yeah? So?"'
 									'Artem laughs. "Why would she need a brothel?"'
-									'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "I can''t wait to see how all of this plays out!" someone comments before Feofan calls a stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+									'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "I can''t wait to see how all of this plays out!" someone comments before Feofan calls a stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 									act 'Leave':gt 'pav_commcenter', 'lobby'
 									act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 								end
@@ -586,7 +586,7 @@ if $ARGS[0] = 'game_night3':
 								if $loc = 'city_coffee_hole':
 									'Julia and Zinaida are looking dejected. "We didn''t manage to get rid of the gold. The shopkeeper wasn''t having any of it..." They quickly turn ecstatic when they see all the goods you''ve brought with you.'
 									'"Maybe we should send <<$pcs_nickname>> to have a chat with the shopkeeper too." Several of them congratulate you as you all discuss the different armors and weapons you''ve managed to acquire.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "And I found the brothel!"'
 									'"Isn''t your character a girl?" Artem replies.'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'game_night3':
 										act 'Back to the game':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 										end
@@ -614,13 +614,13 @@ if $ARGS[0] = 'game_night3':
 								else									
 									'Julia and Zinaida are looking dejected. "We didn''t manage to get rid of the gold. The shopkeeper wasn''t having any of it..." They quickly turn ecstatic when they see all the goods you''ve brought with you.'
 									'"Maybe we should send <<$pcs_nickname>> to have a chat with the shopkeeper too?" Several of them congratulate you as you all discuss the different armors and weapons you''ve managed to acquire.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "And I found the brothel!"'
 									'"Isn''t your character a girl?" Artem replies.'
 									'Petka blushes. "Yeah? So?"'
 									'Artem laughs. "Why would she need a brothel?"'
-									'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "Good job everyone! I can''t wait to see you use all these weapons at a later time," Feofan comments as it''s time to stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+									'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "Good job everyone! I can''t wait to see you use all these weapons at a later time," Feofan comments as it''s time to stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 									act 'Leave':gt 'pav_commcenter', 'lobby'
 									act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 								end
@@ -666,7 +666,7 @@ if $ARGS[0] = 'game_night3':
 								'You meet the rest of the party and show off the goods to both some excitement and disappointment as you continue discussing what to do next.'
 								'Julia and Zinaida are looking cheerful. "Who knew that our usually quiet Zinaida was quite the sweet talker. She managed to get us some potions."'
 								'"We got a few new weapons," Artem chimes in.'
-								'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+								'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 								*nl
 								'Petka jumps in excitedly. "To top it off, I found the brothel!"'
 								'"Isn''t your character a girl?" Artem replies.'
@@ -686,7 +686,7 @@ if $ARGS[0] = 'game_night3':
 									act 'Back to the game':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-										'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+										'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 										act 'Leave': gt 'city_coffee_hole', 'inner'
 										act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 									end
@@ -694,13 +694,13 @@ if $ARGS[0] = 'game_night3':
 							else									
 								'Julia and Zinaida are looking dejected. "We didn''t manage to get rid of the gold. The shopkeeper wasn''t having any of it..." They quickly turn ecstatic when they see all the goods you''ve brought with you.'
 								'"Maybe we should send <<$pcs_nickname>> to have a chat with the shopkeeper too?" Several of them congratulate you as you all discuss the different armors and weapons you''ve managed to acquire.'
-								'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+								'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 								*nl
 								'Petka jumps in excitedly. "And I found the brothel!"'
 								'"Isn''t your character a girl?" Artem replies.'
 								'Petka blushes. "Yeah? So?"'
 								'Artem laughs. "Why would she need a brothel?"'
-								'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "Good job everyone! I can''t wait to see you use all these weapons at a later time," Feofan comments as it''s time to stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+								'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "Good job everyone! I can''t wait to see you use all these weapons at a later time," Feofan comments as it''s time to stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 								act 'Leave':gt 'pav_commcenter', 'lobby'
 								act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 							end
@@ -859,7 +859,7 @@ if $ARGS[0] = 'inform_them':
 			act 'Back to the game':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-				'Once Anushka is gone, you all get back into the game. "I''m not too fond of that, I''d rather do something else," Julia counters. The arguing then starts getting more intense as everyone tries to get their point across. The yelling gets louder and louder until Feofan gets fed up and slams the table. "Now that I have your attention! Since you can''t decide what you should do, I suggest you have a vote on it!"'
+				'Once Anushka is gone, you all get back into the game. "I''m not too fond of that, I''d rather do something else," Julia counters. The arguing starts getting more intense as everyone tries to get their point across, the yelling getting louder and louder until Feofan gets fed up and slams the table. "Now that I have your attention! Since you can''t decide what you should do, I suggest you have a vote on it!"'
 				'There''s a lot of loud moans. "I don''t care how you feel about it! Vote!" Feofan commands.'
 				act 'Vote for the mansion adventure': gt 'nerd_game_night', 'mansion_adventure'
 				act 'Vote to kill the Necromancer': gt 'nerd_game_night', 'necromancer_adventure'
@@ -869,7 +869,7 @@ if $ARGS[0] = 'inform_them':
 			end
 		else
 			'You return to the group and tell them about the different adventures you''ve discovered from the patrons of the tavern. They all listen attentively to what you have to say. "Well, I feel like we should go and bash that Necromancer''s head in!" Artem suggests with a smile.'
-			'"I''m not too fond of that, I''d rather do something else," Julia counters. The arguing then starts getting more intense as everyone tries to get their point across. The yelling gets louder and louder until Feofan gets fed up and slams the table. "Now that I have your attention! Since you can''t decide what you should do, I suggest you have a vote on it!"'
+			'"I''m not too fond of that, I''d rather do something else," Julia counters. The arguing starts getting more intense as everyone tries to get their point across, the yelling getting louder and louder until Feofan gets fed up and slams the table. "Now that I have your attention! Since you can''t decide what you should do, I suggest you have a vote on it!"'
 			'There''s a lot of loud moans. "I don''t care how you feel about it! Vote!" Feofan commands.'
 			act 'Vote for the mansion adventure': gt 'nerd_game_night', 'mansion_adventure'
 			act 'Vote to kill the Necromancer': gt 'nerd_game_night', 'necromancer_adventure'
@@ -887,7 +887,7 @@ if $ARGS[0] = 'mansion_adventure':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
 	'Everyone takes turns voting while Feofan writes down the results. "Great! Now that the vote is decided, I suggest we call it for the day and pick up it next time."'
 	'"But we want to continue playing! We already know what adventure we''re going on!" Gerasim sighs.'
-	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 	if $loc = 'city_coffee_hole':
 		act 'Leave': gt 'city_coffee_hole', 'inner'
 	else
@@ -902,7 +902,7 @@ if $ARGS[0] = 'necromancer_adventure':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
 	'Everyone takes turns voting while Feofan writes down the results. "Great! Now that the vote is decided, I suggest we call it for the day and pick up it next time."'
 	'"But we want to continue playing! We already know what adventure we''re going on!" Gerasim sighs.'
-	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 	if $loc = 'city_coffee_hole':
 		act 'Leave': gt 'city_coffee_hole', 'inner'
 	else
@@ -910,14 +910,14 @@ if $ARGS[0] = 'necromancer_adventure':
 	end
 	act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 end
-		
+
 if $ARGS[0] = 'treasure_map__adventure':
 	*clr & cla
 	nerd_game['treasure_map_adventure'] = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
 	'Everyone takes turns voting while Feofan writes down the results. "Great! Now that the vote is decided, I suggest we call it for the day and pick up it next time."'
 	'"But we want to continue playing! We already know what adventure we''re going on!" Gerasim sighs.'
-	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 	if $loc = 'city_coffee_hole':
 		act 'Leave': gt 'city_coffee_hole', 'inner'
 	else
@@ -934,8 +934,8 @@ if $ARGS[0] = 'game_night5':
 	grupvalue[3] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-	'You quickly run up the stairs into the usual library room, not wanting to be late. Everyone else is already there, buzzing just like you. You''ve finally got an adventure to head out on and the tension from last week seems to have dissolved.'
-	'"Freaking finally, let''s head out of this god-forsaken village and on to a new adventure!" Zinaida exclaims.'
+	'As you arrive, you notice that the atmosphere is quite elated. The tension from last week seems to have dissolved and the group is ready for their next adventure.'
+	'"Freaking finally! Let''s head out of this god-forsaken village and on to a new adventure!" Zinaida exclaims.'
 	'"We just need to pack up and we''re good to go!" Gerasim replies.'
 	'The group quickly packs up everything from the rooms in the inn, pays for their stay and heads outside.'
 	act 'Leave the inn':
@@ -955,7 +955,7 @@ if $ARGS[0] = 'game_night5':
 				*nl
 				'Once Anushka is gone, you all get back into the game. You run into a few wandering encounters, but nothing too serious before your group stops to camp for the night. You expect to see Feofan pull out the map of your camp, but to everyone''s disappointment, he doesn''t. You look at each other in confusion, searching for some answers.'
 				'"That''s it for now," Feofan explains, but he''s quickly interrupted.'
-				'"What do you mean ''that''s it''? Where''s the next part? We voted for the adventure the last week!" Gerasim exclaims.'
+				'"What do you mean ''that''s it''? Where''s the next part? We voted for the adventure last week!" Gerasim exclaims.'
 				*nl
 				'Feofan chokes up a little. "I-I haven''t had time to finish the story. I didn''t know which one you would pick until last week and it takes me weeks to write the adventure and prepare the maps and stuff. It''ll take some time..."'
 				'The group immediately starts moaning and complaining about his lack of forward planning. "Great, just when it got good we need to stop... You are aware that we play this game mostly for the adventures, right?" Artem scoffs.'
@@ -966,7 +966,7 @@ if $ARGS[0] = 'game_night5':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
 					'You feel more disappointed than you expected, but now you wonder how long it will take him to set up the adventure and what you will do in the meantime. "What about next week? Are we not playing?" you ask, and the others nod in agreement.'
 					'Feofan holds up his hand. "I''ve got it covered! I recently acquired a few board games I think we''ll like. We can play those instead as I work on finishing the adventure."'
-					'There are a few grumbles, but the group seems curious. Zinaida even gets excited about one of the games he names, exclaiming it''s one she''s been wanting to try for a while. You all put your things away and spend the time chatting about the board games before moving onto the latest films, TV shows and books. Once time is up, everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+					'There are a few grumbles, but the group seems curious. Zinaida even gets excited about one of the games he names, exclaiming it''s one she''s been wanting to try for a while. You all put your things away and spend the time chatting about the board games before moving onto the latest films, TV shows and books. Once time is up, everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 					act 'Leave': gt 'city_coffee_hole', 'inner'
 					act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 				end
@@ -975,7 +975,7 @@ if $ARGS[0] = 'game_night5':
 			'As you''re heading out, you quickly throw one last gaze at the beautiful village map that Feofan painted. You gather just outside of town and everyone takes a second to double check the supplies to make sure you didn''t miss anything. Once everyone is sure, you head out in the direction of your next adventure. You run into a few wandering encounters, but nothing too serious before your group stops to camp for the night. You expect to see Feofan pull out the map of your camp, but to everyone''s disappointment, he doesn''t. You look at each other in confusion, searching for some answers.'
 			'"That''s it for now," Feofan explains, but he''s quickly interrupted.'
 			*nl
-			'"What do you mean ''that''s it''? Where''s the next part? We voted for the adventure the last week!" Gerasim exclaims.'
+			'"What do you mean ''that''s it''? Where''s the next part? We voted for the adventure ast week!" Gerasim exclaims.'
 			'Feofan chokes up a little. "I-I haven''t had time to finish the story. I didn''t know which one you would pick until last week and it takes me weeks to write the adventure and prepare the maps and stuff. It''ll take some time..."'
 			'The group immediately starts moaning and complaining about his lack of forward planning. "Great, just when it got good we need to stop... You are aware that we play this game mostly for the adventures, right?" Artem scoffs.'
 			'"I know," Feofan quickly replies. "That''s why I''m stopping it now. I need time to prepare as well as I did for the last adventure, so you''ll get the most out of it. You don''t want a half assed adventure, do you?"'
@@ -985,7 +985,7 @@ if $ARGS[0] = 'game_night5':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
 				'You feel more disappointed than you expected, but now you wonder how long it will take him to set up the adventure and what you will do in the meantime. "What about next week? Are we not playing?" you ask, and the others nod in agreement.'
 				'Feofan holds up his hand. "I''ve got it covered! I recently acquired a few board games I think we''ll like. We can play those instead as I work on finishing the adventure."'
-				'There are a few grumbles, but the group seems curious. Zinaida even gets excited about one of the games he names, exclaiming it''s one she''s been wanting to try for a while. You all put your things away and spend the time chatting about the board games before moving onto the latest films, TV shows and books. Once time is up, everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+				'There are a few grumbles, but the group seems curious. Zinaida even gets excited about one of the games he names, exclaiming it''s one she''s been wanting to try for a while. You all put your things away and spend the time chatting about the board games before moving onto the latest films, TV shows and books. Once time is up, everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 				act 'Leave':gt 'pav_commcenter', 'lobby'
 				act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 			end
@@ -1061,7 +1061,7 @@ if $ARGS[0] = 'board_games':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/board1.jpg"></center>'
 				'You continue playing with even more laughter and before you know it the game is over for the night. You all praise Feofan for picking a really good game.'
 				'Feofan responds as expected - haughty. "Ye, with little faith in me. Told you I would fix everything."'
-				'You all pile on him before clearing up. Once you pack everything up, you walk out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+				'You all pile on him before clearing up. Once you pack everything up, you head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 				act 'Leave':gt 'pav_commcenter', 'lobby'
 				act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 			end
@@ -1082,7 +1082,7 @@ if $ARGS[0] = 'summer_invite':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/activities/phone/text_indoor.jpg"></center>'
 
-	'You look at your phone and notice that Feofan has texted you. "Hey <<$pcs_nickname>>, we do a weekly game night. We mostly play Dungeons and Dragons and board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which night works best for you. We can do it either on <<$week[val(mid(temp,1,1))]>> or <<$week[val(mid(temp,2,1))]>>."'
+	'You look at your phone and notice that Feofan has texted you. "Hey <<$pcs_nickname>>, we do a weekly game night. We mostly play Dungeons and Dragons and board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which one works best for you. We can do it either on <<$week[val(mid(temp,1,1))]>> or <<$week[val(mid(temp,2,1))]>>."'
 	act 'Not interested <br><font color="red">This will block this story arc.</font>':
 		nerd_game['invite_day'] = 2147483647 & ! block the event
 		*clr & cla
@@ -1476,7 +1476,7 @@ if $ARGS[0] = 'summer_invite_sms':
 		nerd_game['invite_day'] = daystart
 	end
 
-	$VM['0'] = 'Hey <<$pcs_nickname>>, we do a weekly game night. We mostly play Dungeons and Dragons and board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which night works best for you. We can do it either on <<$week[val(mid(nerd_game[''lot''],1,1))]>> or <<$week[val(mid(nerd_game[''lot''],2,1))]>>.'
+	$VM['0'] = 'Hey <<$pcs_nickname>>, we do a weekly game night. We mostly play Dungeons and Dragons and board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which one works best for you. We can do it either on <<$week[val(mid(nerd_game[''lot''],1,1))]>> or <<$week[val(mid(nerd_game[''lot''],2,1))]>>.'
 
 		$VF['0a'] = 'Sorry, but I''m just not interested in stuff like that. Thanks for the invite though.'
 			$VM['1a'] = ':-( Oh... okay yeah I get it. Guess we''ll see you around.'
@@ -1625,7 +1625,7 @@ if $ARGS[0] = 'invite_uni':
 		nerd_game['invite_day'] = daystart
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
-		'As you leave your last class of the day, Feofan walks over to you and smiles. "Hey <<$pcs_nickname>>, we do a weekly game night where we mostly play Dungeons and Dragons, but we sometimes play some board games. I was talking to the others and we were wondering if you would like to join us? We have a couple nights free this week and were wondering which night works best for you. We can do it either on Tuesday or Thursday evening."'
+		'As you leave your last class of the day, Feofan walks over to you and smiles. "Hey <<$pcs_nickname>>, we do a weekly game night where we mostly play Dungeons and Dragons, but we sometimes play some board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which one works best for you. We can do it either on Tuesday or Thursday evening."'
 		act 'Not interested <br><font color="red">This will block this story arc.</font>':
 			nerd_game['invite_day'] = 2147483647 & ! block the event
 			*clr & cla
@@ -1633,7 +1633,7 @@ if $ARGS[0] = 'invite_uni':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'You shake your head. "Sorry, but I''m not interested in stuff like that. Thanks for the invite though."'
-			'He looks disappointed "Oh... Okay, yeah I get it. Well, I guess we''ll see you around..." he mumbles before walk away.'
+			'He looks disappointed "Oh... Okay, yeah I get it. Well, I guess we''ll see you around..." he mumbles before walking away.'
 			gs 'nerd_game_night', 'invite_uni', 'exit'
 		end
 		act 'I have to study':
@@ -1642,7 +1642,7 @@ if $ARGS[0] = 'invite_uni':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'You shake your head. "Sorry, but I can''t this week. These classes are killing me and I''m going to have to put in extra studying this week."'
-			'He looks disappointed "Oh... Okay, yeah I understand. If you ever get a handle on your class let me know.... anyways I''ll go let the others know and maybe you can come next week? Talk to you later." He walks away before you can reply.'
+			'He looks disappointed "Oh... Okay, yeah I understand. If you ever get a handle on your class let me know.... Anyway, I''ll go let the others know and maybe you can come next week? Talk to you later." He walks away before you can reply.'
 			gs 'nerd_game_night', 'invite_uni', 'exit'
 		end
 		act 'I''m busy':
@@ -1686,7 +1686,7 @@ if $ARGS[0] = 'crash_gamenight_uni':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
 	if grupTipe = 3:
 		if nerd_game['game_day'] = daystart and (hour*60+minut < 22*60+30):
-			'As you walk over to their table everyone freezes and looks your way. When they see you, they relax and go back to playing their game.'
+			'As you walk over to their table, everyone freezes and looks your way. When they see you, they relax and go back to playing their game.'
 			'As you''re about to ask what they''re doing, Feofan speaks up. "Hey <<$pcs_nickname>>! We''re almost done, but it''s not too late to join."'
 			'You smile and shake your head. "I just wanted to talk to one of you is all."'
 			'They all exchange looks and then look back at you as Feofan nods. "Okay. Can it wait until we finish at 11pm?"'
@@ -1703,7 +1703,7 @@ if $ARGS[0] = 'crash_gamenight_uni':
 		end
 	else
 		if nerd_game['game_day'] = daystart and (hour*60+minut < 22*60+30):
-			'As you walk over to their table everyone freezes and looks your way. You can feel the anxious looks from the group sitting around a table that has all sorts of geeky stuff spread across it.'
+			'As you walk over to their table, everyone freezes and looks your way. You can feel the anxious looks from the group sitting around a table that has all sorts of geeky stuff spread across it.'
 			'As you''re about to ask what they''re doing, Feofan speaks up. "Can we help you?"'
 			'You smile to reassure them that you''re not here to mess with them. "I just wanted to talk to one of you is all."'
 			'They all exchange looks and then look back at you, Feofan being the one to speak up again. "Can it wait until we finish at 11pm?"'
@@ -1711,7 +1711,7 @@ if $ARGS[0] = 'crash_gamenight_uni':
 			act 'Leave': gt 'city_coffee_hole', 'inner'
 			act 'Wait for game to end': minut = 23*60 - (hour*60+minut) & gt 'nerd_game_night', 'nerd_chat'
 		else
-			'Upon entering the room, everyone freezes and looks your way. You can feel the anxious looks from the group standing around a table packing up all their geeky stuff.'
+			'As you walk over to their table, everyone freezes and looks your way. You can feel the anxious looks from the group standing around a table packing up all their geeky stuff.'
 			'As you''re about to ask what they''re doing, Feofan speaks up. "Can we help you?"'
 			'You smile to reassure them that you''re not here to mess with them. "I just wanted to talk to one of you is all."'
 			'They all exchange looks and then look back at you, Feofan being the one to speak up again. "Oh. Okay...." You can tell they''re all wondering who it is you came to speak with.'

locations/npc_relationship.qsrc

@@ -97,7 +97,7 @@ if $ARGS[0] = 'modify':
 	!Checks that relatioship gain is not added to relationship locked npc''s
 	if $ARGS[1] = 'A1' and (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
 		npcRelSetVal = npc_rel[$ARGS[1]]
-	elseif $ARGS[1] = 'A18':
+	elseif $ARGS[1] = 'A18' and npc_rel['a18'] >= 20:
 		npcRelSetVal = 20
 	end
 

locations/salon.qsrc

@@ -5,13 +5,10 @@
 !! salon, cleanvar clears transitory variables.
 
 if $ARGS[0] = 'start':
-	$sexloc = $CURLOC
-	cla & *clr
-	$menu_loc = 'salon'
-	$menu_arg = 'start'
-	$loc = 'salon'
-	$loc_arg = 'start'
 	menu_off = 0
+	cla & *clr
+	gs 'shortgs', 'setloc', 'salon', $ARGS[0]
+	$sexloc = 'salon'	
 	salonrand = rand(0, 9)
 	$location_type = 'public_indoors'
 	gs 'family_schedule'
@@ -69,7 +66,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'receptionist':
-	$loc_arg = 'receptionist'
+	gs 'shortgs', 'setloc', 'salon', $ARGS[0]
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/xian.jpg"></center>'
 	
@@ -198,16 +195,16 @@ if $ARGS[0] = 'services':
 	end
 	
 	gs 'salon', 'discount', 1000
-	if (pcs_pubes > 9 or pcs_leghair > 9) and money >= salon_rate or karta + bankDebtLimit >= salon_rate:
+	if (pcs_pubes > 2 or pcs_leghair > 2) and money >= salon_rate or karta + bankDebtLimit >= salon_rate:
 		act 'Partial or full body hair removal up to <<salon_rate>> <b>₽</b>':
 			gs 'salon', 'discount', 1000
 			gt'salon','hair_removal'
 		end
-	elseif (pcs_pubes > 9 or pcs_leghair > 9)  and (money < salon_rate and karta + bankDebtLimit  < salon_rate):
+	elseif (pcs_pubes > 2 or pcs_leghair > 2)  and (money < salon_rate and karta + bankDebtLimit  < salon_rate):
 		act 'Body hair removal <font color="red"><<salon_rate>> <b>₽</b> </font>':
 			msg'You don''t have enough money for this!'
 		end
-	elseif pcs_pubes <= 9 and pcs_leghair <= 9:
+	elseif pcs_pubes <= 2 and pcs_leghair <= 2:
 		act 'Body hair removal <font color="red"><<salon_rate>> <b>₽</b> </font>':
 			msg'You don''t have enough body hair for this procedure!'
 		end

locations/stol.qsrc

@@ -179,24 +179,20 @@ if $ARGS[0] = 'stolPar':
 	if lernHome > 1 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
 		act 'Finish all of your homework (<<lernHome>>:00'+iif(pcs_traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
-			'It took you <<temp>> hours to complete your homework.'
 			minut += 60 * lernHome
 			pcs_mood += 5 * pcs_traits['nerd_status'] *lernHome
 			lern += 1 + lernHome/2
-			temp = lernHome
 			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
 			if komp = 1:
 				gs 'grades', 'homework', 'school', 'yes', lernHome, 0, 0
-				'It took you <<temp>> hours to complete your homework.'
+				'It took you <<lernHome>> hours to complete your homework.'
 			else
 				gs 'grades', 'homework', 'school', 'no', lernHome, 0, 0
-				'It took you <<temp>> hours to complete your homework. The part for computer class is not as good as it could be since you don''t have a computer. You could do your homework at the library at the community center in the future since there is a computer available to use there.'
+				'It took you <<lernHome>> hours to complete your homework. The part for computer class is not as good as it could be since you don''t have a computer. You could do your homework at the library at the community center in the future since there is a computer available to use there.'
 			end			
 			
-			killvar 'temp'
-			
 			act 'Continue':gt 'stol', 'stolPar'
 		end
 	elseif lernHome > 1 and will_cost > pcs_willpwr:

locations/uni_admin.qsrc

@@ -173,8 +173,8 @@ if $ARGS[0] = 'enrollment_semester':
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'general education 201', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'assessment 201', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'learning theories 201', 3, 2, 'no', 'no', 1, 12
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'general_education_201', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'])/6+10)
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'learning theories 201', (class['uni_teaching_studies_semester_1_teaching methods 101_grade']/3+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'general education 201', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'])/6+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'learning theories 201', (class['uni_teaching_studies_semester_1_learning theories 101_grade']/3+10)
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'assessment 201', 35
 				elseif university['enrolled_in_semester'] = 4:
 					!!This creates the classes for the fourth semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
@@ -182,7 +182,7 @@ if $ARGS[0] = 'enrollment_semester':
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_4', 'learning theories 202', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_4', 'psychology of a student 201', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'general education 202', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'] + class['uni_teaching_studies_semester_3_general education 201_grade'])/9+10)
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'learning theories 202', ((class['uni_teaching_studies_semester_1_teaching methods 101_grade'] + class['uni_teaching_studies_semester_3_teaching methods 201_grade'])/6+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'learning theories 202', ((class['uni_teaching_studies_semester_1_learning theories 101_grade'] + class['uni_teaching_studies_semester_3_learning theories 201_grade'])/6+10)
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'psychology of a student 201', (class['uni_teaching_studies_semester_2_psychology of a student 101_grade']/3+10)
 				end
 				cla

locations/uni_cafe.qsrc

@@ -10,18 +10,22 @@ if $ARGS[0] = '':
 	$location_type = 'public_indoors'
 	gs 'stat'
 	gs 'katja_meynold_schedule'
+	!!gs 'albina_uni_schedule'
 	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">University cafe</font></b></center>'
+	'<center><b><font color="maroon">University Cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_cafe.jpg"></center>'
 	*nl
-	'The University cafe, a well-known meeting point for the students attending the university. Students spend their days here, either preparing for their exams or just to unwind from their busy schedule.'
-	'The cafe offers a rich variation of reasonably priced food and beverages. There is also free wi-fi, even if it''s wonky at best, and you can often overhear students complain about it.'
+	'The university cafe is a popular spot for students preparing for their exams or just unwinding from their busy schedule.'
+	'It offers a rich variation of reasonably priced food and beverages. You can often overhear students complaining about the free, yet somewhat sub-par quality wi-fi.'
 	if locat['katja'] = 28:
-		'You see '+iif( katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a redheaded girl', '<a href="exec:gt ''katja_chat'', ''uni_cafe''">Katja</a>')+' sitting  at a table eating her lunch.'
+		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_chat'', ''uni_cafe''">Katja</a>')+' sitting at a table eating her lunch.'
 	end
 	
-	gs 'uni_cafe', 'menu'
+	!!if locat['albina'] = 13:
+		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''lunch_chat''">Albina</a>')+' sitting at one of the tables, eating her lunch while texting on her phone.'
+	!!end
 	
+	gs 'uni_cafe', 'menu'
 	
 	act 'Leave': gt 'uni_grounds', 'main'
 	if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
@@ -53,14 +57,21 @@ if $ARGS[0] = 'sitting_choice':
 		$loc_arg = ''
 		act 'Eat your lunch with Katja': gt 'katja_chat', 'uni_cafe'
 	end
+	
+	!!if locat['albina'] = 13 and npc_rel['A23'] >= 70 or AlbinaQW['know_albina_uni'] = 2:
+		!!$loc = 'uni_cafe'
+		!!$loc_arg = ''
+		!!act 'Eat your lunch with Albina': gt 'albina_uni', 'lunch_chat'
+	!!end
 
-	act 'Eat you lunch alone':
+	act 'Eat your lunch alone':
 		!!this is a variable to use in npc''s chats to see if you have lunch to eat together with them. Should be set to zero after it is checked in their chat.
 		*clr & cla
+		minut += 15
 		uni_lunch_bought = 0
-		'<center><b><font color="maroon">University cafe</font></b></center>'
+		'<center><b><font color="maroon">University Cafe</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_cafe.jpg"></center>'
-		'You sit down and eat your lunch alone and<<$mtxt>>'
+		'You sit down and eat your lunch alone and <<$mtxt>>'
 		gs 'stat'
 		
 		act 'Leave': gt 'uni_grounds', 'main'

locations/uni_dorm.qsrc

@@ -84,12 +84,25 @@ if $ARGS[0] = 'start':
 			act 'I''m here to visit Katja':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
-				'You walk over to the counter and pull out your ID. "I''m here to visit katja Meynold."' 
-				'The woman smiles. "You are one of Katja''s friends" she says "She is such a sweet girl." she then let''s you in and you thank her and head for the elevator.'
+				'You walk over to the counter and pull out your ID. "I''m here to visit Katja Meynold."' 
+				'The woman smiles. "You''re one of Katja''s friends?" she asks. "She''s such a sweet girl. She''s on the second floor."'
+				'She lets you in and you thank her before heading for the elevator.'
 
 				act 'Take the elevator':gt 'uni_dorm', 'elevator'
 			end
-		end	
+		end
+
+		!!if AlbinaQW['dorm_invite'] = 1 and yearstart > 1 and hour >= 8 and hour < 22:
+			!!act 'I''m here to visit Albina':
+				!!*clr & cla
+				!!'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
+				!!'You walk over to the counter and pull out your ID. "I''m here to visit Albina Barlovskaya."' 
+				!!'"Oh. Her," the woman says with a frown. "That girl needs discipline. Strolling in here like she owns the place after spending the night in a place like <i>that</i>. Her mother should be ashamed of herself for raising such a slut!"'
+				!!'She gives you a judgmental stare. "Your ''friend'' is on the seventh floor, room 707." She points you at the elevator before going back to what she was doing.'
+				!!'You''ve better things to do than stand around and argue with her, so you head for the elevator.'
+				!!act 'Take the elevator': gt 'uni_dorm', 'elevator'
+			!!end
+		!!end
 	end
 end
 
@@ -115,15 +128,16 @@ if $ARGS[0] = 'elevator':
 	end
 	act 'Go to the second floor': gt 'uni_dorm', 'second_floor'
 	act 'Go to the sixth floor': gt 'uni_dorm', 'sixth_floor'
+	!!act 'Go to the seventh floor': gt 'uni_dorm', 'seventh_floor'
 	act 'Go to the eighth floor': gt 'uni_dorm', 'eighth_floor'
 	act 'Go to the tenth floor': gt 'uni_dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'second_floor':
 	$loc = 'uni_dorm'
-	$loc_arg = 'sixth_floor'
+	$loc_arg = 'second_floor'
 	$menu_loc = 'uni_dorm'
-	$menu_arg = 'sixth_floor'
+	$menu_arg = 'second_floor'
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
@@ -137,17 +151,17 @@ if $ARGS[0] = 'second_floor':
 	act 'Elevator': gt 'uni_dorm', 'elevator'
 
 	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1:
-		act 'katja''s room':
+		act 'Katja''s room':
 			*clr & cla 
 			if locat['katja']  = 31:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'Katja opens the door. "Hi <<$pcs_nickname>>, come in?" she stands aside so you can walk in before closing the door behind you.'
+				'Katja opens the door. "Hey <<$pcs_nickname>>, come on in!" She stands aside to let you enter before closing the door behind you.'
 
 				act 'Enter': gt 'katja_dorm', 'start'
 			else
 				if locat['katja'] = 29 and sofiaQW['know'] = 1 and rand(0,3) = 0 and week < 5:
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big260.jpg"></center>'
-					'Sofia opens the door. "Hi <<$pcs_nickname>>, Katja is at the library right now and I have Maxim over so I don''t have time to talk. See you later." she says before closing the door again.'			
+					'Sofia opens the door. "Hey, <<$pcs_nickname>>! Katja is at the library right now and I have Maxim over so I don''t have time to talk. See you later!" she says before closing the door.'			
 				else
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 					'You knock on the door, but no one answers. She must be asleep or not home.'
@@ -182,7 +196,7 @@ if $ARGS[0] = 'sixth_floor':
 			*clr & cla 
 			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big83.jpg"></center>'
-				'Gosha opens the door. "Hey <<$pcs_nickname>>, why don''t you come in?" He stands aside so you can walk in before closing the door behind you.'
+				'Gosha opens the door. "Hey <<$pcs_nickname>>, why don''t you come in?" He stands aside tp let you enter before closing the door behind you.'
 
 				act 'Enter':gt 'gosha', 'gosha_room'
 			else
@@ -197,6 +211,63 @@ if $ARGS[0] = 'sixth_floor':
 	end
 end
 
+if $ARGS[0] = 'seventh_floor':
+	$loc = 'uni_dorm'
+	$loc_arg = 'seventh_floor'
+	$menu_loc = 'uni_dorm'
+	$menu_arg = 'seventh_floor'
+	menu_off = 0
+	$location_type = 'public_indoors'
+	killvar '$locclass'
+	minut += 1
+	gs 'albina_uni_schedule'
+	gs 'stat'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
+	'Before you is the usual dorm hallway with the dilapidated walls of the seventh floor. You can hear music and loud talking from drunk students escaping from some rooms.'
+
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+	
+	if AlbinaQW['dorm_invite'] = 1 and yearstart > 1:
+		act 'Albina''s room':
+			*clr & cla 
+			if locat['albina'] = 7 or locat['albina'] = 8 or locat['albina'] = 10:
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+				'You knock on the door, and after a few seconds, Albina opens it. "<<$pcs_nickname>>! Come in, come in." She stands aside to let you enter before closing the door behind you.'
+				act 'Enter': gt 'albina_dorm', 'start'
+			elseif locat['albina'] = 15:
+				if AlbinaQW['stripper'] = 1:
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+					'Just as you''re about to knock on the door, it flies open and Albina walks out with a large bag slung over her shoulder. She''s in such a hurry that she almost collides with you. "Oh. Sorry, <<$pcs_nickname>>. I didn''t see you there."'
+					'"Clearly," you reply as you look at her bag. "Off to work?" you whisper and she nods.'
+					'"Yes, and I''m going to be late if I don''t get a move on. Talk to you later, <<$pcs_nickname>>!" She hurries off without another word, leaving you alone in the hallway.'
+					act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+				else
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+					'Just as you''re about to knock on the door, it flies open and Albina walks out with a large bag slung over her shoulder. She''s in such a hurry that she almost collides with you. "Oh. Sorry, <<$pcs_nickname>>. I didn''t see you there."'
+					'"Clearly," you reply as you look at her bag. "Why are you in such a rush?" you ask, but she brushes you aside.'
+					'"I just have somewhere I need to be and need to go now before I''m late. I''ll talk to you some other time, <<$pcs_nickname>>." She hurries off without another word, leaving you alone and confused in the hallway.'
+					act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+				end
+			elseif locat['albina'] = 16:
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
+				'You knock on the door, but there''s no answer.'
+				if AlbinaQW['stripper'] = 1:
+					'You then remember what day it is and realise that she''s at work and won''t be back until the early hours of the morning, so you head back to the elevator.'
+					act 'Leave':gt 'uni_dorm', 'elevator'
+				else
+					'You have no idea where she would be at this time of night, so you head back to the elevator.'
+					act 'Leave':gt 'uni_dorm', 'elevator'
+				end
+			else
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
+				'You knock on the door, but there''s no answer. She''s either still asleep or isn''t home.'
+				act 'Leave':gt 'uni_dorm', 'elevator'
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'eighth_floor':
 	$loc = 'uni_dorm'
 	$loc_arg = 'eighth_floor'
@@ -218,7 +289,7 @@ if $ARGS[0] = 'eighth_floor':
 			*clr & cla
 			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You knock on the door. After a few seconds, Djibril opens the door. He smiles as he notices it''s you. "I was hoping you would stop by <<$pcs_nickname>>. Come on in."'
+				'You knock on the door, and after a few seconds, Djibril opens it. He smiles as he notices it''s you. "I was hoping you would stop by <<$pcs_nickname>>. Come on in."'
 
 				act 'Enter': gt 'djibril', 'djibril_room'
 			else
@@ -239,7 +310,7 @@ if $ARGS[0] = 'eighth_floor':
 				if kendra_busy ! daystart:
 					if rand(1,5) = 1:
 						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
-						'You can hear Kendra''s voice as you get close to the door. It is fairly loud and sounds harsh in tone, but you can''t quite make out what she is saying. You hear a muffled reply that sounds male. It sounds like she''s already busy. You could knock or just leave her to her company.'
+						'You can hear Kendra''s voice as you get close to the door. It''s fairly loud and sounds harsh in tone, but you can''t quite make out what she''s saying. You hear a muffled reply that sounds male. It sounds like she''s already busy. You could knock or just leave her to her company.'
 
 						act 'Leave':gt 'uni_dorm', 'eighth_floor'
 						act 'Knock':
@@ -247,18 +318,16 @@ if $ARGS[0] = 'eighth_floor':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
 							if npc_rel['A84'] < 40:
-								'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. A large black dildo is attached to it and she plays with it as she frowns at you. "I told you last time, I don''t have time for games and I''m tired of yours! Now get lost, I''m busy!" She then slams the door in your face.'
+								'You knock on the door, and after a few seconds, Kendra opens it. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she frowns at you. "I told you last time, I don''t have time for games and I''m tired of yours! Now get lost, I''m busy!" She then slams the door in your face.'
 
 								act 'Leave':gt 'uni_dorm', 'eighth_floor'
 							else
 								if kendra_male_slave = 0:
-									'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. A large black dildo is attached to it and she plays with it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m kind of busy punishing one of my other slaves right now."'
-									*nl
-									'She starts to close the door before you can reply, then stops and smiles at you. "You could come in and watch." She holds the door open and stands aside to let you enter. You glance in the room and see a naked college boy kneeling next to the couch. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she''s going to do to him, but is it something you want to watch? It could be interesting and you might learn something from her as well. On the other hand, do you want to humiliate him more than he already is?'
+									'You knock on the door, and after a few seconds, Kendra opens it. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she looks at you.  "Well if it isn''t my new favorite white slave bitch. I''m kind of busy punishing one of my other slaves right now."'
+									'She starts to close the door before you can reply, then stops and smiles at you. "You could come in and watch." She holds the door open and stands aside to let you enter. You glance into the room and see a naked college boy kneeling next to the couch. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she''s going to do to him, but is it something you want to watch? It could be interesting and you might learn something from her as well. On the other hand, do you want to humiliate him more than he already is?'
 								else
-									'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. A large black dildo is attached to it and she plays with it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m punishing one of the boys again. Want to come in and watch again?"'
-									*nl
-									'She holds the door open and stands aside to let you enter. You glance in the room and see the same college boy kneeling naked next to the couch, just like last time. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You know what she''s going to do to him after watching last time. Is it something you want to watch again? Is this something you might want to learn to do to others yourself? There are a few boys you know that it might be fun to do it with.'
+									'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m punishing one of the boys again. Want to come in and watch again?"'
+									'She holds the door open and stands aside to let you enter. You glance into the room and see the same college boy kneeling naked next to the couch, just like last time. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You know what she''s going to do to him after watching last time. Is it something you want to watch again? Is this something you might want to learn to do to others yourself? There are a few boys you know that it might be fun to do it with.'
 								end
 								gs 'arousal', 'erotic_nudity', 3
 								gs 'stat'
@@ -269,10 +338,10 @@ if $ARGS[0] = 'eighth_floor':
 									'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
 									if kendra_male_slave = 0:
 										'You shake your head. "No thanks. You look busy and I don''t want to disturb you..."'
-										'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you in time. Maybe next time then." She closes the door and you watch her stroking her strapon as she heads for the young man. Once the door is closed, you turn and leave.'
+										'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you in time. Maybe next time then." She closes the door and you turn to leave.'
 									else
 										'You shake your head. "No thanks. Last time was entertaining, but I didn''t come to see that again."'
-										'She laughs loudly and roughly grabs your chin in her hand. "Your loss. I might have let you take a turn with him, or maybe not." She closes the door and you watch her stroking her strapon as she heads for the young man. Once the door is closed, you turn and leave.'
+										'She laughs loudly and roughly grabs your chin in her hand. "Your loss. I might have let you take a turn with him, or maybe not." She closes the door and you turn to leave.'
 									end
 									gs 'arousal', 'end'
 									gs 'stat'
@@ -284,18 +353,18 @@ if $ARGS[0] = 'eighth_floor':
 					else
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 						if npc_rel['A84'] < 40:
-							'You knock on the door. After a few seconds, Kendra opens the door. "I told you last time, I don''t have time for games and I''m tired of yours. Now get lost." She slams the door in your face.'
+							'You knock on the door, and after a few seconds, Kendra opens it. "I told you last time, I don''t have time for games and I''m tired of yours. Now get lost." She slams the door in your face.'
 
 							act 'Leave':gt 'uni_dorm', 'eighth_floor'
 						else
-							'You knock on the door. After a few seconds, Kendra opens the door. "Well if it isn''t my new favorite white slave bitch. Come in." She stands aside to let you enter. She then closes the door behind you.'
+							'You knock on the door, and ater a few seconds, Kendra opens it. "Well if it isn''t my new favorite white slave bitch. Come in." She stands aside to let you enter before closing the door behind you.'
 
 							act 'Enter': gt 'kendra', 'kendra_room_start'
 						end
 					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
-					'You can hear Kendra''s voice as you get close to the door. It is fairly loud and sounds harsh in tone, but you can''t quite make out what she is saying. You do hear a muffled reply that sounds male. It sounds like she''s busy right now, so you shouldn''t bother her.'
+					'You can hear Kendra''s voice as you get close to the door. It''s fairly loud and sounds harsh in tone, but you can''t quite make out what she''s saying. You do hear a muffled reply that sounds male. It sounds like she''s busy right now, so you shouldn''t bother her.'
 
 					act 'Leave':gt 'uni_dorm', 'eighth_floor'
 				end
@@ -453,8 +522,7 @@ if $ARGS[0] = 'dorm_room':
 	end
 
 	if komp = 1:
-		!! It is possible to say that the University Wifi filters out porn and webcam sites, in which case will need to
-		!! allow the player to chose mobile net to watch porn or do webcam shows.
+		!! It is possible to say that the university Wifi filters out porn and webcam sites, in which case will need to allow the player to choose mobile net to watch porn or do webcam shows
 		gs 'internet_mobile', 'get_access', 'free'
 		!!TODO: This is for now until we decide how to handle these two with different scenarios
 		!! 1. Sveta knows Vika is a slut but still keeps the pristine facade

locations/uni_library.qsrc

@@ -11,6 +11,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	gs 'katja_meynold_schedule'
+	!!gs 'albina_uni_schedule'
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">The University Library</font></b></center>'
@@ -18,9 +19,13 @@ if $ARGS[0] = 'start':
 	'One of the medium sized buildings is the university''s library. It is three stories tall and filled with books, sections with tables scattered around to study or relax at and computer stations to help students with their studying.'
 	
 	if locat['katja'] = 29:
-		'At one of the disk you see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'A redheaded girl', '<a href="exec:gt ''katja_uni'', ''library''">Katja</a>')+' sitting with a laptop and a pile of books.'
+		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_uni'', ''library''">Katja</a>')+' sitting at one of the desks with a laptop and a pile of books.'
 	end
 	
+	!!if locat['albina'] = 6:
+		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''library''">Albina</a>')+' searching the shelves for books.'
+	!!end
+	
 	if mid($start_type,1,2) = 'sg' and yearstart > 1 and week > 5 and hour >= 12 and hour < 14:
 		if nataliaQW['library_day_check'] ! daystart:
 			nataliaQW['library_day_check'] = daystart
@@ -37,7 +42,7 @@ if $ARGS[0] = 'start':
 		end
 		act 'Wander around': gt 'uni_library', 'wander'
 	else
-		'The library is closing'
+		'The library is closing for the night.'
 	end
 	act 'Leave':
 		minut += 2

locations/unused/pornstudio.qsrc

@@ -267,9 +267,9 @@ if $ARGS[0] = 'delivery':
 			if saunasex = 1:
 				'You recall going to this sauna. You had some pretty energetic sex here.'
 			elseif sauna > 0:
-				'Oh, it''s the sauna near your home.'
+				'Oh, it''s the sauna in the city residential area.'
 			else
-				'This sauna is located near your home. You find it strange that you didn''t notice it before.'
+				'This sauna is located in the city residential area. You find it strange that you didn''t notice it before.'
 			end
 
 			'You go to the sauna, and are introduced to the local managers. It''s explained to you who you need to deliver to, and are reminded that it is necessary to return the envelope the same day you receive it.'