Merge remote-tracking branch 'julzor/master'

locations/experiment.qsrc

@@ -42,7 +42,8 @@ if $ARGS[0] = 'start':
 	else
 		'Hello miss <<$pcs_lastname>>, how is your pregnancy?'
 		if kid = 0 and pregchem > 0:act 'It is going well':gt 'experiment', 'deskTalk'
-		if kid > 0:act 'I already gave birth':gt 'experiment', 'deskTalk'
+		if kid > 0 and knowpreg = 1:act 'I already gave birth, but I''m also pregnant again':gt 'experiment', 'deskTalk'
+		if kid > 0 and knowpreg = 0:act 'I already gave birth':gt 'experiment', 'deskTalk'
 		if kid = 0 and pregchem = 0:act 'I had an abortion':gt 'experiment', 'deskTalk'
 	end
 
@@ -57,7 +58,7 @@ if $ARGS[0] = 'deskTalk':
 	if kid = 0 and pregchem > 0:
 		'"That is good to hear. Can I help you somehow?"'
 		act 'No':gt 'poli', 'start'
-	elseif kid > 0 and pregchem = 0:
+	elseif kid > 0 and (pregchem = 0 or (pregchem > 0 and knowpreg = 0)):
 		'"Wonderful! Anyway, can I help you somehow? Are you maybe interested in rejoining the experiment?" she curiously asks.'
 		'"That''s still a possibility?" you surprisingly ask.'
 		'"Of course it is miss <<$pcs_lastname>>. We don''t discriminate if you''ve had a child or not, on the contrary." she re-assures you.'
@@ -66,6 +67,10 @@ if $ARGS[0] = 'deskTalk':
 		act 'No way I''m going through that again!':gt 'experiment', 'deskTalk:refuse'
 		act 'Yes, I need the money..':gt 'experiment', 'deskTalk:volunteer'
 		act 'Leave':gt 'poli', 'start'
+	elseif kid > 0 and knowpreg = 1:
+		'"I already gave birth, but I''m also pregnant again." you say.'
+		'"That''s wonderful! We need to wait until you have given birth again if you want to rejoin the experiment." she says with a smile.'
+		act 'Leave':gt 'poli', 'start'
 	elseif kid = 0 and pregchem = 0:
 		'"Oh, that is unfortunate, but not unexpected. Why are you here again, tell me? Do you want to rejoin the experiment again? Have you changed your mind, or do you need the money? Our doctors would definitely welcome to test on a subject that underwent a pregnancy termination..." she asks.'
 		act 'No way I''m going through that again!':gt 'experiment', 'deskTalk:refuse'

locations/stat_display.qsrc

@@ -1253,7 +1253,7 @@ if StoryLine = 1:
 	if sisboyday + 1 = daystart and hour < 19 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or (npc_QW['A33'] = 9 and sisboytrioQW ! 1)):$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister not to go into your room at 18:00.'
 	if sisboyday + 1 = daystart and hour < 19 and sisboytrioQW = 1:$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister to meet her in your room at 18:00.'
 
-	if week = 6 and hour < 9 and detention_set = 1:$stat_msg += '<BR><b>You have a detention this morning and must be at school between 8 and 9.</b>'
+	if week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:$stat_msg += '<BR><b>You have a detention this morning and must be at school between 8 and 9.</b>'
 	if gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight</b>'
 	if nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight</b>'
 	if InvitationToDimkaNYparty = 1 and month = 12 and day = 31: $stat_msg += '<BR><b>Go to the residential area between 15:00 and 18:00 to go to Dimka''s New Year party.</b>'