[change] Can now sit on parent's living room sofa when family are in the room. Can only masturbate, read porn, and exercise when family aren't in the room.

locations/family

@@ -119,24 +119,24 @@ if StoryLine = 1:
 			end
 		end
 
-		if $loc = 'sitrPar':
+		 if $loc = 'sitrPar' or ($loc = 'family' and $metka = 'sofa'):
 			if hour < 7 or hour >= 21:
 				ocpd_room = 1
-				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the couch.'
+				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
 			end
 
 			if week < 6:
 				if father_go = 0:
 					if hour >= 16 and hour < 21:
 						ocpd_room = 1
-						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
 					end
 				end
 
 				if hour >= 18 and hour < 20:
 					if kanikuli > 0:
 						ocpd_room = 1
-						'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
+						'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, watching TV.'
 					else
 						ocpd_room = 1
 						'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
@@ -144,7 +144,7 @@ if StoryLine = 1:
 				end
 				if hour = 20:
 					ocpd_room = 1
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, watching TV.'
 				end
 			end
 
@@ -152,18 +152,18 @@ if StoryLine = 1:
 				if father_go = 0:
 					if hour >= 7 and hour < 21:
 						ocpd_room = 1
-						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
 					end
 				else
 					if hour >= 7 and hour < 16:
 						ocpd_room = 1
-						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the couch, watching TV.'
+						'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
 					end
 				end
 
 				if hour >= 18 and hour <= 20:
 					ocpd_room = 1
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the couch, watching TV.'
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, watching TV.'
 				end
 			end
 		end
@@ -198,11 +198,54 @@ if StoryLine = 1:
 	end
 end
 
-if $loc = 'sitrPar' and ocpd_room = 0:
+if $loc = 'sitrPar':
+	act 'Sit on the sofa':gt 'family', 'sofa'
+end
+
+ if $loc = 'sitrPar' and ocpd_room = 0:
 	'No one else is here right now, so I''m free to use the room how I like.'
-	act 'Sit on the sofa bed':gt 'sitrPar', 'sofa'
 	gs 'exercise','start'
 end
 
+if $ARGS[0]='sofa':
+	$metka = 'sofa'
+	$loc = 'family'
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sofa.jpg"></center>'
+	''
+	'<center>A small sofa bed, when not folded out into a bed, is just big enough for you to curl up on and take a nap.</center>'
+	''
+	act 'Watch TV':gt 'TV','pav'
+
+	if ocpd_room = 0 and pornMagazine > 0:
+		'<br>There is a porn magazine under the sofa cushions'
+		gs 'events', 'read_porn'
+		if pcs_horny >= 50:
+			act 'Masturbate':gt 'selfplay', 'start'
+		end
+	end
+
+	gs 'events', 'read'
+	gs 'family'
+
+	if ocpd_room = 0:
+		act 'Take a nap (1:00)':
+			if pcs_sleep < 90:
+				pcs_sleep += 10
+				pcs_health += 5
+				minut += 60
+				gs 'stat'
+				'You sleep about an hour.'
+			else
+				minut += 5
+				gs 'stat'
+				'You are not tired enough to sleep, even for a short nap.'
+			end
+		end
+	end
+	act 'Get up':gt 'sitrPar'
+end
+
 --- family ---------------------------------
 

locations/sitrPar

@@ -21,7 +21,8 @@ end
 '<center><b><font color="maroon">Living Room</font></b></center>'
 ! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
-'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a sofa bed, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
+''
+'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a <a href="exec:gt ''family'',''sofa''">sofa bed</a>, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
 gs 'family'
 gs 'subkid'
 
@@ -70,40 +71,5 @@ elseif month = 1 and day = 1:
 	end
 end
 
-if $ARGS[0]='sofa':
-	$metka = 'sofa'
-	$loc = 'sitrPar'
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sofa.jpg"></center>'
-	'<center>A small sofa bed, when not unfolded, is just big enough for you to curl up on and take a nap.</center>'
-
-	act 'Watch TV':gt 'TV','pav'
-
-	if pornMagazine > 0:'<br>There is a porn magazine under the sofa cushions'
-
-	gs 'events', 'read_porn'
-	gs 'events', 'read'
-
-	if pcs_horny >= 50:
-		act 'Masturbate':gt 'selfplay', 'start'
-	end
-
-	act 'Take a nap (1:00)':
-		if pcs_sleep < 90:
-			pcs_sleep += 10
-			pcs_health += 5
-			minut += 60
-			gs 'stat'
-			'You sleep about an hour.'
-		else
-			minut += 5
-			gs 'stat'
-			'You are not tired enough to sleep, even for a short nap.'
-		end
-	end
-	act 'Get up':gt 'sitrPar'
-end
-
 --- sitrPar ---------------------------------