[added/changed] Added more content to the therapist hotel room. The hotels now use `$region` instead of `$hotel` to differentiate where you are.

glife.qproj

@@ -1106,6 +1106,7 @@
 		<Location name="therapist"/>
 		<Location name="therapist_reminder"/>
 		<Location name="therapist_hotel"/>
+		<Location name="therapist_home"/>
 		<Location name="gevent"/>
 		<Location name="pav_park"/>
 		<Location name="pav_park_sex"/>

locations/HotelRoom.qsrc

@@ -3,14 +3,9 @@
 CLOSE ALL
 if $ARGS[0] = 'normal':
 	*clr & cla
-	$locM_arg = 'normal'
-	$locM = 'HotelRoom'
-	$loc_arg = 'normal'
-	$loc = 'HotelRoom'
+	gs 'shortgs', 'setloc', 'HotelRoom', 'normal'
 	$prevloc = $loc
 	$location_type = 'private'
-	$menu_loc = 'HotelRoom'
-	$menu_arg = 'normal'
 	menu_off = 0
 	hotelWiFi = 1
 	gs 'themes', 'indoors'
@@ -18,10 +13,10 @@ if $ARGS[0] = 'normal':
 	gs 'internet_mobile', 'get_access', 'free'
 	gs 'music_actions', 'clear_restrictions'
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
-	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
+	'<center>You have paid to stay for <<hotelRoomDays[$region] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
-	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>' + iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	gs 'music_actions', 'start'
@@ -30,18 +25,21 @@ if $ARGS[0] = 'normal':
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
-			gt $hotel
-			killvar '$hotel'
+			if $region = 'pav':
+				gt 'pav_hotel'
+			else
+				gt 'city_hotel'
+			end
 		else
-			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
-			gt'HotelRoom','normal'
+			msg '<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
+			gt 'HotelRoom', 'normal'
 		end
 	end
 
-	if hotelRoom[$hotel] ! 0:
+	if hotelRoom[$region] ! 0:
 		if money >= 100:act'Order room service (0:30) (100 <b>₽</b>)':gs 'food', 'h_food'
 		act 'Drink some water (0:01)': gs 'beverage', 'bev_wat'
-		if $hotel = 'pav_hotel': gs 'prostitution_functions', 'prostitute_outfit_at_home'
+		if $region = 'pav': gs 'prostitution_functions', 'prostitute_outfit_at_home'
 		gs 'wardrobe', 'default_clothing_options'
 		dynamic $fatdel
 		dynamic $lekarstvo
@@ -51,25 +49,20 @@ end
 
 if $ARGS[0] = 'better':
 	*clr & cla
-	$locM_arg = 'better'
-	$locM = 'HotelRoom'
-	$loc_arg = 'better'
-	$loc = 'HotelRoom'
+	gs 'shortgs', 'setloc', 'HotelRoom', 'better'
 	$prevloc = $loc
-	$menu_loc = 'HotelRoom'
-	$menu_arg = 'better'
+	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
-	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'	
 	gs 'internet_mobile', 'get_access', 'free'
 	gs 'music_actions', 'clear_restrictions'
 
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
-	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
+	'<center>You have paid to stay for <<hotelRoomDays[$region] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
@@ -78,19 +71,22 @@ if $ARGS[0] = 'better':
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
-			gt $hotel
-			killvar '$hotel'
+			if $region = 'pav':
+				gt 'pav_hotel'
+			else
+				gt 'city_hotel'
+			end
 		else
-			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
-			gt'HotelRoom','better'
+			msg '<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
+			gt 'HotelRoom', 'better'
 		end
 	end
 
-	if hotelRoom[$hotel] ! 0:
+	if hotelRoom[$region] ! 0:
 		if money >= 100:act'Order room service (0:30) (100 <b>₽</b>)':gs 'food', 'h_food'
 		act 'Drink some water (0:01)': gs 'beverage', 'bev_wat'
 		act 'Have a coffee (0:05)': gs 'beverage', 'bev_cof'
-		if $hotel = 'pav_hotel': gs 'prostitution_functions', 'prostitute_outfit_at_home'
+		if $region = 'pav': gs 'prostitution_functions', 'prostitute_outfit_at_home'
 		dynamic $fatdel
 		dynamic $lekarstvo
 		dynamic $vitamin
@@ -98,26 +94,21 @@ if $ARGS[0] = 'better':
 end
 
 if $ARGS[0] = 'best':
-	*clr & cla	
-	$locM_arg = 'best'
-	$locM = 'HotelRoom'
-	$loc_arg = 'best'
-	$loc = 'HotelRoom'
+	*clr & cla
+	gs 'shortgs', 'setloc', 'HotelRoom', 'best'
 	$prevloc = $loc
-	$menu_loc = 'HotelRoom'
-	$menu_arg = 'best'
+	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
-	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'	
 	gs 'internet_mobile', 'get_access', 'free'
 	gs 'music_actions', 'clear_restrictions'
 
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
-	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
+	'<center>You have paid to stay for <<hotelRoomDays[$region] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
-	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
@@ -126,20 +117,23 @@ if $ARGS[0] = 'best':
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
-			gt $hotel
-			killvar '$hotel'
+			if $region = 'pav':
+				gt 'pav_hotel'
+			else
+				gt 'city_hotel'
+			end
 		else
-			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
-			gt'HotelRoom','best'
+			msg '<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
+			gt 'HotelRoom', 'best'
 		end
 	end
 
-	if hotelRoom[$hotel] ! 0:
+	if hotelRoom[$region] ! 0:
 		if money >= 100:act'Order room service (0:30) (100 <b>₽</b>)':gs 'food', 'h_food'
 		act 'Drink some water (0:01)': gs 'beverage', 'bev_wat'
 		act 'Have a coffee (0:05)': gs 'beverage', 'bev_cof'
 		act 'Make some tea (0:05)': gs 'beverage', 'bev_tea'
-		if $hotel = 'pav_hotel': gs 'prostitution_functions', 'prostitute_outfit_at_home'
+		if $region = 'pav': gs 'prostitution_functions', 'prostitute_outfit_at_home'
 		dynamic $fatdel
 		dynamic $lekarstvo
 		dynamic $vitamin
@@ -148,99 +142,112 @@ end
 
 if $ARGS[0] = 'therapist':
 	*clr & cla
-	$hotel = 'pav_hotel'
-	$locM_arg = 'therapist'
-	$locM = 'HotelRoom'
-	$loc_arg = 'therapist'
-	$loc = 'HotelRoom'
-	$prevloc = $loc
-	$menu_loc = 'HotelRoom'
-	$menu_arg = 'therapist'
+	gs 'schedule', 'A186'
+	gs 'shortgs', 'setloc', 'HotelRoom', 'therapist'
+	if $prevloc ! $loc: $prevloc = $loc & gt 'therapist_home', 'hotel_enter'
+	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
-	$location_type = 'private'
+
 	gs 'themes', 'indoors'
-	gs 'stat'	
+	gs 'stat'
 	gs 'internet_mobile', 'get_access', 'free'
 	gs 'music_actions', 'clear_restrictions'
 
 	'<center><b><font color = maroon>Your husband''s hotel room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/room.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''therapist_hotel'', ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(mc_inventory['tech_computer'] = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	gs 'music_actions', 'start'
 	
