Merge remote-tracking branch 'Lusticon/master'

locations/LOCA.qsrc

@@ -7,7 +7,6 @@ if debug['trace_loc_change'] = 1:
 end
 
 if settingmode = 0: killvar 'cheatmenu'
-gs 'music_actions', 'clear_restrictions'
 
 !{
 msg "Changed Location 

locations/bedr.qsrc

@@ -38,6 +38,7 @@ if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your b
 *nl
 act 'Go to the corridor': gt 'korr'
 
+gs 'music_actions', 'clear_restrictions'
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your drunken husband sleeps on the bed with a butt plug up his ass.'
 	if husbanstrapon = 2:'Your drunken husband sleeps on the bed after you put a dildo up his ass.'

locations/bedr2x.qsrc

@@ -30,15 +30,16 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 *nl
 if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 *nl
+act 'Go to the corridor': gt 'korr2x'
+gs 'wardrobe', 'default_clothing_options'
+
+gs 'music_actions', 'clear_restrictions'
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk after you used an anal plug on him.'
 	if husbanstrapon = 2:'Your husband is still passed out drunk after you stuck a dildo in his ass.'
 	if husbanstrapon = 3:'Your husband is still passed out drunk after you fucked him in the ass with a strap-on.'
 	gs 'music_actions', 'no_music'
 end
-act 'Go to the corridor': gt 'korr2x'
-gs 'wardrobe', 'default_clothing_options'
-
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if hour > 22 or hour < 7:
 		'Your <a href="exec: gt''husb'',''start'' ">husband</a> is sleeping on the bed.'

locations/bedrPar.qsrc

@@ -282,6 +282,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Computer, music and internet use.
+			gs 'music_actions', 'clear_restrictions'
 			gs 'internet_mobile', 'get_access'
 			if locat['Anya_inroom'] = 1:
 				gs 'music_actions', 'not_alone'

locations/music_actions.qsrc

@@ -7,23 +7,27 @@ if $ARGS[0] = 'music_icon':
         'You are too drunk to stream or record music without messing up or throwing up into your guitar.'
     !! $location_type = ''public_outdoors'' means parks, streets. Some event types can be placed in these locations : playing music, recording music - e.g in front of
     !! the library, or at the church, etc. 
-    elseif $location_type = 'private' or ($location_type = 'public_outdoors' and sunWeather = 1 and temper > 15) and ml_no_music = 0:        
-        if hour < 8: 
-            'It''s too early to do anything noisy like playing the guitar or singing.'
-        elseif hour > 22:
-            'It''s too late to do anything noisy like playing the guitar or singing.'
-        else
-            if ml_settings['its_me'] = 1: 
-                if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
-                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
+    else
+        if ($location_type = 'private' or ($location_type = 'public_outdoors' and sunWeather = 1 and temper > 15)) and ml_no_music = 1: gs 'music_actions', 'clear_restrictions'
+
+        if ml_no_music = 0:
+            if hour < 8: 
+                'It''s too early to do anything noisy like playing the guitar or singing.'
+            elseif hour > 22:
+                'It''s too late to do anything noisy like playing the guitar or singing.'
+            else
+                if ml_settings['its_me'] = 1: 
+                    if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
+                        pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
+                    else
+                        pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+                    end
                 else
-                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+                    act 'Available musical activities': gs 'music_actions', 'start'
                 end
-            else
-                act 'Available musical activities': gs 'music_actions', 'start'
             end
+            if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
         end
-        if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
     end
 end
 

locations/sitr.qsrc

@@ -62,13 +62,13 @@ gs 'exercise', 'start'
 !!housegostrand = rand(1, 20)
 !!if husband > 0 and husbandrink ! 10 and week = 5 and hour > 17 and hour < 21 and housegostrand > 15: gt 'sitr', 'guest'
 
+gs 'music_actions', 'clear_restrictions'
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'Your <a href="exec:gt ''husb'', ''start''">husband</a> is sitting on the couch, watching television.'
 		gs 'music_actions', 'not_alone'
 	end
 end
-
 if husband > 0 and husbandrinkday = daystart and hour >= 20 and hour <= 23: gs 'music_actions', 'no_music'
 
 gs 'music_actions', 'music_icon'

locations/sitr2x.qsrc

@@ -53,13 +53,13 @@ gs 'exercise', 'start'
 !housegostrand = rand(1,20)
 !if week = 5 and hour > 17 and hour < 21 and housegostrand > 15 and husband > 0 and husbandrink ! 10:gt'sitr2x','guest'
 
+gs 'music_actions', 'clear_restrictions'
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'Your <a href="exec: gt''husb'',''start'' ">husband</a> is sitting on the couch watching television.'
 		gs 'music_actions', 'not_alone'
 	end
 end
-
 if husband > 0 and husbandrinkday = daystart and hour >= 20 and hour <= 23: gs 'music_actions', 'no_music'
 
 gs 'music_actions', 'music_icon'

locations/uni_dorm.qsrc

@@ -1015,6 +1015,7 @@ if $ARGS[0] = 'dorm_room':
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	if mc_inventory['mag_porn'] > 0: 'You''ve hidden your porn magazines under the mattress of your bed.'
 	
+	gs 'music_actions', 'clear_restrictions'
 	vika_inroom = 0 & vika_sleep = 0
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_inroom = 1