[added] direct to and from dorm room and floors, tried to standardize the time passing doing those, and a small amount of code cleanup for readability

locations/uni_dorm.qsrc

@@ -1,40 +1,48 @@
 # uni_dorm
-!!2021/08/13
+!!2022/10/05 - Alaratt
 
 if $ARGS[0] = 'start':
-	*clr & cla
-	minut += 5
 	$home_name = 'university_dorm'
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'start'
 	menu_off = 0
-	gs 'stat'
 	gs 'themes', 'indoors'
+	minut += 1
+	gs 'stat'
+	*clr & cla
 	'<center><b><font color="maroon">Dormitory</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 	'You walk up to the dorm building and go inside. It is pretty clean and in good shape. An older woman, with a very unpleasant and judgmental look on her face sits in a room just off the main hallway. It has a partially glass wall and a window, splitting it from the main room. She looks up at you as you enter, her look telling you she is already judging you as her face frowns into a look of disapproval.'
+
+	act 'Go outside':
+		minut += 1
+		killvar 'university_dorm'
+		gt 'uni_grounds', 'main'
+	end
+
 	if owned_property['university_dorm'] = 1 or university['student'] = 1:
-	univ
 		act 'Show her your student ID':
 			*clr & cla
-			minut += 1
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 			'As you walk by, you take out your student ID and show it to her. She looks for just a second and nods before going back to what she was doing. You head for the elevators.'
+
 			act 'Take the elevator':gt 'uni_dorm', 'elevator'
 		end
 	else
 		menu_off = 1
 		'Since you''re not attending the university and don''t have an ID, you won''t be allowed in the dorms unless you''re on the guest list of a student.'
-		act 'Leave': minut += 5 & gt 'city_island'
+
 		if DjibrilQW['invite'] = 1 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Djibril':
 				*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 Djibril."' 
 				'The woman gives you a look of complete disgust. "What, your own kind not good enough for you? Go ahead and take care of those black cocks. He''s on the eighth floor, room 810." She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
+
 				act 'Take the elevator':gt 'uni_dorm', 'elevator'
 			end
 		end
+
 		if gosh > 0 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Gosha':
 				*clr & cla
@@ -43,9 +51,11 @@ if $ARGS[0] = 'start':
 				'The woman shakes her head in disapproval. "You''re Gosha''s new whore? I''ll never understand what you sluts see in that scrawny bastard. He''s been through half of the dorm already! He''s on the sixth floor, room 602." She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
 				reccoldorm = 1
 				goshiflag = 1
+
 				act 'Take the elevator':gt 'uni_dorm', 'elevator'
 			end
 		end
+
 		if meet_kendra = 1 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Kendra':
 				*clr & cla
@@ -53,44 +63,47 @@ if $ARGS[0] = 'start':
 				if npc_rel['A84'] < 40:
 					'You walk over to the counter and pull out your ID. "I''m here to visit Kendra."' 
 					'The woman gives you a look of complete disgust. "It seems like she''s gotten tired of you since you''re no longer on the guest list. Now get out of here before I call security." Surprised, you turn and quickly leave before the woman calls security.'
-					act 'Leave': 
-						minut += 5 
+
+					act 'Go outside':
 						killvar 'university_dorm'
-						gt 'city_island'
+						minut += 1
+						gt 'uni_grounds', 'main'
 					end
 				else
 					'You walk over to the counter and pull out your ID. "I''m here to visit Kendra."' 
 					'The woman gives you a look of complete disgust. "What, a man not good enough for you? Go ahead and serve that black whore. She''s on the eighth floor, room 801." She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
+
 					act 'Take the elevator':gt 'uni_dorm', 'elevator'
 				end
 			end
 		end
 	end
-	act 'Leave':
-		killvar 'university_dorm'
-		gt 'city_island'
-	end
 end
 
 if $ARGS[0] = 'elevator':
-	*clr & cla
-	minut += 5
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'elevator'
 	menu_off = 0
-	gs 'stat'
 	gs 'themes', 'indoors'
