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/city_nightclub.qsrc

@@ -209,8 +209,7 @@ if $ARGS[0] = 'dance':
 			if clrand > 0:
 				if clrand < 5:
 					gs 'arousal', 'foreplay', 1
-					gs 'npcgeneratec', 0, '', rand(18,55), rand(3,4)
-					gs 'boystat', $npclastgenerated
+					gs 'boygirl', 0
 					'As you''re dancing, you feel someone groping your ass. You turn around and see <<$boybody_pref>>, <<$boybod>> guy with <<$boyface>> hair. He''s <<$boyClo>>'
 					act 'Stop dancing': gt 'city_nightclub', 'inside'
 					act 'Dance with him': gt 'city_nightclub', 'dance_guy'
@@ -455,8 +454,6 @@ if $ARGS[0] = 'bar':
 			'You''re so drunk that you can barely remember where you live.'
 			
 			act 'Try to go home': gt 'city_residential'
-			killvar 'temp'
-			exit
 		elseif temp = 7:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand4.jpg"></center>'
@@ -471,8 +468,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 			
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 8:
 			pcs_horny += 5
 			gs 'stat'
@@ -481,8 +476,6 @@ if $ARGS[0] = 'bar':
 			'You''re too drunk to continue partying and security has to escort you out.'
 			
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 9:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand6.jpg"></center>'
@@ -493,8 +486,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 			
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 10:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand7.jpg"></center>'
@@ -505,8 +496,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 			
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 11:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand8.jpg"></center>'
@@ -517,8 +506,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 12:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand9.jpg"></center>'
@@ -529,8 +516,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 13:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand10.jpg"></center>'
@@ -541,8 +526,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 14:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand11.jpg"></center>'
@@ -553,8 +536,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 15:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand12.jpg"></center>'
@@ -565,8 +546,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 16:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club13.jpg"></center>'
@@ -577,8 +556,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 17:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club14.jpg"></center>'
@@ -589,8 +566,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 18:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand15.jpg"></center>'
@@ -601,8 +576,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 19:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand16.jpg"></center>'
@@ -613,8 +586,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 20:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand17.jpg"></center>'
@@ -625,8 +596,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 21:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club21.jpg"></center>'
@@ -637,8 +606,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 22:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club22.jpg"></center>'
@@ -649,8 +616,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 23:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club23.jpg"></center>'
@@ -661,8 +626,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp = 24:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club24.jpg"></center>'
@@ -673,8 +636,6 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		elseif temp > 24:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club25.jpg"></center>'
@@ -685,10 +646,9 @@ if $ARGS[0] = 'bar':
 			gs 'stat'
 
 			act 'Leave': gt 'city_center'
-			killvar 'temp'
-			exit
 		end
 		killvar 'temp'
+		exit
 	end
 end
 
@@ -696,8 +656,7 @@ if $ARGS[0] = 'sex':
 	*clr & cla
 	menu_off = 1
 	gs 'dinSex', 'std_trigger_oral'
-	gs 'npcgeneratec', 0, 'stranger from the club', rand(18,26)
-	gs 'boyStat', $npclastgenerated
+	gs 'boygirl', 0
 	dick = rand(10, 18)
 	gs 'stat'
 	'<center><b><font color="maroon">toilet stall</font></b></center>'

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/post_office.qsrc

@@ -1,6 +1,6 @@
 # post_office
 
-if $ARGS[1] = 'leave':
+if $ARGS[0] = 'leave':
 	if $region = 'city':
 		gt 'city_center'
 	else
@@ -161,7 +161,7 @@ if $ARGS[0] = 'start':
 	if $region = 'pav': act 'Go to the Postmaster''s office': gt 'post_master', 'start'
 end
 
-if $ARGS[1] = 'counter':
+if $ARGS[0] = 'counter':
 	*clr & cla
 	$menu_loc = 'post_office'
 	$menu_arg = 'counter'
@@ -372,7 +372,7 @@ end
 
 !! Not used for Pav, maybe use for city?
 !! Not used currently
-if $ARGS[1] = 'post_off':
+if $ARGS[0] = 'post_off':
 	*clr & cla
 	menu_off = 1
 	minut += 30

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