Changed variable names

locations/bedrPar.qsrc

@@ -307,7 +307,7 @@ if hour > 8 and hour < 22:
 		end
 	end
 
-	if ml_guitar['hasguitar'] = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performed_minutes < ml_maxperform_minutes and alko < 5:
+	if ml_guitar['hasguitar'] = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 		if sisterHere = 1 and pcs_inhib < 30:
 			if pcs_inhib < 10: 
 				$diff = 'hard'
@@ -334,8 +334,8 @@ 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_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
-		ml_streamtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
+	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:
+		ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 
 		if pcs_inhib < 30:
 			if pcs_inhib < 10: 
@@ -364,7 +364,7 @@ if hour > 8 and hour < 22:
 	end
 
 	!! Recording music
-	if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performed_minutes < ml_maxperform_minutes and alko < 5:
+	if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 		if pcs_inhib < 20:
 			if pcs_inhib < 10: 
 				$diff = 'medium'

locations/cikl.qsrc

@@ -1863,8 +1863,8 @@ end
 !! How many hours a day can Sveta perform. It maxes out at 3.
 !! Using the actual skill level, not the one modified by Attributes because that is more realistic for this.
 
-ml_maxperform_minutes = instrmusic_lvl + vokal_lvl
-ml_performed_minutes = 0
+ml_performance['max_perform_minutes'] = instrmusic_lvl + vokal_lvl
+ml_performance['performed_minutes'] = 0
 
 
 !! Calculating the fame increase from the uploaded songs and removing ones that do not effect fame anymore to keep the 

locations/city_center.qsrc

@@ -101,10 +101,10 @@ if shantpopala > 0:
 	exit
 end
 
-if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
+if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
 	*nl
 	'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
-	ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)	
+	ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)	
 	if pcs_inhib < 30: 
 		if pcs_inhib < 10: 
 			$diff = 'hard'

locations/city_park.qsrc

@@ -181,10 +181,10 @@ if $ARGS[0] = 'start':
 	end
 
 
-	if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
+	if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
 		*nl
 		'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
-		ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
+		ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 		if pcs_inhib < 30: 
 			if pcs_inhib < 10: 
 				$diff = 'hard'

locations/dachain.qsrc

@@ -59,7 +59,7 @@ if $args[0] = '':
 	end
 
 	!!Guitar practice 
-	if ml_guitar['hasguitar'] = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performed_minutes <= ml_maxperform_minutes:
+	if ml_guitar['hasguitar'] = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performance['performed_minutes'] <= ml_performance['max_perform_minutes']:
 		act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
 	end
 			
@@ -68,7 +68,7 @@ if $args[0] = '':
 	end
 
 	!! Streaming music 
-	if ml_online['account'] = 1 and internet > 0 and ml_performed_minutes <= ml_maxperform_minutes:
+	if ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] <= ml_performance['max_perform_minutes']:
 		if pcs_inhib < 30:
 			if pcs_inhib < 10: 
 				$diff = 'hard'
@@ -96,7 +96,7 @@ if $args[0] = '':
 	end
 
 	!! Recording music
-	if ml_performed_minutes <= ml_maxperform_minutes:
+	if ml_performance['performed_minutes'] <= ml_performance['max_perform_minutes']:
 		if pcs_inhib < 20:
 			if pcs_inhib < 10: 
 				$diff = 'medium'

locations/liames.qsrc

@@ -95,10 +95,10 @@ if rand(1,100) >= 95:
 	act 'Continue': gt'liames'
 end
 
-if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
+if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
 	*nl
 	'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
-	ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
+	ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 	if pcs_inhib < 30: 
 		if pcs_inhib < 10: 
 			$diff = 'hard'

locations/music_bedroompractice.qsrc

@@ -3,8 +3,11 @@
 if $ARGS[0] = 'guitar':
 	*clr & cla
 	minut += 30
-	ml_performed_minutes += 15
+	ml_performance['performed_minutes'] += 15
+	ml_performance['total_time_performed'] += 15	
 	pcs_mood += 5
+	gt 'stat'
+
 	'<center><img <<$set_imgh>> src="images/pc/activities/music/guitarpractice_1.jpg"></center>'
 	if ml_guitarlessoncount = 0 and ml_chordbook = 1 and instrmusic_lvl <= 10:
 		gs 'pain', 1, 'fingers', 'ache'
@@ -36,7 +39,10 @@ if $ARGS[0] = 'practice_repertoire':
 	*clr & cla	
 	minut += 30
 	pcs_mood += 5
-	ml_performed_minutes += 30
+	ml_performance['performed_minutes'] += 30
+	ml_performance['total_time_performed'] += 30
+	gs 'stat'
+	
 	'<center><img <<$set_imgh>> src="images/pc/activities/music/guitarpractice_1.jpg"></center>'
 	if ml_repertoire_quality < 85:
 		instrmusic_exp += rand(1,3)

locations/music_buskingevents.qsrc

@@ -16,7 +16,8 @@ if $ARGS[0] = 'busking':
 	
 	dynamic '<<$ARGS[1]>>_music += rand(0,3)'
 	
-	ml_performed_minutes += ml_buskingtime
+	ml_performance['total_time_performed'] += ml_buskingtime
+	ml_performance['performed_minutes'] += ml_buskingtime
 	ml_busking['busking_count'] += 1
 	ml_busking['busking_time'] += ml_buskingtime
 	ml_busking['total_earnings'] += ml_tipsearned

