Browse Source

Refactored vomit event code

rustcompiler 1 year ago
parent
commit
2067ddeabd
2 changed files with 12 additions and 15 deletions
  1. 9 14
      locations/home_activity.qsrc
  2. 3 1
      locations/sleep.qsrc

+ 9 - 14
locations/home_activity.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'morning_vomit':
 				if $loc = 'mey_home':
 				if $loc = 'mey_home':
 					act'Continue':gt 'mey_home', 'mey_morning_vomit'
 					act'Continue':gt 'mey_home', 'mey_morning_vomit'
 				else
 				else
-					act'Continue':gt'home_activity','vomiting_exit'
+					act'Continue':gt'sleep','end'
 				end
 				end
 			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.'
 		'You don''t like the frequency with which this is happening. More and more, the evidence is pointing towards you being pregnant.'
 		*nl
 		*nl
 		'<i>What am I going to do?</i> you think to yourself.'
 		'<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
 	end
 	
 	
 	act'I better not be pregnant':
 	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.'
 		'Disgust and irritation fill you as you reach out to flush the toilet.'
 		*nl
 		*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>'
 		'<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
 	end
 	
 	
 	act'I can''t wait for this baby':
 	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.'
 		'Even through the pain and the horrid taste on your lips, you can''t help but smile.'
 		*nl
 		*nl
 		'<i>I''m so ready for this baby!</i> you think excitedly.'
 		'<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
 	end
 	
 	
 	act'Baby good, morning sickness bad':
 	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.'
 		'You clutch your head, wincing at the sharp pain that lances through it.'
 		*nl
 		*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>'
 		'<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
 end
 end
 
 
@@ -267,14 +267,14 @@ if $ARGS[0] = 'preg_scare_react':
 		cla & *clr
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		$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>'
 		'<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
 	end
 	
 	
 	act'This is really bad':
 	act'This is really bad':
 		cla & *clr
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		$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>'
 		'<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
 	end
 	
 	
 	act'This is wonderful!':
 	act'This is wonderful!':
@@ -285,7 +285,7 @@ if $ARGS[0] = 'preg_scare_react':
 		else
 		else
 			'<i>I''m going to have another baby!</i> you think, smiling to yourself. <i>This is wonderful!</i>'
 			'<i>I''m going to have another baby!</i> you think, smiling to yourself. <i>This is wonderful!</i>'
 		end
 		end
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	end
 	
 	
 	if stat['think_virgin'] = 1:
 	if stat['think_virgin'] = 1:
@@ -293,7 +293,7 @@ if $ARGS[0] = 'preg_scare_react':
 			cla & *clr
 			cla & *clr
 			$home_activity['vomit_bathroom']
 			$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.'
 			'<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
 	end
 end
 end
@@ -303,11 +303,6 @@ 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
-	menu_off = 1
-    InSleep = 0
-	slept_in = 0
-	strip_here = 0
-	SleepHorny = 0
 
 
     if at_home = 1:
     if at_home = 1:
 		!! location = 'City residential apartment'
 		!! location = 'City residential apartment'

+ 3 - 1
locations/sleep.qsrc

@@ -619,10 +619,12 @@ if $ARGS[0] = 'end':
 	slept_in = 0
 	slept_in = 0
 	strip_here = 0
 	strip_here = 0
 	SleepHorny = 0
 	SleepHorny = 0
-	if fullmorrout = 1 and $loc = 'bedrPar':
+    if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':
 	elseif fullmorrout = 1 and $loc = 'bedr':
 		gt 'vanr'
 		gt 'vanr'
+    elseif vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:
+        gt 'home_activity', 'vomiting_exit'
 	else
 	else
 		gt $loc, $loc_arg
 		gt $loc, $loc_arg
 	end
 	end