Browse Source

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

rustcompiler 1 year ago
parent
commit
7f8f0e344d
3 changed files with 34 additions and 18 deletions
  1. 17 11
      locations/home_activity.qsrc
  2. 3 0
      locations/sleep.qsrc
  3. 14 7
      locations/stat.qsrc

+ 17 - 11
locations/home_activity.qsrc

@@ -6,13 +6,13 @@
 
 
 if $ARGS[0] = 'vomiting_check':
 if $ARGS[0] = 'vomiting_check':
 	!! if not one of these locations, event will not fire
 	!! 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'
 		gs 'home_activity', 'vomiting_images'
 		gt 'home_activity', 'morning_vomit'
 		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
 end
 end
 
 
@@ -115,7 +115,7 @@ if $ARGS[0] = 'vomiting_images':
 end
 end
 
 
 if $ARGS[0] = 'morning_vomit':
 if $ARGS[0] = 'morning_vomit':
-	cla & *clr
+    cla & *clr
 	$home_activity['vomit_bedroom']
 	$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:'
 	'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
 	*nl
@@ -300,15 +300,21 @@ end
 
 
 
 
 if $ARGS[0] = 'vomiting_exit':
 if $ARGS[0] = 'vomiting_exit':
-	vomit['morning_sick'] = 0
+    vomit['morning_sick'] = 0
 	vomit['hangover'] = 0
 	vomit['hangover'] = 0
 	vomit['unlucky'] = 0
 	vomit['unlucky'] = 0
-	if at_home = 1:
+	menu_off = 1
+    InSleep = 0
+	slept_in = 0
+	strip_here = 0
+	SleepHorny = 0
+
+    if at_home = 1:
 		!! location = 'City residential apartment'
 		!! location = 'City residential apartment'
 		gt 'vanr'
 		gt 'vanr'
-	elseif at_home = 2:
+	elseif $loc = 'bedrPar':
 		!! location = 'Parent''s home in Pavlovsk'
 		!! location = 'Parent''s home in Pavlovsk'
-		gt 'vanrPar'
+        gt 'vanrPar'
 	elseif at_home = 3:
 	elseif at_home = 3:
 		!! location = 'My cottage in the cooperative farm'
 		!! location = 'My cottage in the cooperative farm'
 		gt 'dachain', 'dachabath'
 		gt 'dachain', 'dachabath'
@@ -343,4 +349,4 @@ if $ARGS[0] = 'vomiting_exit':
 end
 end
 
 
 !! --------------- end vomiting ----------------------------
 !! --------------- end vomiting ----------------------------
---- home_activity ---------------------------------
+--- home_activity ---------------------------------

+ 3 - 0
locations/sleep.qsrc

@@ -524,6 +524,9 @@ if $ARGS[0] = 'wake':
 	menu_off = 1
 	menu_off = 1
 	InSleep = 1
 	InSleep = 1
 	gs 'stat'
 	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 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 $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.'
 	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.'

+ 14 - 7
locations/stat.qsrc

@@ -490,13 +490,20 @@ if minut >= 60:
 	end
 	end
 	
 	
 	!! code to trigger vomitting based on morning sickness, hangovers, or just plain bad luck
 	!! 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
 	end
 	end