locations/music_delparco.qsrc

@@ -84,12 +84,16 @@ if $ARGS[0] = 'acceptafterthinking':
 end	
 
 if $ARGS[0] = 'eveningshow':
+	minut += 60
 	ml_correction_chance = ml_repertoire_quality + ((hotcat - 5)*3) + (pcs_perform/10)
 	ml_success = rand(0,100)
 	instrmusic_exp = rand(1,2)
 	vokal_exp = rand(1,2)
+	ml_performance['performed_minutes'] += 30
+	ml_performance['total_time_performed'] += 30
+
 	if perform_lvl < 45 = rand(1,3)	
-	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosanalregularhurt.mp4"></video></center>'
+	'<center><video autoplay loop src="images/pc/activities/music/GigPlaceHolder.mp4"></video></center>'
 !!TODO: More scene, on set up, arriving, etc.	
 	if ml_success < ml_repertoire_quality: 
 		pav_music += rand(1,5)

locations/music_onlinemusic.qsrc

@@ -42,7 +42,8 @@ if $ARGS[0] = 'liveStream':
 
 		ml_streaming['livestreamcount'] += 1
 		ml_streaming['lastday'] = daystart
-		ml_performed_minutes += ml_streamtime
+		ml_performance['performed_minutes'] += ml_streamtime
+		ml_performance['total_time_performed'] += ml_streamtime
 		ml_streaming['total_earnings'] += ml_superchats		
 		ml_streaming['unclaimed_earnings'] += ml_superchats
 		
@@ -95,7 +96,8 @@ if $ARGS[0] = 'recordSong':
 	
 	vokal_exp += rand(1,4)	
 	if perform_lvl < 35: perform_exp += rand(1,3)
-	ml_performed_minutes += 15
+	ml_performance['performed_minutes'] += 15
+	ml_performance['total_time_performed'] += 15
 
 	ml_onlinesong_hotcat[ml_onlinesongcount] = hotcat
 	if ml_guitar['hasguitar'] = 1:
@@ -153,7 +155,8 @@ if $ARGS[0] = 'recordAndEditSong':
 	vokal_exp += rand(1,3)	
 	if perform_lvl < 35: perform_exp += rand(1,3)	
 	if musicprod_lvl < 35: musicprod_exp += rand(1,3)
-	ml_performed_minutes += 15
+	ml_performance['performed_minutes'] += 15
+	ml_performance['total_time_performed'] += 15
 
 	ml_onlinesong_hotcat[ml_onlinesongcount] = hotcat
 	if ml_guitar['hasguitar'] = 1:

locations/pav_commercial.qsrc

@@ -144,10 +144,10 @@ act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 
-if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
+if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
 	*nl
 	'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
-	ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
+	ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 	if pcs_inhib < 30: 
 		if pcs_inhib < 10: 
 			$diff = 'hard'

locations/pav_park.qsrc

@@ -170,10 +170,10 @@ if $ARGS[0] = 'start':
 	end
 
 
-	if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performed_minutes < ml_maxperform_minutes and ml_maxperform_minutes >= 15:
+	if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitar['carried'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
 		*nl
 		'With the weather being pleasant and sunny, the parks is full of people enjoying the weather. You could play some music, practice performing songs and maybe make some money too.'
-		ml_buskingtime =  min((ml_maxperform_minutes-ml_performed_minutes), 60)
+		ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 		
 		if pcs_inhib < 30: 
 			if pcs_inhib < 10: 

locations/saveupdater.qsrc

@@ -811,5 +811,19 @@ if gruptipe[9000] = 0:
 end
 !!--------0.8.0.1---school social group adjustment
 
+
+!!--------0.8.1--- Music variable names changed
+ml_guitar['carried'] = ml_guitarWithMe
+ml_guitar['hasguitar'] = ml_guitar
+ml_performance['performed_minutes'] = ml_performed_minutes
+ml_performance['max_perform_minutes'] = ml_max_perform_minutes
+
+killvar 'ml_guitarWithMe'
+killvar 'ml_guitar'
+killvar 'ml_performed_minutes'
+killvar 'ml_max_perform_minutes'
+!!--------0.8.1--- Music variable names changed
+
+
 --- saveupdater ---------------------------------
 

locations/sitr.qsrc

@@ -105,7 +105,7 @@ elseif ml_guitarAtHome = 1:
 end
 
 !!Guitar practice 
-if ml_guitar['hasguitar'] = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performed_minutes <= ml_maxperform_minutes:
+if ml_guitar['hasguitar'] = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performance['performed_minutes'] <= ml_performance['max_perform_minutes']:
 	act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
 end
 		
@@ -114,7 +114,7 @@ if ml_online['account'] = 0 and internet > 0:
 end
 
 !! Streaming music 
-if ml_online['account'] = 1 and internet > 0 and ml_performed_minutes <= ml_maxperform_minutes:
+if ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] <= ml_performance['max_perform_minutes']:
 	if pcs_inhib < 30:
 		if pcs_inhib < 10: 
 			$diff = 'hard'
@@ -142,7 +142,7 @@ if ml_online['account'] = 1 and internet > 0 and ml_performed_minutes <= ml_maxp
 end
 
 !! Recording music
-if ml_performed_minutes <= ml_maxperform_minutes:
+if ml_performance['performed_minutes'] <= ml_performance['max_perform_minutes']:
 	if pcs_inhib < 20:
 		if pcs_inhib < 10: 
 			$diff = 'medium'