+	minut += 5
+	gs 'stat'
+	*clr & cla
 	'<center><b><font color="maroon">Dormitory</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/elevator.jpg"></center>'
 	'You enter the dorm elevator. It seems to be in decent shape and fairly well maintained. The panel of floor numbers awaits your input.'
 	if func('uniutil', 'student', 'enrolled'):
 		'Your dorm room is on the tenth floor.'
 	end
+
+	act 'Go to the first floor and leave the dorm':
+		killvar 'university_dorm'
+		minut += 1
+		gt 'uni_grounds', 'main'
+	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 eighth floor': gt 'uni_dorm', 'eighth_floor'
 	act 'Go to the tenth floor': gt 'uni_dorm', 'tenth_floor'
-	act 'Go to the first floor and leave the dorm': gt 'uni_grounds', 'main'
 end
 
 if $ARGS[0] = 'second_floor':
@@ -101,18 +114,27 @@ if $ARGS[0] = 'second_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	*clr & cla
+	minut += 1
 	gs 'katja_meynold_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 second floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 
+	act 'Go outside':
+		killvar 'university_dorm'
+		minut += 6
+		gt 'uni_grounds', 'main'
+	end
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+
 	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1:
 		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.'
+
 				act 'Enter': gt 'katja_dorm', 'start'
 			else
 				if locat['katja'] = 29 and sofiaQW['know'] = 1 and rand(0,3) = 0 and week < 5:
@@ -124,12 +146,11 @@ if $ARGS[0] = 'second_floor':
 				end
 				minut += 5
 				gs 'stat'
-				act 'Leave': gt 'uni_dorm', 'elevator'
+
+				act 'Leave': gt 'uni_dorm', 'second_floor'
 			end
 		end
 	end
-
-	act 'Leave':gt 'uni_dorm', 'elevator'
 end
 
 if $ARGS[0] = 'sixth_floor':
@@ -140,29 +161,37 @@ if $ARGS[0] = 'sixth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	*clr & cla
+	minut += 1
 	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 sixth floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 
+	act 'Go outside':
+		killvar 'university_dorm'
+		minut += 6
+		gt 'uni_grounds', 'main'
+	end
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+
 	if gosh > 0:
 		act 'Gosha''s room':
 			*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.'
+
 				act 'Enter':gt 'gosha', 'gosha_room'
 			else
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 				'You knock on the door, but no one answers. He must be asleep or not home.'
+
 				act 'Leave':gt 'uni_dorm', 'elevator'
 			end
 		end
 	end
-
-	act 'Leave':gt 'uni_dorm', 'elevator'
 end
 
 if $ARGS[0] = 'eighth_floor':
@@ -173,23 +202,34 @@ if $ARGS[0] = 'eighth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	*clr & cla
+	minut += 1
 	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 eighth floor. You can hear music and loud talking from drunk students escaping from some rooms.'
+
+	act 'Go outside':
+		killvar 'university_dorm'
+		minut += 6
+		gt 'uni_grounds', 'main'
+	end
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+
 	if DjibrilQW['invite'] = 1:
 		act 'Djibril'' room':
 			*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."'
+
 				act 'Enter': gt 'djibril', 'djibril_room'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 				minut += 5
 				gs 'stat'
 				'You knock on the door, but no one answers. He must be asleep or not home.'
-				act 'Leave':gt 'uni_dorm', 'elevator'
+
+				act 'Leave':gt 'uni_dorm', 'eighth_floor'
 			end
 		end
 	end
@@ -202,13 +242,16 @@ if $ARGS[0] = 'eighth_floor':
 					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.'
+
+						act 'Leave':gt 'uni_dorm', 'eighth_floor'
 						act 'Knock':
 							kendra_busy = daystart
 							*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.'
-								act 'Leave':gt 'uni_dorm', 'elevator'
+
+								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."'
@@ -221,10 +264,10 @@ if $ARGS[0] = 'eighth_floor':
 								end
 								gs 'arousal', 'erotic_nudity', 3
 								gs 'stat'
+
 								act 'Enter': gt 'kendra', 'kendra_male_slave'
 								act 'Decline':
 									*clr & cla
-									gs 'stat'
 									'<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..."'
@@ -235,37 +278,39 @@ if $ARGS[0] = 'eighth_floor':
 									end
 									gs 'arousal', 'end'
 									gs 'stat'
