locations/uni_cafe.qsrc

@@ -20,23 +20,24 @@ if $ARGS[0] = '':
 	if locat['katja'] = 28:
 		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type['loc'] ! 'sg' and $start_type['magic'] = 'tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_chat'', ''uni_cafe''">Katja</a>')+' sitting at a table eating her lunch.'
 	end
-	
+
+	if ($start_type['loc'] = 'sg' or $start_type['magic'] ! 'tg' or artemQW['knows_dorm_room_number'] = 1) and $locat['A2'] = 'uni_cafe_lunch':
+		'You see a familiar face sitting at one of the tables having lunch, your former classmate <a href="exec:gt ''uni_cafe'',''artem''">Artem.</a>'
+	end	
+
 	!!if locat['albina'] = 13:
 		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type['loc'] ! 'sg' and $start_type['magic'] = '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
 	
-	if week < 5 and hour = 10 and minut >= 30:
-!!is this correct for the 30 min lunch break during school days?
+	if week < 5 and hour = 12 and minut >= 30:
 		temp_rand = rand(1,10)
-		if $start_type['loc'] = 'sg' and yearstart = 2:
+		if ($start_type['loc'] = 'sg' or $start_type['magic'] ! 'tg') and yearstart > 1:
 			if temp_rand = 1:
 				'You see a familiar face sitting at one of the tables having lunch, your former classmate <a href="exec:gt ''uni_cafe'',''lazar''">Lazar.</a>'
 			elseif temp_rand = 2:
 				'You see a familiar face sitting at one of the tables having lunch, your former classmate <a href="exec:gt ''uni_cafe'',''dimka''">Dimka.</a>'
 			elseif temp_rand = 3:
 				'You see a familiar face sitting at one of the tables having lunch, your former classmate <a href="exec:gt ''uni_cafe'',''marcus''">Marcus.</a>'
-			elseif temp_rand = 4:
-				'You see a familiar face sitting at one of the tables having lunch, your former classmate <a href="exec:gt ''uni_cafe'',''artem''">Artem.</a>'
 			end
 		end
 		if temp_rand = 5:

locations/uni_dorm.qsrc

@@ -164,7 +164,7 @@ if $ARGS[0] = 'second_floor':
 	minut += 1
 	$uni_dorm['floor'] = 'second_floor'
 	gs 'katja_meynold_schedule'
-	!!gs 'artem_chebotarev_schedule'
+	gs 'artem_chebotarev_schedule'
 	gs 'stat'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
@@ -250,15 +250,8 @@ if $ARGS[0] = 'second_floor':
 	if artemQW['knows_dorm_room_number'] > 0 and yearstart > 1:
 		act 'Artem''s room':
 			*clr & cla 
-			if locat['A2'] = 'dorm_room': 
-!!need code for when Artem is home
-!!list of places he is at times
-!!coffee hole week = 2 and nerd_game['fixed_uni_day'] = 0 and hour >= 18
-!!Mon-Fri during full class with electives class he is in class.
-!!2 hours after the end of class he is in the library
-!!1 hour after library study he is in the cafe having dinner.
-!!the rest of the time give him a 50/50 chance of being home so it shows he might go out with friends etc.
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+			if $locat['A2'] = 'dormroom_ studying_or _relaxing':
+!				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 				if artemQW['artlie'] = 2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
 					'You stand outside the dorm room, knocking on the door. The door is answered by Artem, who frowns as soon as he sees you. "I told you I never wanted to see you again! Please go away." He closes the door in your face without another word.'
 					act 'Leave': gt 'uni_dorm', 'second_floor'