-	act'Go to the hotel lobby':
+	act 'Put on your clothes and go to the hotel lobby':
+		gs 'underwear', 'wear'
+		gs 'clothing', 'wear_last_worn'
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
 			gt 'pav_hotel'
-			killvar '$hotel'
 		else
-			msg'<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
+			msg '<b><font color = red>You need to get dressed before leaving your hotel room.</font></b>'
 			gt 'HotelRoom', 'therapist'
 		end
 	end
 
-	if hotelRoom[$hotel] ! 0:
-		if money >= 100: act'Order room service (0:30) (100 <b>₽</b>)': gs 'food', 'h_food'
-		act 'Drink some water (0:01)': gs 'beverage', 'bev_wat'
-		act 'Have a coffee (0:05)': gs 'beverage', 'bev_cof'
-		dynamic $fatdel
-		dynamic $lekarstvo
-		dynamic $vitamin
+	act 'Drink some water (0:01)': gs 'beverage', 'bev_wat'
+	act 'Have a coffee (0:05)': gs 'beverage', 'bev_cof'
+	if hour = 17 and minut >= 45 or hour = 18:
+		act 'Cook dinner (0:30)': gt 'therapist_home', 'cook'
+	elseif money >= 100:
+		act 'Order room service (0:30) (100 <b>₽</b>)': gs 'food', 'h_food'
 	end
+	dynamic $fatdel
+	dynamic $lekarstvo
+	dynamic $vitamin
+	
+	gs 'therapist_home', 'set_Hotelacts'
+
+	if pcs_sweat >= 20 and locat['A186'] = 2:
+		cla
+		'"Hun, you need a shower, go clean up," he says and you go to the bathroom and clean up.'
+		act 'Take a shower (0:10)': gt 'therapist_home', 'shower'
+	end
+
 end
 
 if $ARGS[0] = 'shower1':
 	*clr & cla
 	minut += 1
 	hotelmc_inventory['shampoo'] =  1
-	$locM_arg = 'shower1'
-	$locM = 'HotelRoom'
-	$loc_arg = 'shower1'
-	$loc = 'HotelRoom'
+	gs 'shortgs', 'setloc', 'HotelRoom', 'shower1'
 	$location_type = 'bathroom'
 	gs 'themes', 'indoors'
-	gs'stat'
+	gs 'stat'
 	
 	'<center><b><font color = maroon>The bathroom of your hotel room</font></b></center>'
-	if hotelRoom[$hotel] = 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.'
-	elseif hotelRoom[$hotel] = 2 or therapistQW['hotel_key'] = 3:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'&'A nice looking and spacious bathroom, with separate bath tub.'
-	elseif hotelRoom[$hotel] = 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.'
+	if hotelRoom[$region] = 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.'
+	elseif hotelRoom[$region] = 2 or therapistQW['hotel_key'] = 3:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'
+		'A nice looking and spacious bathroom, with separate bath tub.'
+	elseif hotelRoom[$region] = 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 hotelRoom[$hotel] = 0 and therapistQW['hotel_key'] ! 3:
+	if hotelRoom[$region] = 0 and therapistQW['hotel_key'] ! 3:
 		act 'Return to lobby (It is past checkout time)':
 			hotelWiFi = 0
-			gt $hotel
-			killvar '$hotel'
+			if $region = 'pav':
+				gt 'pav_hotel'
+			else
+				gt 'city_hotel'
+			end
 		end
 	else
 		act 'Return to your room':
 			hotelmc_inventory['shampoo'] =  0
-			if hotelRoom[$hotel] = 1:
+			if therapistQW['hotel_key'] = 3:
+				gt 'HotelRoom', 'therapist'
+			elseif hotelRoom[$region] = 1:
 				gt 'HotelRoom', 'normal'
-			elseif hotelRoom[$hotel] = 2:
+			elseif hotelRoom[$region] = 2:
 				gt 'HotelRoom', 'better'
-			elseif hotelRoom[$hotel] = 3:
+			elseif hotelRoom[$region] = 3:
 				gt 'HotelRoom', 'best'
-			elseif therapistQW['hotel_key'] = 3:
-				gt 'HotelRoom', 'therapist'
 			end
 		end
 	end
 	
-	gs 'din_van', 'private', 'hotelroom', iif(hotelRoom[$hotel] = 1, '', 'bath')
+	gs 'din_van', 'private', 'hotelroom', iif(hotelRoom[$region] = 1, '', 'bath')
 end
 
 if $ARGS[0] = 'tv':
 	*clr & cla
-	gs'stat'
+	$menu_loc = 'HotelRoom'
+	$menu_arg = 'tv'
+	gs 'stat'
 
 	if therapistQW['hotel_key'] = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/tv2.jpg"></center>'
@@ -249,11 +256,14 @@ if $ARGS[0] = 'tv':
 	end
 	'You turn on the TV and make yourself comfortable on the bed.'
 
-	if hotelRoom[$hotel] = 0 and therapistQW['hotel_key'] ! 3:
+	if hotelRoom[$region] = 0 and therapistQW['hotel_key'] ! 3:
 		act 'Return to lobby (It is past checkout time)':
 			hotelWiFi = 0
-			gt $hotel
-			killvar '$hotel'
+			if $region = 'pav':
+				gt 'pav_hotel'
+			else
+				gt 'city_hotel'
+			end
 		end
 	else
 		act 'Get up from the bed': gt $loc, $loc_arg
@@ -265,15 +275,18 @@ if $ARGS[0] = 'watch_tv':
 	*clr & cla
 	minut += 60
 	pcs_mood += rand(10,20)
-	gs'stat'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/tv0,'+rand(0,4)+'.jpg"></center>'
 	'You are watching the country''s main television channel. None of their programs are really worth watching, but the distraction is welcome anyway.'
 
-	if hotelRoom[$hotel] = 0 and therapistQW['hotel_key'] ! 3:
+	if hotelRoom[$region] = 0 and therapistQW['hotel_key'] ! 3:
 		act 'Return to lobby (It is past checkout time)':
 			hotelWiFi = 0
-			gt $hotel
-			killvar '$hotel'
+			if $region = 'pav':
+				gt 'pav_hotel'
+			else
+				gt 'city_hotel'
+			end
 		end
 	else
 		act 'Get up from the bed': gt $loc, $loc_arg

locations/city_hotel.qsrc

@@ -6,12 +6,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	nom_o[2] = 1000
 	nom_o[3] = 10000
 	nom_o[4] = 100000
-	$loc = 'city_hotel'
-	$menu_loc = 'city_hotel'
-	$loc_arg = 'start'
-	$menu_arg = 'start'
+	gs 'shortgs', 'setloc', 'city_hotel', 'start'
+	$region = 'city'
 	menu_off = 0
 	gs 'stat'
+
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/lobby.jpg"></center>'
 
 	if tobiQW < 2000:'The hotel lobby is deserted and you only notice an alone bored girl standing at the reception desk.'
@@ -39,12 +38,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	act 'Leave': minut += 5 & gt 'city_center'
 
-	if hotelRoom['city_hotel'] ! 0:
+	if hotelRoom['city'] ! 0:
 		act 'Go to your room':