-									act 'Leave':gt 'uni_dorm', 'elevator'
+
+									act 'Leave':gt 'uni_dorm', 'eighth_floor'
 								end
 							end
 						end
-						act 'Leave':gt 'uni_dorm', 'elevator'
 					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.'
-							act 'Leave':gt 'uni_dorm', 'elevator'
+
+							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.'
+
 							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.'
-					act 'Leave':gt 'uni_dorm', 'elevator'
+
+					act 'Leave':gt 'uni_dorm', 'eighth_floor'
 				end
 			else
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
 				'You knock on the door, but no one answers. She must be asleep or not home.'
-				act 'Leave':gt 'uni_dorm', 'elevator'
+
+				act 'Leave':gt 'uni_dorm', 'eighth_floor'
 			end
 		end
 	end
-
-	act 'Leave':gt 'uni_dorm', 'elevator'
 end
 
 if $ARGS[0] = 'tenth_floor':
@@ -278,40 +323,47 @@ if $ARGS[0] = 'tenth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	*clr & cla
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 	if func('uniutil', 'student', 'enrolled'):
 		'Before you is the dorm hallway with it''s dilapidated walls leading to your dorm room. You can hear music and loud talking from drunk students escaping from some rooms.'
 	else
 		'Before you is the usual dorm hallway with dilapidated walls. You can hear music and loud talking from drunk students escaping from some rooms.'
 	end
+
+	act 'Go outside':
+		killvar 'university_dorm'
+		minut += 6
+		gt 'uni_grounds', 'main'
+	end
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+
+	if owned_property['university_dorm'] = 4:
+		if courtletter_date <= daystart and courtletter_date ! 0:
+			gt 'sentence', 'letter'
+		end
+		act 'Your room': gt 'uni_dorm', 'dorm_room'
+		act 'Go to the shared kitchen': gt 'uni_dorm', 'dorm_kitchen'
+		act 'Go to the shared shower': gt 'vann', 'start'
+	end
+
+	act 'Enter the women''s restroom': minut += 1 & gt 'uni_dorm', 'womens_restroom'
+
 	gs 'willpower', 'exhib', 'self'
 	if will_cost <= pcs_willpwr:
 		act 'Enter the men''s restroom (<<will_cost>> Willpower)':
 			gs 'willpower', 'exhib', 'self'
 			gs 'willpower', 'pay', 'self'
-			minut =+ 1
 			gs 'stat'
 			gt 'uni_dorm', 'mens_restroom'
 		end
 	else
 		act 'Enter the men''s restroom (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Enter the women''s restroom': minut += 1 & gt 'uni_dorm', 'womens_restroom'
-	act 'Leave':gt 'uni_dorm', 'elevator'
-	act 'Go to the shared shower':
-		minut += 1
-		gt 'vann', 'start'
-	end
 
-	if owned_property['university_dorm'] = 4:
-		if courtletter_date <= daystart and courtletter_date ! 0:
-			gt 'sentence', 'letter'
-		end
-		act 'Your room': minut += 1 & gt 'uni_dorm', 'dorm_room'
-		act 'Go to the shared kitchen': minut += 1 & gt 'uni_dorm', 'dorm_kitchen'
-	end
+!!	commented out until parties are added back in
 !!	if (home_owned[11] = 1 or university['student'] = 1) and week = 5 and hour > 18 and hour < 23:
 !!		'You can hear music blasting in the corridor. It sounds like the Friday night party is in full swing.'
 !!		act 'The party': minut += 1 & gt 'vecher', 'start'
@@ -320,18 +372,20 @@ end
 
 if $ARGS[0] = 'mens_restroom':
 	$location_type = 'public_indoors'
-	*clr & cla
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'mens_restroom'
 	$locM = 'uni_dorm'
 	$locM_arg = 'mens_restroom'
 	menu_off = 0
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Men''s Restroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_mens.jpg"></center>'
 	'You peek around the corner. Inside this room, stalls line the right side, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant and stale piss.'
