Merge remote-tracking branch 'NOX/master'

locations/bedrPar.qsrc

@@ -340,7 +340,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Streaming music
-			if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+			if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
 				ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 
 				if pcs_inhib < 30:
@@ -370,7 +370,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Recording music
-			if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+			if ml_guitar['hasguitar'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 				if pcs_inhib < 20:
 					if pcs_inhib < 10:
 						$diff = 'medium'

locations/music_buskingevents.qsrc

@@ -52,6 +52,7 @@ if $ARGS[0] = 'calculate_tips':
 		ml_location_mod = 15
 	end 	
 
+	ml_time_mod = 5
 	if week >= 5: ml_time_mod += 10
 	if hour >= 17: ml_time_mod += 10
 		

locations/sitr.qsrc

@@ -152,7 +152,7 @@ if hour > 8 and hour < 22:
 	end
 
 	!! Streaming music 
-	if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+	if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
 		ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 
 		if pcs_inhib < 30:
@@ -182,7 +182,7 @@ if hour > 8 and hour < 22:
 	end
 
 	!! Recording music
-	if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+	if ml_guitar['hasguitar'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 		if pcs_inhib < 20:
 			if pcs_inhib < 10: 
 				$diff = 'medium'