-			$hotel = 'city_hotel'
-			if hotelRoom['city_hotel'] = 1: gt 'HotelRoom', 'normal'
-			if hotelRoom['city_hotel'] = 2: gt 'HotelRoom', 'better'
-			if hotelRoom['city_hotel'] = 3: gt 'HotelRoom', 'best'
+			if hotelRoom['city'] = 1: gt 'HotelRoom', 'normal'
+			if hotelRoom['city'] = 2: gt 'HotelRoom', 'better'
+			if hotelRoom['city'] = 3: gt 'HotelRoom', 'best'
 		end
 
 	end
@@ -94,13 +92,13 @@ if $ARGS[0] = 'reception':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
 		'The girl behind the desk smiles at you and asks: "Hello miss! Would you like to rent a room?"'
 
-		if hotelRoom['city_hotel'] > 0:
+		if hotelRoom['city'] > 0:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
 			'She looks in the computer: "I see you already have a room here. As it is already booked and paid for the only way to change it to a different room, would be to cancel your existing booking. To do so without notice would forfeit your payment, I would advise against this, but you may do so if you wish."'
-			act'Yes, cancel your booking':hotelRoom['city_hotel'] = 0 & gt'city_hotel'
+			act'Yes, cancel your booking': hotelRoom['city'] = 0 & gt'city_hotel'
 			act'No':gt'city_hotel'
-		elseif hotelRoom['city_hotel'] = 0:
+		elseif hotelRoom['city'] = 0:
 			act 'Yes':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
@@ -111,21 +109,21 @@ if $ARGS[0] = 'reception':
 				*nl
 				act'Standard room':
 					cla
