Merge branch 'master' of B0tman/glife into master

[fixed] Enabled and fixed the morning vomit scene, only in parents's apartment

locations/home_activity.qsrc

@@ -6,13 +6,13 @@
 
 if $ARGS[0] = 'vomiting_check':
 	!! if not one of these locations, event will not fire
-	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $home['current'] = 5 or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
+	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $loc = 'bedrPar' or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
 		gs 'home_activity', 'vomiting_images'
 		gt 'home_activity', 'morning_vomit'
-!!	else
-!!		vomit['morning_sick'] = 0
-!!		vomit['hangover'] = 0
-!!		vomit['unlucky'] = 0
+    else
+		vomit['morning_sick'] = 0
+		vomit['hangover'] = 0
+		vomit['unlucky'] = 0
 	end
 end
 
@@ -115,7 +115,7 @@ if $ARGS[0] = 'vomiting_images':
 end
 
 if $ARGS[0] = 'morning_vomit':
-	cla & *clr
+    cla & *clr
 	$home_activity['vomit_bedroom']
 	'Before you even open your eyes, your stomach churns. Nausea courses through you, acid burns at the back of your throat, and you know without a doubt:'
 	*nl
@@ -163,7 +163,7 @@ if $ARGS[0] = 'morning_vomit':
 				if $loc = 'mey_home':
 					act'Continue':gt 'mey_home', 'mey_morning_vomit'
 				else
-					act'Continue':gt'home_activity','vomiting_exit'
+					act'Continue':gt'sleep','end'
 				end
 			end
 		end
@@ -231,7 +231,7 @@ if $ARGS[0] = 'think_preg_react':
 		'You don''t like the frequency with which this is happening. More and more, the evidence is pointing towards you being pregnant.'
 		*nl
 		'<i>What am I going to do?</i> you think to yourself.'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'I better not be pregnant':
@@ -240,7 +240,7 @@ if $ARGS[0] = 'think_preg_react':
 		'Disgust and irritation fill you as you reach out to flush the toilet.'
 		*nl
 		'<i>Oh God,</i> you groan internally. <i>I swear, this better be a stomach bug and not pregnancy. I am not ready for motherhood.</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'I can''t wait for this baby':
@@ -249,7 +249,7 @@ if $ARGS[0] = 'think_preg_react':
 		'Even through the pain and the horrid taste on your lips, you can''t help but smile.'
 		*nl
 		'<i>I''m so ready for this baby!</i> you think excitedly.'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'Baby good, morning sickness bad':
@@ -258,7 +258,7 @@ if $ARGS[0] = 'think_preg_react':
 		'You clutch your head, wincing at the sharp pain that lances through it.'
 		*nl
 		'<i>This baby can not come sooner,</i> you think to yourself. <i>Really looking forward to watching it grow, but <b>really</b> hate this pregnancy stuff.</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 end
 
@@ -267,14 +267,14 @@ if $ARGS[0] = 'preg_scare_react':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>I need to take a pregnancy test right now!</i> you think urgently. <i>I need to figure out what is going on!</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'This is really bad':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>This is really really bad!</i> you think, the blood draining from your face. <i>I don''t want to be a mom! Not now!</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'This is wonderful!':
@@ -285,7 +285,7 @@ if $ARGS[0] = 'preg_scare_react':
 		else
 			'<i>I''m going to have another baby!</i> you think, smiling to yourself. <i>This is wonderful!</i>'
 		end
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	if stat['think_virgin'] = 1:
@@ -293,22 +293,23 @@ if $ARGS[0] = 'preg_scare_react':
 			cla & *clr
 			$home_activity['vomit_bathroom']
 			'<i>This doesn''t make any sense,</i> you think to yourself, putting your hand on your head, feeling woozy again.'
-			act'Continue':gt'home_activity','vomiting_exit'
+			act'Continue':gt'sleep', 'end'
 		end
 	end
 end
 
 
 if $ARGS[0] = 'vomiting_exit':
-	vomit['morning_sick'] = 0
+    vomit['morning_sick'] = 0
 	vomit['hangover'] = 0
 	vomit['unlucky'] = 0
-	if at_home = 1:
+
+    if at_home = 1:
 		!! location = 'City residential apartment'
 		gt 'vanr'
-	elseif at_home = 2:
+	elseif $loc = 'bedrPar':
 		!! location = 'Parent''s home in Pavlovsk'
-		gt 'vanrPar'
+        gt 'vanrPar'
 	elseif at_home = 3:
 		!! location = 'My cottage in the cooperative farm'
 		gt 'dachain', 'dachabath'
@@ -343,4 +344,4 @@ if $ARGS[0] = 'vomiting_exit':
 end
 
 !! --------------- end vomiting ----------------------------
---- home_activity ---------------------------------
+--- home_activity ---------------------------------

locations/sleep.qsrc

@@ -524,6 +524,9 @@ if $ARGS[0] = 'wake':
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'
+    if vomit['hangover'] = 1  or vomit['unlucky'] = 1 or vomit['morning_sick'] = 1:
+        gt 'home_activity', 'vomiting_check'
+    end
 	if MarishaQW["marisha_sleepover"] = 1: gs 'marisha_ev', 'morning'
 	if daystart < 10 and $start_type[1] = 'tg':'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
 	if daystart >= 10 and daystart < 30 and $start_type[1] = 'tg':'Looking at your female body, you are still a little surprised it''s actually you.'
@@ -616,10 +619,12 @@ if $ARGS[0] = 'end':
 	slept_in = 0
 	strip_here = 0
 	SleepHorny = 0
-	if fullmorrout = 1 and $loc = 'bedrPar':
+    if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':
 		gt 'vanr'
+    elseif vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:
+        gt 'home_activity', 'vomiting_exit'
 	else
 		gt $loc, $loc_arg
 	end

locations/stat.qsrc

@@ -490,13 +490,20 @@ if minut >= 60:
 	end
 	
 	!! code to trigger vomitting based on morning sickness, hangovers, or just plain bad luck
-	if sleep = 1:
-		if alko > 4:
-			vomit['hangover'] = 1
-		elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
-			vomit['morning_sick'] = 1
-		elseif rand(1,100) = 100: 
-			vomit['unlucky'] = 1
+    if Insleep = 0:   
+            vomit['daily_check'] = 0
+    end
+
+	if Insleep = 1:
+        if vomit['daily_check'] = 0:
+            vomit['daily_check'] = 1
+	        if alko > 4:
+		    	vomit['hangover'] = 1
+		     elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
+		    	 vomit['morning_sick'] = 1
+		     elseif rand(1,100) = 100: 
+		    	vomit['unlucky'] = 1
+            end
 		end
 	end