Browse Source

[fixes] blank screen after taking a shower/bath in the master bathroomin dimkas home

slonon 3 years ago
parent
commit
410309615a
1 changed files with 55 additions and 51 deletions
  1. 55 51
      locations/dimaHome.qsrc

+ 55 - 51
locations/dimaHome.qsrc

@@ -291,61 +291,65 @@ if $ARGS[0] = 'dimkaparents':
 		'You snoop around, opening drawers, and looking in the closet. Everything is perfectly in place and neatly arranged. You don''t find anything of interest, Dimka''s parents seem pretty boring, you think to yourself.'
 		act 'Leave':gt 'dimaHome','hallway2'
 	end
-	act 'Go into master bathroom':
-		*clr & cla
-		minut += 1
-		$loc_arg = 'bathroom'
-		$loc = 'dimaHome'
-		$locM_arg = 'bathroom'
-		$locM = 'dimaHome'
-		menu_off = 1
-		killvar '$locclass'
-		gs 'stat'
-		$location_type = 'bathroom'
-		'<center><h4><font color="maroon">Master bathroom</font></h4></center>'
-		'<center><img  src="images/locations/pavlovsk/resident/dimkahome/masterbath.jpg"></center>'
-		'The master bathroom is a huge space with a large sink area and tile floors. The toilet sits along the far wall. You can''t help but feel impressed by the size of the walk-in shower and deep bathtub. It all looks very expensive.'
-		'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
-		*nl
-		if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
-		if shampoo > 0:
-			act 'Take a shower':
-				*clr & cla
-				minut += 10
-				dynamic $showerdin
-				gs 'stat'
-				'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-				'<video autoplay loop src="images/characters/pavlovsk/school/boy/igor/mitsa.mp4"></video>'
-				'You take a quick shower.'
-				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-				act 'Get out of the shower':
-					'You get out of the shower and dry off.'
-					act 'Get dressed': gt 'dimaHome','Go into master bath'
-				end
+	act 'Go into master bathroom': gt 'dimaHome','dimka_master_bathroom'
+	act 'Leave': gt 'dimaHome','hallway2'
+end
+
+if $ARGS[0] = 'dimka_master_bathroom':
+	*clr & cla
+	minut += 1
+	$loc_arg = 'bathroom'
+	$loc = 'dimaHome'
+	$locM_arg = 'bathroom'
+	$locM = 'dimaHome'
+	menu_off = 1
+	killvar '$locclass'
+	gs 'stat'
+	$location_type = 'bathroom'
+	'<center><h4><font color="maroon">Master bathroom</font></h4></center>'
+	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/masterbath.jpg"></center>'
+	'The master bathroom is a huge space with a large sink area and tile floors. The toilet sits along the far wall. You can''t help but feel impressed by the size of the walk-in shower and deep bathtub. It all looks very expensive.'
+	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
+	*nl
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	if shampoo > 0:
+		act 'Take a shower':
+			*clr & cla
+			minut += 10
+			dynamic $showerdin
+			gs 'stat'
+			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+			'<video autoplay loop src="images/characters/pavlovsk/school/boy/igor/mitsa.mp4"></video>'
+			'You take a quick shower.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+			act 'Get out of the shower':
+				cla
+				'You get out of the shower and dry off.'
+				act 'Get dressed': gt 'dimaHome','dimka_master_bathroom'
 			end
-			act 'Take a bath':
-				*clr & cla
-				minut += 20
-				dynamic $bath
-				gs 'stat'
-				'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-				'<center><img  src="images/shared/home/bathroom/wash4.jpg"></center>'
-				'You take a quick bath.'
-				act 'Get out of the bath':
-					'You get out of the bath and dry off.'
-					act 'Get dressed': gt 'dimaHome','Go into master bath'
-				end
+		end
+		act 'Take a bath':
+			*clr & cla
+			minut += 20
+			dynamic $bath
+			gs 'stat'
+			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+			'<center><img  src="images/shared/home/bathroom/wash4.jpg"></center>'
+			'You take a quick bath.'
+			act 'Get out of the bath':
+				cla
+				'You get out of the bath and dry off.'
+				act 'Get dressed': gt 'dimaHome','dimka_master_bathroom'
 			end
-		else
-			'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 		end
-		gs 'din_van', 'prvt_pee'
-		dynamic $bteeth
-		dynamic $tampon
-		dynamic $basin
-		act 'Leave the bathroom': gt 'dimaHome','dimkaparents'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
-	act 'Leave':gt 'dimaHome','hallway2'
+	gs 'din_van', 'prvt_pee'
+	dynamic $bteeth
+	dynamic $tampon
+	dynamic $basin
+	act 'Leave the bathroom': gt 'dimaHome','dimkaparents'
 end
 
 if $ARGS[0] = 'guest':