Browse Source

Added a better way to check for company and blockers when home.

netuttki 1 năm trước cách đây
mục cha
commit
4d7dce863a

+ 1 - 2
locations/bedrPar.qsrc

@@ -261,10 +261,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			if gobelen > 0: 'You have <<gobelen>> completed tapestries.'
 		end
 
+		if locat['Anya_inroom']: gs 'music_actions', 'not_alone'
 		gs 'music_actions', 'start'
 
-		 !! if ml_delparcoQW['Stage'] > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
-
 		if locat['Anya_inroom'] = 0 and breastpump = 1 and bp_unbox <= 0:
 			'<a hlpf="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
 		elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:

+ 2 - 1
locations/city_mansion_residence_2.qsrc

@@ -251,7 +251,8 @@ if $ARGS[0] = 'yoffice':
 		'Your work room where you spend most of the time signing important papers and handling your business needs.'
 		'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your antique <a href="exec:gt ''stol'', ''start''">desk</a>.'
 
-		gs 'music_actions', 'start'
+	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_action', 'not_alone' should be added with the correct conditions.
+	gs 'music_actions', 'start'
 		
 	end
 end

+ 2 - 0
locations/dachain.qsrc

@@ -57,7 +57,9 @@ if $args[0] = 'start':
 !!------------------------------------------------------- Music related actions come here ---------------------------------------------
 !!-------------------------------------------------------------------------------------------------------------------------------------
 
+	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_action', 'not_alone' should be added with the correct conditions.
 	gs 'music_actions', 'start'
+	
 end
 
 if $args[0] = 'dachakit':

+ 3 - 0
locations/sitr.qsrc

@@ -63,9 +63,12 @@ gs 'exercise', 'start'
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'<a href="exec:gt ''husb'', ''start''">Your husband sits on the couch and watches television.</a>'
+		gs 'music_action', 'not_alone'
 	end
 end
 
+if husband > 0 and husbandrinkday = daystart and hour >= 20 and hour <= 23: gs 'music_actions', 'no_music'
+
 gs 'music_actions', 'start'
 
 act 'Go out on the balcony': gt 'balkon','start'