[fixed] Less bugs again!

locations/artemEv.qsrc

@@ -93,15 +93,16 @@ if $ARGS[0] = 'learn':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 	'You spend an hour doing your homework together with Artem. He''s a very smart guy, and explains several things to you. At the end of the hour, you feel like you had a very productive homework session, and that you learned a lot from Artem''s tutoring.'
 	minut += 60
-	
+	lernHome = 0
+	lern += rand(3, 6)
 !!counts as doing 2 hours of homework alone
 	intel_exp += rand(1, 2)
 	gs 'stat'
-	act 'Take a break from studying':gt 'artemhome', 'artemroom'
-	act 'Talk instead': gt 'artemhome', 'chat'
+	!act 'Take a break from studying':gt 'artemhome', 'artemroom'
+	!act 'Talk instead': gt 'artemhome', 'chat'
 	if pav_slut > 100:
 !!this triggers instead of the two above if pav slut is high enough
-		*clr & cla
+		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 		'After you finish your homework, Artem has a serious look on his face when he says: "<<$pcs_nickname>>, everyone in the school is talking about how much of a slut you are. With how much I''ve been helping you... I think it''s only fair you give me a little something in return."'
 		'You frown at him. "What did you have in mind?"'
@@ -356,7 +357,7 @@ if $ARGS[0] = 'learn':
 			end
 		end
 	else
-		*clr & cla
+		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 		'After you finish doing your homework with Artem, you both put your books aside and relax for a few moments on his bed.'
 		act 'Talk for a bit': gt 'artemhome', 'chat'

locations/artemdate.qsrc

@@ -9,7 +9,6 @@ if $ARGS[0] = 'firstdate':
 	'After a while you end up near the movie theater. When Artem sees it, he suggests: "Hey, let''s go see a movie!"'
 	minut += 15
 	gs 'stat'
-	gs 'artemdate','artemGopSkver'
 	act 'A movie sounds like fun!':
 		*clr & cla
 		npc_rel['A2'] += 1
@@ -42,12 +41,11 @@ if $ARGS[0] = 'firstdate':
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
+		'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
 		if rand(1,5) = 1 and hour >= 20:
-			'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
 			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for awhile, you see a group of older gopniks hanging out around a bench just ahead. They are drinking and you can hear them from here, they are obviously already a bit drunk.'
 			act 'Just walk past them': gt 'artemdate','artemGopSkver'
 		else
-			'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
 			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for a while talking, he checks his watch and says, "We should be getting back, I will walk you to your door."'
 			'Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>."'
 			'You smile at him. "I had fun too Artem."'
@@ -64,7 +62,8 @@ if $ARGS[0] = 'artem_date':
 	*clr & cla
 	npc_rel['A2'] += 1
 	menu_off = 1
-!!this is what it will look like when batman finishes the dates, 3 special dates that each happen once and then three repeatable dates. For now can we just temporarily have it repeat the first date above so we can get the artem revamp in the dev builds to bug hunt and then we can add the others when he finishes them.
+	gt 'artemdate', 'firstdate'
+!{this is what it will look like when batman finishes the dates, 3 special dates that each happen once and then three repeatable dates. For now can we just temporarily have it repeat the first date above so we can get the artem revamp in the dev builds to bug hunt and then we can add the others when he finishes them.
 	if artem_date = 1:
 	
 	elseif artem_date = 2:
@@ -80,7 +79,9 @@ if $ARGS[0] = 'artem_date':
 		elseif repeat_date = 3:
 		
 		else
-	end
+		
+		end
+	end}
 end
 
 if $ARGS[0] = 'artemGopSkver':
@@ -105,7 +106,6 @@ if $ARGS[0] = 'artemGopSkver':
 			'"Bye Artem, I have a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
 			act 'Go home': gt 'pod_ezd', 'etaj_2'
 		end
-	end
 	else
 		'Just as you are about to make it past them several of the gopniks get in your way, they make somewhat of a circle around you and Artem. They don''t look familiar to you.'
 		'Somehow, one of them knows your name. They look at you with disdain and the leader of their group says: "<<$pcs_nickname>>? What are you doing with this bitch?"'

locations/artemhome.qsrc

@@ -828,7 +828,7 @@ if $ARGS[0] = 'livingroom':
 		end
 	else
 		'Nobody''s here right now.'
-		act 'Leave':gt 'artemhome','hallway'
+		!act 'Leave':gt 'artemhome','hallway'
 	end
 end
 
@@ -1250,7 +1250,7 @@ if $ARGS[0] = 'chat':
 			'After you gather your things you leave his apartment, ignoring his pleas.'
 			act 'Leave Artem''s apartment':minut += 5 & artemblok = 1 & gt 'pod_ezd','etaj_1'
 		end
-	elseif artdate = 0 and artfall = 10 and pav_slut < 75:
+	elseif artdate = 0 and artfall >= 10 and pav_slut < 75:
 		*clr & cla
 		gs 'stat'
 		'Artem smiles at you, and suggests: "<<$pcs_nickname>>, do you want to go for a walk in the park?"'