[changed] hotels have shampoo, blocked bath for cheap hotelrooms to match the image

locations/HotelRoom.qsrc

@@ -109,28 +109,17 @@ if $ARGS[0] = 'best':
 end
 
 if $ARGS[0] = 'shower1':
-	$location_type = 'bathroom'
-	act 'Return to your room':
-		if hotelroom = 1:
-			gt'HotelRoom','normal'
-		elseif hotelroom = 2:
-			gt'HotelRoom','better'
-		elseif hotelroom = 3:
-			gt'HotelRoom','best'
-		end
-	end
-
+	*clr & cla
+	minut += 1
+	hotelShampoo = 1
 	$metkaM = 'shower1'
 	$locM = 'HotelRoom'
 	$metka = 'shower1'
-	$loc = 'HotelRoom'
-
-	clr
-	minut = minut + 1
-	gs'stat'
-
+	$loc = 'HotelRoom'	
+	$location_type = 'bathroom'
 	gs 'themes', 'indoors'
-
+	gs'stat'
+	
 	'<center><b><font color = maroon>The bathroom of your hotel room</font></b></center>'
 	if hotelroom = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal1.jpg"></center>'&'A small and unpretentious bathroom, that is nevertheless quite stylish and has everything you need.'
@@ -139,13 +128,19 @@ if $ARGS[0] = 'shower1':
 	elseif hotelroom = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'&'A very luxurious and spacious bathroom, fit for a king.'
 	end
-	if hotshamday ! daystart:
-		'You take the little bottle of shampoo on the shelf and place it in your pocket'
-		shampoo += 1
-		hotshamday = daystart
+	
+	act 'Return to your room':
+		hotelShampoo = 0
+		if hotelroom = 1:
+			gt'HotelRoom','normal'
+		elseif hotelroom = 2:
+			gt'HotelRoom','better'
+		elseif hotelroom = 3:
+			gt'HotelRoom','best'
+		end
 	end
-
-	gs 'din_van', 'private'
+	
+	gs 'din_van', 'private', 'hotelroom', iif(hotelroom = 1, '', 'bath')
 end
 
 if $ARGS[0] = 'tv':

locations/din_van.qsrc

@@ -64,7 +64,7 @@ $shower = {
 		menu_off = 1
 		*clr & cla
 		minut += 15
-		if $loc = 'vanrPar' or $loc = 'tanvanr': noShampoo = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or hotelShampoo = 1: noShampoo = 1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -179,7 +179,7 @@ $bath = {
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
-		if $loc = 'vanrPar' or $loc = 'tanvanr': noShampoo = 1
+		if $loc = 'vanrPar' or $loc = 'tanvanr' or hotelShampoo = 1: noShampoo = 1
 		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
@@ -1071,7 +1071,10 @@ if $ARGS[0] = 'private':
 
 	'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
 	
-	if $loc = 'vanrPar':
+	if $ARGS[1] = 'hotelroom':
+		dynamic $shower
+		if $ARGS[2] = 'bath': dynamic $bath
+	elseif $loc = 'vanrPar':
 		'You can use your parent''s shampoo.'
 		dynamic $shower
 		dynamic $bath