-					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
-					if hotelRoomDays['city_hotel'] > 0 : 
-						totalCost = hotelRoomDays['city_hotel'] * 500
-						'"A standard room for <<hotelRoomDays[''city_hotel'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+					hotelRoomDays['city'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['city'] > 0 : 
+						totalCost = hotelRoomDays['city'] * 500
+						'"A standard room for <<hotelRoomDays[''city'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
 						gs 'city_hotel', 'pay_the_room', 1
 					else
-						gt'city_hotel'					
+						gt'city_hotel'
 					end
 				end
 				act 'Luxury room':
 					cla
-					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
-					if hotelRoomDays['city_hotel'] > 0:
-						totalCost = hotelRoomDays['city_hotel'] * 1500
-						'"A luxury room for <<hotelRoomDays[''city_hotel'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+					hotelRoomDays['city'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['city'] > 0:
+						totalCost = hotelRoomDays['city'] * 1500
+						'"A luxury room for <<hotelRoomDays[''city'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
 						$temp_nomoney = '"You can''t afford to stay in a luxury room at this hotel for that long.'
 						gs 'city_hotel', 'pay_the_room', 2
 					else
@@ -135,17 +133,17 @@ if $ARGS[0] = 'reception':
 
 				act'Royal Suite':
 					cla
-					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
-					if hotelRoomDays['city_hotel'] > 0: 
-						totalCost = hotelRoomDays['city_hotel'] * 10000
-						'"The royal suite for <<hotelRoomDays[''city_hotel'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+					hotelRoomDays['city'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['city'] > 0: 
+						totalCost = hotelRoomDays['city'] * 10000
+						'"The royal suite for <<hotelRoomDays[''city'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
 						gs 'city_hotel', 'pay_the_room', 3
 					else	
 						gt'city_hotel'
 					end
 				end
 
-				act 'Step away from the reception desk':gt'city_hotel'
+				act 'Step away from the reception desk': gt'city_hotel'
 			end
 			act'No, thank you':gt'city_hotel'
 		end
@@ -158,8 +156,8 @@ if $ARGS[0] = 'pay_the_room':
 		act 'Pay with cash':
 			cla
 			money-=totalCost
-			hotelRoom['city_hotel'] = hotel_room_id
-			hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+			hotelRoom['city'] = hotel_room_id
+			hotelRoomDays['city'] = daystart + hotelRoomDays['city']
 			'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!"'
 			act 'Step away from the reception desk': gt 'city_hotel'
 			killvar 'totalCost'
@@ -171,8 +169,8 @@ if $ARGS[0] = 'pay_the_room':
 			cla
 			karta-=totalCost
 			'hotel_room_id: <<hotel_room_id>>'
-			hotelRoom['city_hotel'] = hotel_room_id
-			hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+			hotelRoom['city'] = hotel_room_id
+			hotelRoomDays['city'] = daystart + hotelRoomDays['city']
 			'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!" she says with a smile.'
 			act 'Step away from the reception desk': gt 'city_hotel'
 			killvar 'totalCost'

locations/home_activity.qsrc

@@ -74,13 +74,13 @@ if $ARGS[0] = 'vomiting_images':
 		$loc_arg = 'ybathroom'
 	elseif $at_home = 'pavlovsk_hotel':
 		!! location = 'My hotel room in Pavlovsk'
-		if hotelRoom[$hotel] = 1:
+		if hotelRoom[$region] = 1:
 			$home_activity['vomit_bedroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
 			$home_activity['vomit_bathroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal1.jpg"></center>'
-		elseif hotelRoom[$hotel] = 2:
+		elseif hotelRoom[$region] = 2 or therapistQW['hotel_key'] = 3:
 			$home_activity['vomit_bedroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
 			$home_activity['vomit_bathroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'
-		elseif hotelRoom[$hotel] = 3:
+		elseif hotelRoom[$region] = 3:
 			$home_activity['vomit_bedroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
 			$home_activity['vomit_bathroom'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
 		end

locations/pav_clinic.qsrc

@@ -3,14 +3,13 @@
 if $ARGS[0] = '':
 	CLOSE ALL
 	clr
-	$loc = 'pav_clinic'
+	gs 'shortgs', 'setloc', 'pav_clinic', ''
 	$location_type = 'indoors'
-	$menu_loc = 'pav_clinic'
-	$menu_arg = ''
 	menu_off = 0
 	frost = 0
 	gs 'stat'
 	gs 'themes', 'indoors'
+
 	'<center><b><font color="maroon">Clinic</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
 
@@ -289,8 +288,8 @@ if $ARGS[0] = '':
 				act 'Leave': gt 'pav_clinic'
 			end
 		end
-
-		if therapistday ! daystart: act 'Visit the therapist (1:00)': gt 'therapist'
+		gs 'schedule', 'A186'
+		if therapistday ! daystart and locat['A186'] = 1: act 'Visit the therapist (1:00)': gt 'therapist'
 
 		if pcs_know_mward > 0: act 'Visit the maternity ward (0:05)': gt 'pav_clinic', 'maternity_ward'
 

locations/pav_hotel.qsrc

@@ -1,22 +1,19 @@
 # pav_hotel
 
 CLOSE ALL
+gs 'shortgs', 'setloc', 'pav_hotel', ''
 $region = 'pav'
-$loc_arg = $ARGS[0]
-$loc = $CURLOC
-$menu_loc = 'pav_hotel'
-$menu_arg = ''
-menu_off = 0
 $location_type = 'public_indoors'
+menu_off = 0
 
 $receptionName = 'Elisabet'
-gs'stat'
+gs 'stat'
 
 ! use this args if some event  transfers you directly to the lobby  and it is can happen  between  midnight and 01:00.
 if $ARGS[0] = 'skip_resepevent': jump 'skipresepevent'
 
 if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3 and rand(1,10) = 10)):
-	if hotelRoom['pav_hotel'] = 0 and therapistQW['hotel_key'] ! 3:
+	if hotelRoom['pav'] = 0 and therapistQW['hotel_key'] ! 3:
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
@@ -47,7 +44,7 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 			*clr & cla
 			gs 'exp_gain', 'observ', 3
 			gs 'stat'
-			if $prevloc = 'HotelRoom': 
+			if $prevloc = 'HotelRoom':
 				'You creep down to the lobby, and then around the corner, carefully, you sneak a glimpse.'
 			else 
 				'You find the door closed, and you realise that the receptionist and the manager are probably fooling around again. You carefully open the door with your key, and enter as quietly as you can.'
@@ -103,11 +100,11 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 						act 'Continue':
 							if therapistQW['hotel_key'] = 3:
 								gt 'HotelRoom', 'therapist'
-							elseif hotelRoom['pav_hotel'] = 1:
+							elseif hotelRoom['pav'] = 1:
 								gt'hotelroom','normal'
-							elseif hotelRoom['pav_hotel'] = 2:
+							elseif hotelRoom['pav'] = 2:
 								gt'hotelroom','better'
-							elseif hotelRoom['pav_hotel'] = 3:
+							elseif hotelRoom['pav'] = 3:
 								gt'hotelroom','best'
 							end
 						end
@@ -141,7 +138,8 @@ else
 	end
 end
 
-if therapistQW['hotel_key'] = 2 and week = 6 and hour > 19 and pcs_traits['commando_lvl'] = 3 and therapistQW['hotel_day'] ! daystart and therapistQW['escaped'] = 0:
+gs 'schedule', 'A186'
+if therapistQW['hotel_key'] = 2 and locat['A186'] = 2 and week = 6 and hour >= 20 and pcs_traits['commando_lvl'] = 3 and therapistQW['hotel_day'] ! daystart and therapistQW['escaped'] = 0:
 	therapistQW['hotel_day'] = daystart
 	gs 'willpower', 'misc', 'resist', 'medium'
 
@@ -211,14 +209,13 @@ if hour = 20 and IgorevnaBDSM >= 5 and IgorevnaBDSM < 10 and week < 3 and AnnaQW
 	act 'Look for Anna':AnnaQW['daystart'] = daystart & gt 'hotel_anna', 'meeting'
 end
 
-if hotelRoom['pav_hotel'] > 0 or therapistQW['hotel_key'] = 3:
+if hotelRoom['pav'] > 0 or therapistQW['hotel_key'] = 3:
 	act 'Go to your room':
-		$hotel = 'pav_hotel'
 		if therapistQW['hotel_key'] = 3:
 			gt 'HotelRoom', 'therapist'
-		elseif hotelRoom['pav_hotel'] = 1:
+		elseif hotelRoom['pav'] = 1:
 			gt 'HotelRoom', 'normal'
-		elseif hotelRoom['pav_hotel'] = 2:
+		elseif hotelRoom['pav'] = 2:
 			gt 'HotelRoom', 'better'
 		end
 	end

locations/pav_hotelReception.qsrc

@@ -118,13 +118,13 @@ if $ARGS[0] = '':
 		else
 			'<<$receptionName>> smiles at you and asks: "Hello <<$pcs_nickname>>! Would you like to rent a room?"'
 		end
-		if hotelRoom['pav_hotel'] > 0 and therapistQW['hotel_key'] ! 3:
+		if hotelRoom['pav'] > 0 and therapistQW['hotel_key'] ! 3:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
 			'She looks in the computer: "I see you already have a room here. As it is already booked and paid for the only way to change it to a different room, would be to cancel your existing booking. To do so without notice would forfeit your payment, I would advise against this, but you may do so if you wish."'
-			act'Yes, cancel your booking': hotelRoom['pav_hotel'] = 0 & gt'pav_hotel'
+			act'Yes, cancel your booking': hotelRoom['pav'] = 0 & gt'pav_hotel'
 			act'No':gt'pav_hotel'
-		elseif hotelRoom['pav_hotel'] = 0 and therapistQW['hotel_key'] ! 3:
+		elseif hotelRoom['pav'] = 0 and therapistQW['hotel_key'] ! 3:
 			act 'Yes':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
@@ -134,10 +134,10 @@ if $ARGS[0] = '':
 				*nl
 				act'Normal room':
 					cla 
-					hotelRoomDays['pav_hotel'] = input ("For how long would you like to stay?")
-					if hotelRoomDays['pav_hotel'] > 0 : 
-						totalCost = hotelRoomDays['pav_hotel'] * 500
-						'"A normal room for <<hotelRoomDays[''pav_hotel'']>> days, that would be <<totalCost>><b>₽</b> in total." says the receptionist, "would you like to pay with cash or with card?"'
+					hotelRoomDays['pav'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['pav'] > 0 : 
+						totalCost = hotelRoomDays['pav'] * 500
+						'"A normal room for <<hotelRoomDays[''pav'']>> days, that would be <<totalCost>><b>₽</b> in total." says the receptionist, "would you like to pay with cash or with card?"'
 						gs 'pav_hotelReception', 'pay_the_room', 1
 					else
 						gt'pav_hotel'
@@ -146,19 +146,19 @@ if $ARGS[0] = '':
 
 				act'Luxury room':
 					cla
-					hotelRoomDays['pav_hotel'] = input ("For how long would you like to stay?")
-					if hotelRoomDays['pav_hotel'] > 0 : 
-						totalCost = hotelRoomDays['pav_hotel'] * 1500
-						'"A luxury room for <<hotelRoomDays[''pav_hotel'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+					hotelRoomDays['pav'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['pav'] > 0 : 
+						totalCost = hotelRoomDays['pav'] * 1500
+						'"A luxury room for <<hotelRoomDays[''pav'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
 						gs 'pav_hotelReception', 'pay_the_room', 2
 					else
 						gt'pav_hotel'
 					end
 				end
 
-				act 'Step away from the reception desk': gt'pav_hotel'
+				act 'Step away from the reception desk': gt d'pav_hotel'
 			end
-			act'No, thank you':gt'pav_hotel'
+			act 'No, thank you': gt 'pav_hotel'
 		end
 	end
 end
@@ -168,9 +168,9 @@ if $ARGS[0] = 'pay_the_room':
 	if totalCost<=money:
 		act 'Pay with cash':
 			cla
-			money-=totalCost
-			hotelRoom['pav_hotel'] = hotel_room_id
-			hotelRoomDays['pav_hotel'] = daystart + hotelRoomDays['pav_hotel']
+			money -= totalCost
+			hotelRoom['pav'] = hotel_room_id
+			hotelRoomDays['pav'] = daystart + hotelRoomDays['pav']
 			'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!"'
 			act 'Step away from the reception desk': gt 'pav_hotel'
 			killvar 'totalCost'
@@ -180,9 +180,9 @@ if $ARGS[0] = 'pay_the_room':
 	if totalCost<=karta+bankDebtLimit:
 		act 'Pay with card':
 			cla
-			karta-=totalCost
-			hotelRoom['pav_hotel'] = hotel_room_id
-			hotelRoomDays['pav_hotel'] = daystart + hotelRoomDays['pav_hotel']
+			karta -= totalCost
+			hotelRoom['pav'] = hotel_room_id
+			hotelRoomDays['pav'] = daystart + hotelRoomDays['pav']
 			'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!" she says with a smile.'
 			act 'Step away from the reception desk': gt 'pav_hotel'
 			killvar 'totalCost'

locations/pav_park.qsrc

@@ -478,7 +478,7 @@ if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint'
 if (hour >= 20 or hour < 6) and (pcs_sleep <= 30 or cheatVars['sleep'] ! 0):
 	!! Will add a call that will tell if the player has a place to stay at in a given town/city.
 	pavlovsk_home = func('homes_properties', 'has_access', 'shared_apartment') or func('homes_properties', 'has_access', 'meynold_household') or func('homes_properties', 'has_access', 'parents_home') or func('homes_properties', 'has_access', 'lyceum_dorm')
-	if pavlovsk_home = 0 and workPTU <= 2 and HotelRoom < 1:
+	if pavlovsk_home = 0 and workPTU <= 2 and HotelRoom['pav'] < 1:
 		!nowhere to live in town
 		if money >= 500 or karta+bankDebtLimit >= 500:
 			'It''s pretty dark now. Maybe you could get a room in the hotel?'
@@ -488,7 +488,7 @@ if (hour >= 20 or hour < 6) and (pcs_sleep <= 30 or cheatVars['sleep'] ! 0):
 		if mid($start_type,1,2) = 'sg': 'You could also try your luck at Uncle Shulgin''s apartment?'
 	elseif pavlovsk_home = 1 and (hour >= 22 or hour < 6):
 		'It''s pretty dark outside and you feel tired. Maybe you should head home?'
-	elseif hotelRoom['pav_hotel'] > 0:
+	elseif hotelRoom['pav'] > 0:
 		'It''s pretty dark outside and you feel tired. Maybe you should head back to the hotel?'
 	else
 		'It''s pretty dark now and you feel tired. Maybe you should try sleeping on a bench?'

locations/pre_sleep_events.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''magb_event'' '
 		end
 
-		if nichGalaOpponent = 30 and hour <= 23 and hour >= 19 and nichDebug = 1:
+		if nichGalaOpponent = 30 and hour >= 19 and nichDebug = 1:
 			!! Start abduction
 			!! TODO
 			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''nichServentSleepEvents_handler'', 2 '
@@ -37,6 +37,10 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events_priority[] = 'gs ''pre_sleep_events'', ''nichServentSleepEvents_handler'', 1 '
 		end
 
+		if $loc = 'HotelRoom' and $loc_arg = 'therapist' and locat['A186'] = 2:
+			$sleep_events_priority[] = 'gs ''therapist_home'', ''pre_sleep'' '
+		end
+
 		if daystart > sleepVars['sleep_reflection_day']: gs 'sleep_reflections', 'event_check'
 
 		gt 'pre_sleep_events', 'mod_sleepevents'

locations/saveupdater.qsrc

@@ -1233,8 +1233,8 @@ if temp_current_save_version  < 00080503:
 		if i < 250: jump 'saveupdaterloop853_1'
 
 	if hotelroom1day ! 0:
-		hotelRoomDays['pav_hotel'] = hotelroom1day
-		hotelRoom['pav_hotel'] = hotelroom
+		hotelRoomDays['pav'] = hotelroom1day
+		hotelRoom['pav'] = hotelroom
 
 		killvar 'hotelroom1day'
 		hotelroom = 0
@@ -3160,7 +3160,27 @@ if temp_current_save_version < 00090205:
 	gs 'shortgs', 'remove_array_element', '$home_name', 'swamphouse'
 	gs 'shortgs', 'remove_array_element', '$home_name', 'swamp_yard'
 
-	!gs 'newspaper', 'cikl'
+	if arrsize('newspaperVars') = 0: gs 'newspaper', 'cikl'
+
+	if hotelroom['pav_hotel'] ! 0:
+		hotelroom['pav'] = hotelroom['pav_hotel']
+		gs 'shortgs', 'remove_array_element', 'hotelroom', 'pav_hotel'
+	end
+	if hotelroomDays['pav_hotel'] ! 0:
+		hotelroomDays['pav'] = hotelroomDays['pav_hotel']
+		gs 'shortgs', 'remove_array_element', 'hotelroomDays', 'pav_hotel'
+	end
+
+	if hotelroom['city_hotel'] ! 0:
+		hotelroom['city'] = hotelroom['city_hotel']
+		gs 'shortgs', 'remove_array_element', 'hotelroom', 'city_hotel'
+	end
+	if hotelroomDays['city_hotel'] ! 0:
+		hotelroomDays['city'] = hotelroomDays['city_hotel']
+		gs 'shortgs', 'remove_array_element', 'hotelroom', 'city_hotel'
+	end
+
+	if $hotel ! '': killvar '$hotel'
 end
 
 

locations/sex_ev_leave.qsrc

@@ -43,11 +43,9 @@ if $ARGS[0] = 'exit':
 		elseif $sex_ev['loc'] = 'hotel_room':
 			if sex_ev['hotel_days'] > 0:
 				if $region = 'pav':
-					$hotel = 'pav_hotel'
 					gs 'sex_ev_leave', 'ending'
 					gt 'HotelRoom', 'better'
 				elseif $region = 'city':
-					$hotel = 'city_hotel'
 					gs 'sex_ev_leave', 'ending'
 					gt 'HotelRoom', 'best'
 				end
@@ -153,11 +151,11 @@ if $ARGS[0] = 'ending':
 	
 	if sex_ev['hotel_days'] > 0:
 		if $region = 'pav':
-			hotelRoom['pav_hotel'] = 2
+			hotelRoom['pav'] = 2
 		elseif $region = 'city':
-			hotelRoom['city_hotel'] = 3
+			hotelRoom['city'] = 3
 		end
-		hotelRoomDays['<<$region>>_hotel'] = daystart + sex_ev['hotel_days']
+		hotelRoomDays[$region] = daystart + sex_ev['hotel_days']
 		hotelRoom['<<$region>>_room_service_free'] = 1
 	end
 	if $sex_ev['loc'] = 'pc_home' and $home['current'] = 'parents_home':

locations/stat.qsrc

@@ -887,23 +887,23 @@ if workFabrika = 1 and week => 1 and week <= 5 and hour > 8 and age => 16 and ag
 	FabrikaProgulDay = day
 end
 
-if hotelRoom['pav_hotel'] > 0:
-	if hotelRoomDays['pav_hotel'] - 1 = daystart:
+if hotelRoom['pav'] > 0:
+	if hotelRoomDays['pav'] - 1 = daystart:
 		$stat_msg += '<BR>You have 1 night left on your Pavlosk hotel booking.'
-	elseif hotelRoomDays['pav_hotel'] = daystart and hour < 11:
+	elseif hotelRoomDays['pav'] = daystart and hour < 11:
 		$stat_msg += '<BR>Your room at the Pavlosk hotel has check out today at 11:00'
-	elseif hotelRoomDays['pav_hotel'] = daystart:
-		hotelRoom['pav_hotel'] = 0
+	elseif hotelRoomDays['pav'] = daystart:
+		hotelRoom['pav'] = 0
 	end
 end
 
 if hotelRoom['city_hotel'] > 0:
-	if hotelRoomDays['city_hotel'] - 1 = daystart:
+	if hotelRoomDays['city'] - 1 = daystart:
 		$stat_msg += '<BR>You have 1 night left on your St Petersburg hotel booking.'
-	elseif hotelRoomDays['city_hotel'] = daystart and hour < 11:
+	elseif hotelRoomDays['city'] = daystart and hour < 11:
 		$stat_msg += '<BR>Your room at the St Petersburg hotel has check out today at 11:00'
-	elseif hotelRoomDays['city_hotel'] = daystart:
-		hotelRoom['city_hotel'] = 0
+	elseif hotelRoomDays['city'] = daystart:
+		hotelRoom['city'] = 0
 	end
 end
 

locations/therapist_home.qsrc

@@ -0,0 +1,279 @@
+# therapist_home
+
+!locat['A186'] = 1		<- therapist is at the clinic
+!locat['A186'] = 2		<- therapist is in the hotelroom
+
+
+if $ARGS[0] = 'hotel_enter':
+	if hotelarrive ! daystart:
+		hotel_arrive = daystart
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/arrive.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/arrive4.jpg"></center>'
+	end
+
+	if locat['A186'] = 2:
+		'You return to your hotel room where you and your husband live and see him working on his laptop. You remove all your clothes and kneel before him. He places a hand on your head before leaning in and kisses your lips.'
+	else
+		'You return to your hotel room where you and your husband live. You remove all your clothes without a second thought.'
+	end
+
+	if $clothingworntype ! 'nude':
+		gs 'clothing', 'strip'
+		gs 'underwear', 'remove'
+	end
+
+	act 'Continue': gt 'HotelRoom', 'therapist'
+end
+
+if $ARGS[0] = 'set_Hotelacts':
+	if hour > 22 and hour < 6:
+		if university['student'] = 1: act 'Study(1:00)': gt 'therapist_home', 'study'
+	else
+		act 'Play on your laptop': gt 'komp','start'
+		if locat['A186'] = 2: act 'Make love to you Husband': gt 'therapist_home', 'sex'
+		act 'Relax (1:00)': gt 'therapist_home', 'relax'
+	end
+end
+
+if $ARGS[0] = 'relax':
+	minut += 60
+	pcs_mood += 30
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_wait_tv.jpg"></center>'
+	'You lay down on the bed and relax for an hour.'
+
+	act 'Back': gt 'HotelRoom', 'therapist'
+end
+
+if $ARGS[0] = 'study':
+	minut += 60
+	gs 'exp_gain', 'intel', 2 + rand(0, drugVars['mentats_dose'])
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/shared/sex/sleep/hotel_wait_book.jpg"></center>'
+	'You sit down at the table and start to study your notes.'
+	'You an hour studying before you feel like you need a break.'
+
+	act 'Take a break': gt 'HotelRoom', 'therapist'
+	act 'Continue studying (1:00)':
+		*clr & cla
+		minut += 60
+		gs 'exp_gain', 'intel', 2 + rand(0, drugVars['mentats_dose'])
+		gs 'stat'
+
+		'You spend another hour studying before you feel like you need a break.'
+
+		act 'Take a break': gt 'HotelRoom', 'therapist'
+	end
+end
+
+
+if $ARGS[0] = 'wardrobe':
+	$loc = 'therapist_home'
+	$loc_arg = 'wardrobe'
+	if $ARGS[1] = 'start':
+		gt 'wardrobe', 'start'
+	else
+		if $clothingworntype ! 'nude':
+			hotelWiFi = 0
+			gt 'pav_hotel'
+		else
+			gt 'HotelRoom', 'therapist'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'shower':
+	menu_off = 1
+	minut += 10
+	gs 'stat'
+
+	'<center><video autoplay loop src="images/characters/pavlovsk/resident/therapist/hotel_shower1.mp4"></video></center>'
+	'You quickly shower before heading back out to the main room.'
+
+	noshampoo = 1
+	dynamic $showerdin
+	gs 'stat'
+
+	act 'Finish showering':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/naked.jpg"></center>'
+		act 'Leave the bathroom': gt 'HotelRoom', 'therapist'
+	end
+end
+
+if $ARGS[0] = 'cook':
+	minut += 20
+	menu_off = 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
+	'You walk to the kitchen area and make dinner for yourself and your husband. It''s a simple dinner with veggies and meat with potatoes.'
+
+	act 'Eat cooked food':
+		gs 'arousal', 'foreplay', 10, 'sub'
+		gs 'food', 'm_meal'
+		gs 'stat'
+
+		'You give him his plate and he gives your boob a squeeze before he eats and you sit on the bed behind him and eat yourself.'
+
+		act 'Finish eating': gt 'HotelRoom', 'therapist'
+	end
+end
+
+
+
+	!!=====================!!
+	!!                     !!
+	!!        SLEEP        !!
+	!!                     !!
+	!!=====================!!
+
+
+if $ARGS[0] = 'pre_sleep':
+	therapistQW['hotel_sleep_flag'] = 1
+	gt 'therapist_home', 'pre_sleep2'
+
+elseif $ARGS[0] = 'pre_sleep2':
+	if therapistQW['hotel_firstnight'] = 0: gt 'therapist_home', 'first_night'
+
+	'<center><img <<$set_imgh>> src="images/shared/sex/sleep/fondle1.jpg"></center>'
+	'You lay on your back under the covers trying to get some sleep.'
+	'During the night, you feel something that feels like someone is having sex with you.'
+	'Your husband is taking you while you sleep, as is his right as your man.'
+	act 'Continue': gs 'pre_sleep_events', 'event_end'
+
+elseif $ARGS[0] = 'wakeup':
+	if therapistQW['hotel_firstnight'] = 1: gt 'therapist_home', 'first_morning'
+	gt 'therapist_home', 'wakeup1'
+
+elseif $ARGS[0] = 'wakeup1':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_creampy2.jpg"></center>'
+	'You wake up in the morning and scoot off the bed.' 
+	'You move and stretch to remove the stiffness of sleep.'
+	'You feel your husband''s cum leak out of you as you make your way to the kitchen area and make your husband some eggs and bacon before you go clean up and start your day.'
+
+	act 'Cook breakfast': gs 'wakeup_events', 'exit' & gt 'therapist_home', 'cook'
+end
+
+
+if $ARGS[0] = 'sex':
+	gs 'boyStat', 'A186'
+	gs 'arousal', 'foreplay', -1
+	menu_off = 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/naked1.jpg"></center>'
+	'You lay down on the bed, squeezing your boobs in anticipation of your husband coming to you.'
+
+	act 'Continue':
+		*clr & cla
+		gs 'arousal', 'foreplay', 10, 'sub'
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/sex.jpg"></center>'
+		'Your husband walks over to the bed and lays next to you and starts to rub a hand over your breasts and gives them a squeeze.'
+		'He leans in and sucks on your nipples making you moan softly. He spends a few minutes nursing on your breasts and squeezing them before he gets between your legs and pushes into you.'
+
+		act 'Continue':
+			*clr & cla
+			gs 'arousal', 'vaginal', 20, 'sub'
+			gs 'arousal', 'foreplay', -20, 'sub'
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/sex2.jpg"></center>'
+			'Its not long before he''s making love to you, moaning your name all the while fondling you.' 
+
+			act 'Continue':
+				*clr & cla
+				gs 'arousal', 'vaginal', 5, 'sub'
+				gs 'cum_call', 0, 'A186', 2, 0, 15000, 60
+				gs 'arousal', 'end'
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_creampy2.jpg"></center>'
+				'He groans and you feel his seed enter your womb and then he lays his head on your breasts and starts to snore a little.'
+
+				act 'Go to sleep': gs 'shortgs', 'autosave' & gt 'pre_sleep', 'start'
+			end
+		end
+	end
+end
+
+
+
+
+
+
+
+if $ARGS[0] = 'first_night':
+	therapistQW['hotel_firstnight'] = 1
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/naked1.jpg"></center>'
+	'You lay down on the bed, as you have done all your life, ready to sleep the night away, when your husband joins you.'
+	act 'Continue':
+		*clr & cla
+		gs 'arousal', 'kiss', 10, 'sub'
+		gs 'arousal', 'foreplay', -10, 'sub'
+		gs 'arousal', 'vaginal', -5, 'sub'
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/sex.jpg"></center>'
+		'He starts to kiss your lips and neck while his hands move to your breasts. You return any kiss that is placed on your lips. It''s not long after starting that he is on top of you, his cock inside you, pumping away as if his life depends on it.'
+
+		act 'Continue':
+			*clr & cla
+			gs 'arousal', 'vaginal', 15, 'sub'
+			gs 'cum_call', 0, 'A186', 2, 0, 15000, 60
+			gs 'arousal', 'end'
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/sex2.jpg"></center>'
+			'You know deep down something is wrong but you only know that you are able to get off with him and accept his form of love. With each thrust inside you, you have a small orgasm. After a few minutes, you feel him dump a large load inside you and holds you close to him, not pulling out.'
+			'"We will be doing this every night, of every day, until one of us drops dead" he says more of a joke than anything. "You will be unable to sleep unless I am with you. You belong to me and no one else. Are we clear, My wife?" He orders. "You will be in my bed every night. If you are not, you will be punished in whatever way I see fitting"'
+
+			act 'Yes, sir':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_creampy2.jpg"></center>'
+				'"Good, now rest, for tomorrow, you will start your life as my wife" He says holding you to his chest and pulling a blanket over you two and you drift off to sleep.'
+				act 'Continue': gs 'pre_sleep_events', 'event_end'
+
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'first_morning':
+	therapistQW['hotel_firstnight'] = 2
+	pcs_energy = 100
+	pcs_hydra = 100
+
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/naked1.jpg"></center>'
+	'You wake up and see your husband already awake and working on something on his laptop. "Good Morning, Dear. How about you make us some breakfast?" he says and you slide out of bed and move over to the kitchenette and start to make him breakfast. While you hand him his plate of food, you hear a snap and you go blank.' 
+	'"My Wife, every morning you will wake up and make breakfast for Me and our children. I can handle lunch on my own, dinner too, but when we move to a larger place, you will be responsible for dinner too, Understand?" he says and you say in a monotone voice "Yes, Sir"'
+	'The snap is heard again and you blink for a moment. "You ok, wife?" he asks'
+	'You nod. "Yes, just drifted off" you reply'
+	'"Oh, well go take a shower and then go get some air" He orders'
+
+	act 'Take a Shower':
+		*clr & cla
+		'<center><video autoplay loop src="images/characters/pavlovsk/resident/therapist/hotel_shower1.mp4"></video></center>'
+		noshampoo = 1 
+		dynamic $showerdin
+		'You stand in the shower and let the water pour over you. You think about your life.'
+		'You are still a teenager and now you are married. You can''t recall how it all happened but you feel a bit worried but also happy. As if it''s just first-time jitters.'
+		'You finish up and get dressed. When you walk into the hotel room, you see that your husband has already left for the day, so you head out yourself.'
+
+		act 'Leave the Hotel':
+			gs 'underwear', 'wear'
+			gs 'clothes', 'wear_last_worn'
+			gs 'wakeup_events', 'exit'
+			gt 'pav_market'
+		end
+	end
+end
+
+
+--- therapist_home ---------------------------------

locations/therapist_hotel.qsrc

@@ -66,12 +66,6 @@ if $ARGS[0] = 'event1':
 		act 'Continue':
 			*clr & cla
 			minut += 2
-			$lastwornclothingtype['therapist'] = $clothingworntype
-			lastwornclothingnumber['therapist'] = clothingwornnumber
-			$lastwornpantytype['therapist'] = $pantyworntype
-			lastwornpantynumber['therapist'] = pantywornnumber
-			$lastwornbratype['therapist'] = $braworntype
-			lastwornbranumber['therapist'] = brawornnumber
 			dynamic $showerdin
 			gs 'stat'
 
@@ -148,9 +142,8 @@ end
 
 if $ARGS[0] = 'event1_morning':
 	dynamic $showerdin
-	gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-	gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-	gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+	gs 'underwear', 'wear'
+	gs 'clothing', 'wear_last_worn'
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'
@@ -217,12 +210,6 @@ end
 if $ARGS[0] = 'event2_shower':
 	gs 'boyStat', 'A186'
 	minut += 5
-	$lastwornclothingtype['therapist'] = $clothingworntype
-	lastwornclothingnumber['therapist'] = clothingwornnumber
-	$lastwornpantytype['therapist'] = $pantyworntype
-	lastwornpantynumber['therapist'] = pantywornnumber
-	$lastwornbratype['therapist'] = $braworntype
-	lastwornbranumber['therapist'] = brawornnumber
 	dynamic $showerdin
 	gs 'stat'
 
@@ -259,9 +246,8 @@ if $ARGS[0] = 'event2_shower':
 
 				dynamic $showerdin
 
-				gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-				gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-				gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+				gs 'underwear', 'wear'
+				gs 'clothing', 'wear_last_worn'
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_creampy2.jpg"></center>'
@@ -280,9 +266,8 @@ if $ARGS[0] = 'event2_shower':
 			minut += 5
 			therapistQW['escaped'] = 1
 
-			gs 'clothing', 'dispose', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-			gs 'panties', 'dispose', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-			gs 'bras', 'dispose', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+			gs 'underwear', 'wear'
+			gs 'clothing', 'wear_last_worn'
 
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 			'You don''t know why, but you feel this isn''t right. You can''t put your finger on why but this man isn''t your lover. As soon as you bite down hard on his cock, he screams out in pain. This wakes you up from your dreamlike state. Not sticking around, you grab a nearby robe and run out of the hotel room and into the night.'
@@ -304,12 +289,6 @@ if $ARGS[0] = 'event3':
 	act 'Yes Sir':
 		*clr & cla
 		minut += 2
-		$lastwornclothingtype['therapist'] = $clothingworntype
-		lastwornclothingnumber['therapist'] = clothingwornnumber
-		$lastwornpantytype['therapist'] = $pantyworntype
-		lastwornpantynumber['therapist'] = pantywornnumber
-		$lastwornbratype['therapist'] = $braworntype
-		lastwornbranumber['therapist'] = brawornnumber
 		gs 'clothing', 'strip'
 		gs 'stat'
 
@@ -349,9 +328,8 @@ if $ARGS[0] = 'event3':
 
 					dynamic $showerdin
 
-					gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-					gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-					gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+					gs 'underwear', 'wear'
+					gs 'clothing', 'wear_last_worn'
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -384,15 +362,8 @@ end
 if $ARGS[0] = 'event4':
 	menu_off = 1
 	minut += 2
-	gs 'stat'
-
-	$lastwornclothingtype['therapist'] = $clothingworntype
-	lastwornclothingnumber['therapist'] = clothingwornnumber
-	$lastwornpantytype['therapist'] = $pantyworntype
-	lastwornpantynumber['therapist'] = pantywornnumber
-	$lastwornbratype['therapist'] = $braworntype
-	lastwornbranumber['therapist'] = brawornnumber
 	gs 'clothing', 'strip'
+	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'
 	'You arrive at the hotel room on another Saturday night. You walk in like you own the place and strip down and take a shower. You spend a few minutes cleaning up and come out wearing only a towel, and you see the therapist watching TV.'
@@ -446,9 +417,8 @@ if $ARGS[0] = 'event4':
 				therapistQW['hotel_left'] += 1
 				gs 'willpower', 'pay', 'medium'
 
-				gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-				gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-				gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+				gs 'underwear', 'wear'
+				gs 'clothing', 'wear_last_worn'
 				gs 'stat'
 
 				'<center><video autoplay loop <<$set_imgh>> src="images/pc/activities/misc/dress_<<rand(1, 2)>>.mp4"></video></center>'
@@ -483,9 +453,8 @@ if $ARGS[0] = 'event4_post_wait':
 
 		dynamic $showerdin
 
-		gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-		gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-		gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+		gs 'underwear', 'wear'
+		gs 'clothing', 'wear_last_worn'
 		gs 'stat'
 		
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better1.jpg"></center>'
@@ -499,15 +468,8 @@ if $ARGS[0] = 'event5_submit':
 	gs 'boyStat', 'A186'
 	menu_off = 1
 	minut += 2
-	gs 'stat'
-
-	$lastwornclothingtype['therapist'] = $clothingworntype
-	lastwornclothingnumber['therapist'] = clothingwornnumber
-	$lastwornpantytype['therapist'] = $pantyworntype
-	lastwornpantynumber['therapist'] = pantywornnumber
-	$lastwornbratype['therapist'] = $braworntype
-	lastwornbranumber['therapist'] = brawornnumber
 	gs 'clothing', 'strip'
+	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_undressed_knee.jpg"></center>'
 	'After another Saturday night in the hotel room, you feel flushed when you see your therapist. Your heart feels like it''s pounding a million miles a second. When he stands up in his robe, you see his cock and your mind goes blank. "Wife, welcome back." He walks up to you and kisses your lips and squeezes your chest. "Now, every time you come into this room, you will no longer enter a trance and you will stay, as my lover, you will be wet and ready as you want me but will wait for me to start anything. You will also strip down to nothing and will not want to wear clothing while you are here with me." He commands. "When I say the phrase, ‘My dear’, you will do whatever I command you while you are awake. Do you understand?" he asks, planting more triggers in your mind.'
@@ -583,9 +545,8 @@ if $ARGS[0] = 'event5_submit':
 							therapistQW['hotel_visits'] += 1
 							dynamic $showerdin
 
-							gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-							gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-							gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+							gs 'underwear', 'wear'
+							gs 'clothing', 'wear_last_worn'
 							gs 'stat'
 
 							gt 'pav_market'
@@ -608,9 +569,8 @@ if $ARGS[0] = 'event5_submit':
 		'<center><font color="red"> ***Therapist is no longer an option for now*** </font></center>'
 
 		act 'Get dressed and leave':
-			gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-			gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-			gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+			gs 'underwear', 'wear'
+			gs 'clothing', 'wear_last_worn'
 			gs 'stat'
 
 			gt 'pav_market'
@@ -623,13 +583,6 @@ if $ARGS[0] = 'event6_submit':
 	menu_off = 1
 	minut += 2
 	therapistQW['hotel_visits'] += 1
-
-	$lastwornclothingtype['therapist'] = $clothingworntype
-	lastwornclothingnumber['therapist'] = clothingwornnumber
-	$lastwornpantytype['therapist'] = $pantyworntype
-	lastwornpantynumber['therapist'] = pantywornnumber
-	$lastwornbratype['therapist'] = $braworntype
-	lastwornbranumber['therapist'] = brawornnumber
 	gs 'clothing', 'strip'
 
 	dynamic $showerdin
@@ -669,9 +622,8 @@ if $ARGS[0] = 'event6_submit':
 				'"Good, Now finish up with your current task so you can tell your parents or loved ones the news. Tell them whatever you want, but tell them you are moving out."'
 				'He says and cums into your mouth. You drink and swallow every drop. He lets you up and you get dressed. Without saying anything, you leave the motel and head home.'
 				act 'Continue': 
-					gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-					gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-					gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+					gs 'underwear', 'wear'
+					gs 'clothing', 'wear_last_worn'
 					gs 'stat'
 
 					gt 'therapist_hotel', 'event6_submit2'
@@ -683,9 +635,8 @@ if $ARGS[0] = 'event6_submit':
 			'He helps you to your feet and tells you to get dressed and leave. "I expect you to sign it the next time I see you" he says. You dress and leave.'
 			act 'Leave':
 				minut += 5
-				gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-				gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-				gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+				gs 'underwear', 'wear'
+				gs 'clothing', 'wear_last_worn'
 				gs 'stat'
 
 				gt 'pav_market'
@@ -756,13 +707,6 @@ end
 if $ARGS[0] = 'event6_submit3':
 	gs 'boyStat', 'A186'
 	minut += 20
-
-	$lastwornclothingtype['therapist'] = $clothingworntype
-	lastwornclothingnumber['therapist'] = clothingwornnumber
-	$lastwornpantytype['therapist'] = $pantyworntype
-	lastwornpantynumber['therapist'] = pantywornnumber
-	$lastwornbratype['therapist'] = $braworntype
-	lastwornbranumber['therapist'] = brawornnumber
 	gs 'clothing', 'strip'
 	gs 'stat'
 
@@ -826,13 +770,12 @@ end
 
 if $ARGS[0] = 'event6_submit4':
 	minut += 5
-	gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-	gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-	gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
+	gs 'underwear', 'wear'
+	gs 'clothing', 'wear_last_worn'
 	gs 'stat'
 
-	HotelRoom['pav_hotel'] = 0
-	hotelRoomDays['pav_hotel'] = 0
+	HotelRoom['pav'] = 0
+	hotelRoomDays['pav'] = 0
 	therapistQW['hotel_key'] = 3
 	gs 'homes_properties', 'set_home', 'hotel_therapist'
 

locations/wakeup_events.qsrc

@@ -41,6 +41,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events_priority[] = 'gs ''wakeup_events'', ''trans_little_shocked'' '
 		end
 
+		if therapistQW['hotel_sleep_flag'] = 1:
+			therapistQW['hotel_sleep_flag'] = 0
+			$sleep_events_priority[] = 'gs ''therapist_home'', ''wakeup'' '
+		end
+
 
 		if mid($start_type, 1, 2) = 'sg' and sleepVars['slept_in'] = 1 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and suspended['on'] ! 1:
 			if (hour = 7 or hour = 8):
@@ -48,7 +53,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			elseif hour >= 9 and hour < 14:
 				$sleep_events_priority[] = 'gs ''wakeup_events'', ''sg_slept_in'' '
 			end
-			
 		end
 
 		xgt 'wakeup_events', 'mod_sleepevents'