-	act 'Leave': minut += 1 & gt 'uni_dorm', 'tenth_floor'
-	
+
+	act 'Leave': gt 'uni_dorm', 'tenth_floor'
+
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
@@ -339,24 +393,25 @@ end
 
 if $ARGS[0] = 'womens_restroom':
 	$location_type = 'public_indoors'
-	*clr & cla
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'womens_restroom'
 	$locM = 'uni_dorm'
 	$locM_arg = 'womens_restroom'
 	menu_off = 0
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Women''s Restroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_womens.jpg"></center>'
 	'You peek around the corner. Inside this room, stalls line the right side and rows of sinks, with <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant.'
-	act 'Leave': minut += 1 & gt 'uni_dorm', 'tenth_floor'
-	
+
+	act 'Leave': gt 'uni_dorm', 'tenth_floor'
+
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
 end
 
-
 if $ARGS[0] = 'dorm_room':
 	$sexloc = 'uni_dorm'
 	CLOSE ALL
@@ -368,10 +423,11 @@ if $ARGS[0] = 'dorm_room':
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_room'
 	menu_off = 0
-	cla
-	*clr
 	odkomp = 1
+	gs 'themes', 'indoors'
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_room/room.jpg"></center>'
 	'This is the dorm room you share with Vika.'
@@ -394,7 +450,6 @@ if $ARGS[0] = 'dorm_room':
 		elseif vikaslut = 1:
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
 		end
-		
 	end
 
 	if komp = 1:
@@ -413,7 +468,7 @@ if $ARGS[0] = 'dorm_room':
 		end
 		'Your <a href="exec:gt ''Komp'',''start''">laptop</a> sits on your desk.'
 	end
-	
+
 	'To the left of the entrance is an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
 
@@ -436,20 +491,20 @@ if $ARGS[0] = 'dorm_room':
 	act 'Walk out to the corridor':
 		if $clothingworntype ! 'nude':
 			odkomp = 0
-			minut += 1
 			gt 'uni_dorm', 'tenth_floor'
 		else
-			'You need to get dressed first!'
+			msg'<b><font color = red>You need to get dressed first.</font></b>'
+			gt 'uni_dorm', 'dorm_room'
 		end
 	end
-	
+
 	act 'Relax on your bed': gt 'bed', 'start'
 
 	dynamic $wearpan
 	dynamic $removepan
 
 	if $home['current'] = $home_name and prostitute['active']: gs 'prostitution_functions', 'prostitute_outfit_at_home'
-	
+
 	if $home['current'] ! $home_name:
 		act 'Set this dorm room as your main home':gs 'homes_properties', 'set_home', $home_name & gt 'uni_dorm', 'dorm_room'
 	end
@@ -463,12 +518,15 @@ if $args[0] = 'dorm_kitchen':
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_kitchen'
 	menu_off = 0
+	minut += 1
 	gs 'kit_din'
 	gs 'stat'
+	*clr & cla
 	'<center><b>Dorm Kitchen</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_kitchen.jpg"></center>'
 	'The large shared kitchen for this floor. It is fairly tidy, with a lot of cabinets along two of the walls. Two ovens and two refrigerators, as well as several tables with chairs around them, are scattered around the room.'
-	act 'Return to the corridor': minut += 1 & gt 'uni_dorm', 'tenth_floor'
+
+	act 'Return to the corridor': gt 'uni_dorm', 'tenth_floor'
 
 	if eda > 0:
 		if edahot = 0:

locations/uni_grounds.qsrc

@@ -1,4 +1,5 @@
 # uni_grounds
+!!2022/10/05 - Alaratt
 
 if $ARGS[0] = 'main':
 	music_loop = 0
@@ -93,10 +94,12 @@ if $ARGS[0] = 'main':
 	if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 	if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 
-	act 'Go to the dorms':
-		minut += 5
-		gt 'uni_dorm', 'start'
+	if owned_property['university_dorm'] = 1 or university['student'] = 1:
+		act 'Go to your room': minut += 7 & gt 'uni_dorm', 'dorm_room'
 	end
+
+	act 'Go to the dorms': minut += 3 & gt 'uni_dorm', 'start'
+
 	!!act 'Got to the gym':
 	!!	minut += 3
 	!!	gt '', ''