Merge branch 'Bugfix'

locations/cafe_parco.qsrc

@@ -29,6 +29,14 @@ if $args[0]= 'inner':
 		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 
+	if ml_venues['del_parco'] = 1 and (ml_delparcoQW = 1 or ml_delparcoQW = 2) and (delparcogigdeadline-6 >= daystart and delparcogigdeadline <= daystart):
+		act 'Speak with Zariyah about her offer': gt 'music_delparco', 'talkwithzariyah'
+	end
+
+	if ml_venues['del_parco'] = 1 and ml_delparcoQW > 2 and ml_gigday['delparco'] = daystart and ml_gighour['delparco'] = hour:
+		act 'Perform at the cafe': gt 'music_delparco', 'eveningshow'
+	end
+
 	gs 'family'
 
 	if (sunWeather = 0 or temper < 5) and week mod 2 = 0 and (hour >= 14 and hour < 20) and mey_vika_qw_day ! daystart:

locations/dachain.qsrc

@@ -39,6 +39,122 @@ if $args[0] = '':
 	if hour >= 6 and hour <= 20 and etoexhib = 12:'Leave in <a href="exec:gt ''etoexhib'', ''pos11''">garden in lingerie and robe.</a>'
 	if hour >= 6 and hour <= 20 and etoexhib = 13 and temp ! daystart:'I wonder how to <a href="exec:gt ''etoexhib'', ''pos12''">garden</a>'
 
+!!-------------------------------------------------------------------------------------------------------------------------------------
+!!------------------------------------------------------- Music related actions come here ---------------------------------------------
+!!-------------------------------------------------------------------------------------------------------------------------------------
+
+	!!Storing and picking up the guitar
+	if ml_guitarWithMe = 1:
+		act 'Place the guitar next to your desk': 
+			ml_guitarWithMe = 0
+			ml_guitarAtHome = 1
+			gt $loc
+		end
+	elseif ml_guitarAtHome = 1:
+		act 'Pick up the guitar':
+			ml_guitarWithMe = 1
+			ml_guitarAtHome = 0
+			gt $loc
+		end
+	end
+
+	!!Guitar practice 
+	if ml_guitar = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performed_minutes <= ml_maxperform_minutes:
+		act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
+	end
+			
+	if ml_online['account'] = 0 and internet > 0:
+		act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
+	end
+
+	!! Streaming music 
+	if ml_online['account'] = 1 and internet > 0 and ml_performed_minutes <= ml_maxperform_minutes:
+		if pcs_inhib < 30:
+			if pcs_inhib < 10: 
+				$diff = 'hard'
+			elseif pcs_inhib < 20: 
+				$diff = 'medium'
+			else 
+				$diff = 'easy'
+			end
+			gs 'willpower', 'skill', 'self', $diff
+			will_cost = (will_cost * 3) - (pcs_perform)
+
+			if will_cost <= pcs_willpwr:
+				act 'Live stream (1:00) (<<will_cost>> Willpower)': 
+					inhib_exp += rand(1,3)	
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					gt 'music_onlinemusic', 'liveStream'
+				end
+			else	
+				act 'Live stream (1:00) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else 
+			act 'Live stream (1:00)': gt 'music_onlinemusic', 'liveStream'			
+		end
+	end
+
+	!! Recording music
+	if ml_performed_minutes <= ml_maxperform_minutes:
+		if pcs_inhib < 20:
+			if pcs_inhib < 10: 
+				$diff = 'medium'
+			elseif pcs_inhib < 20: 
+				$diff = 'easy'
+			end
+			gs 'willpower', 'skill', 'self', $diff
+
+			if will_cost <= pcs_willpwr:
+				act 'Record a song with your phone (0:30) (<<will_cost>> Willpower)': 
+					inhib_exp += rand(1,2)	
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					gt 'music_onlinemusic', 'recordSong'
+				end							
+				if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+					act 'Record and edit a song (2:00) (<<will_cost>> Willpower)': 
+						inhib_exp += rand(1,2)	
+						gs 'willpower', 'pay', 'self'
+						gs 'stat'
+						gt 'music_onlinemusic', 'recordAndEditSong' 
+					end						
+				end
+			else	
+				act 'Record a song (0:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Record and edit a song (1:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'				
+			end
+		else
+			act 'Record a song with your phone (0:30)': gt 'music_onlinemusic', 'recordSong'
+			if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+				act 'Record and edit a song (1:30)': gt 'music_onlinemusic', 'recordAndEditSong'
+			end	
+		end
+	end
+
+
+	!!Uploading recorded music if there are any not uploaded yet
+	if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
+		if pcs_inhib < 30:
+			if pcs_inhib < 10: 
+				$diff = 'hard'
+			elseif pcs_inhib < 20: 
+				$diff = 'medium'
+			else 
+				$diff = 'easy'
+			end
+			gs 'willpower', 'skill', 'self', $diff
+
+			will_cost = (will_cost * 2) - (pcs_perform)
+			if will_cost <= pcs_willpwr:
+				act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
+			else	
+				act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		end
+		act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
+	end
+
 	act 'Lie on the couch': gt 'divan', 'start'
 	act 'Go to the kitchen alcove': gt 'dachain', 'dachakit'
 	act 'Go to the Bathroom':  gt 'dachain', 'dachavann'

locations/music_bedroompractice.qsrc

@@ -7,11 +7,13 @@ if $ARGS[0] = 'guitar':
 
 	'<center><img <<$set_imgh>> src="images/pc/activities/music/guitarpractice_1.jpg"></center>'
 	if ml_guitarlessoncount = 0 and ml_chordbook = 1 and instrmusic_lvl <= 15:
-		'You open the book you got from Jimmy and start to practice the chords and basic techniques on the guitar'
+		'You open the book you got from Jimmy and start to practice the chords and basic techniques on the guitar.'
+		'It goes slowly, your fingers get in the way and they start to hurt after a short time as the strings dig into them, but you soldier on until.'
+		'The strings still either buzz, or don''t ring but by the end you start to get a feel for how to do it better. '
 		instrmusic_exp += rand(1,3)
 		
 	elseif ml_guitarlessoncount = 0 and ml_chordbook = 1 and instrmusic_lvl > 15 and instrmusic_lvl < 25 and internet < 1:
-		'You open the chordbook you got from Jimmy and start to practice, but you feel that you don''t really improve that much'
+		'You open the chordbook you got from Jimmy and start to practice, but you feel that you don''t really improve that much.'
 		instrmusic_exp += rand(1,2)	
 	elseif ml_guitarlessoncount = 0 and ml_chordbook = 1 and instrmusic_lvl > 15 and internet > 0:
 		'You look at the book you got from Jimmy, then decide to turn to the internet for new lessons.'

locations/music_delparco.qsrc

@@ -0,0 +1,40 @@
+# music_delparco
+
+if $ARGS[0] = 'talkwithzariyah'
+!!	TODO: Some small talk and a description here plus some paragraph depending on where the quest stands	
+	'You ask the first waitress about Zariyah, and she directs you to the office. As you approach, she waves at you through the open door, signaling to enter "Yes, yes Ruslan, don''t worry about it. No, I have to go, talk later."'
+	if ml_delparcoQW = 1:
+		'She puts down the phone "<<$pcs_nickname>>, so glad that you came. How are you? Did you think about the offer?" she smiles at you as you sit down.'
+		act 'Accept the offer to play at Del Parco': gt 'mod_musiclife_delparco', 'delparco_accept'
+	!!	act 'Decline the offer': gt 'mod_musiclife_delparco', 'delparco_decline'
+	else:
+	if ml_delparcoQW = 1:
+		'She puts down the phone "<<$pcs_nickname>>, so glad that you came. How are you? Did you come to talk about the offer?" she smiles at you as you sit down.'
+		act 'Discuss the live music with': gt 'music_delparco', 'firstdiscussion'
+	end
+	act 'Leave': gt 'cafe_parco', 'start'
+end
+
+if $ARGS[0] = 'delparco_accept':
+	ml_venues['del_parco'] = 1
+	ml_delparcoQW = 2
+!!	TODO: Better scene.	
+	'You accept.'
+    act 'Discuss the live music with': gt 'music_delparco', 'firstdiscussion'
+	act 'Leave': gt 'music_delparco', 'talkwithzariyah'
+end
+
+
+if $ARGS[0] = 'firstdiscussion':
+	ml_delparcoQW = 3
+!!	TODO: Obviously, blahblah is not proper text.	
+	'Blahblah about how it''s gonna work.'
+	act 'Leave': gt 'cafe_parco', 'start'
+end
+
+
+if $ARGS[0] = 'eveningshow':
+
+end
+
+--- music_delparco ---------------------------------

locations/music_gigstarts.qsrc

@@ -34,7 +34,7 @@ end
 if $ARGS[0] = 'delparco_accept':
 	*clr & cla
 	ml_venues['del_parco'] = 1
-	ml_delparcoQW = 1
+	ml_delparcoQW = 2
 	'<center><img src="images/pc/activities/music/zariyah.jpg"></center>'
 	'You look at the woman a bit surprised, then you smile back "Of course! I mean... you mean like a proper stage performance?"'	
 	'She nods "Well, it''s a small cafe so you wouldn''t be playing on a stage, per se, but yes, in front of people. You would sing and play your music." she looks at her watch "I will have to go, but please come to the cafe ' + iif(week < 5, 'this week', 'next week') + ' and we can discuss the details. Poka!" she gives a small wave and hurries off.'
@@ -44,6 +44,7 @@ end
 if $ARGS[0] = 'delparco_decline':
 	*clr & cla
 	ml_venues['del_parco'] = 1	
+	ml_delparcoQW = 1
 	'<center><img src="images/pc/activities/music/zariyah.jpg"></center>'
 	'You look at the woman a bit surprised "I''m... that''s really nice but... I''m not sure... "'
 	'She looks at you for a long moment then shakes her head "You need to be a bit more confident if you want do anything with music. Listen" she looks at her watch " I have to run, but if you change your mind, come to the cafe during the week. You are good, and you should not miss out on opportunities." she says before heading off."'

locations/music_onlinemusic.qsrc

@@ -15,10 +15,14 @@ if $ARGS[0] = 'liveStream':
 		minut += 60
 		ml_maxsuperchats = 	( pav_music/2 + city_music + oldtown_music/2 + village_music/2 + global_performer + pcs_apprnc )
 		ml_superchats = rand( 0, ml_maxsuperchats)
-		ml_famebase = ( pcs_instrmusic + pcs_vokal + pcs_perform + ( (hotcat-5) * 20 ) ) / 100
+		if ml_guitar = 1:
+			ml_famebase = ( pcs_instrmusic + pcs_vokal + pcs_perform + ( (hotcat-5) * 20 ) ) / 100
+			instrmusic_exp += rand(0,2)					
+		else	
+			ml_famebase = ( (pcs_vokal * 2) + pcs_perform + ( (hotcat-5) * 20 ) ) / 100
+		end
 		pav_music += rand(0, ml_famebase)
 		city_music += rand(0, ml_famebase)
-		instrmusic_exp += rand(0,2)		
 		vokal_exp += rand(0,2)	
 		perform_exp += rand(0,3)	
 		karta += superchats
@@ -42,15 +46,21 @@ if $ARGS[0] = 'recordSong':
 	'As you don''t have a computer you can''t really do much with the songs quality. But then you have seen quite a few people work with only with their phones. Like Ling Ling.'
 	
 	minut += 30
-	instrmusic_exp += rand(1,4)		
 	vokal_exp += rand(1,4)	
 	perform_exp += rand(1,3)	
 	ml_performed_minutes += 15
 
 	ml_onlinesong_hotcat[ml_onlinesongcount] = hotcat
-	ml_onlinesong_skilllevel[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform
+	if ml_guitar = 1:
+		ml_onlinesong_skilllevel[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform
+		ml_onlinesong_freshness[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform + ((hotcat-4)*10)
+		instrmusic_exp += rand(1,4)		
+	else
+		ml_onlinesong_skilllevel[ml_onlinesongcount] = (pcs_vokal * 2) + pcs_perform
+		ml_onlinesong_freshness[ml_onlinesongcount] = (pcs_vokal * 2) + pcs_perform + ((hotcat-4)*10)
+	end
+
 	ml_onlinesong_lastcalcday[ml_onlinesongcount] = daystart
-	ml_onlinesong_freshness[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform + ((hotcat-4)*10)
 	ml_onlinesong_uploaded[ml_onlinesongcount] = 0
 	ml_uploadablemusic += 1
 	ml_onlinesongcount += 1		
@@ -82,7 +92,8 @@ end
 
 if $ARGS[0] = 'recordAndEditSong':
 !!	TODO: Write a scene. It should describe that a song is recorded and then edited properly before uploading it to the net.
-	'<center><img <<$set_imgh>> src="images/pc/activities/music/phonerecording.jpg"/></center>'
+!!	'<center><img <<$set_imgh>> src="images/pc/activities/music/editmusic.jpg"/></center>'
+	'<center><video autoplay loop src="images/pc/activities/music/editmusic.mp4"></video></center>'
 	'You open plug in your home studio kit and start up the recording software. After several tries you finally end up with a version you are content with.'
 	'The next hour just flies by as you edit the video and the audio, trying to increate the quality of the recording as much as you can'
 	minut += 90
@@ -93,9 +104,16 @@ if $ARGS[0] = 'recordAndEditSong':
 	ml_performed_minutes += 15
 
 	ml_onlinesong_hotcat[ml_onlinesongcount] = hotcat
-	ml_onlinesong_skilllevel[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform + pcs_musicprod
+	if ml_guitar = 1:
+		ml_onlinesong_skilllevel[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform
+		ml_onlinesong_freshness[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform + ((hotcat-4)*10)
+		instrmusic_exp += rand(1,4)		
+	else
+		ml_onlinesong_skilllevel[ml_onlinesongcount] = (pcs_vokal * 2) + pcs_perform
+		ml_onlinesong_freshness[ml_onlinesongcount] = (pcs_vokal * 2) + pcs_perform + ((hotcat-4)*10)
+	end
+
 	ml_onlinesong_lastcalcday[ml_onlinesongcount] = daystart
-	ml_onlinesong_freshness[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform + pcs_musicprod + ((hotcat-4)*10)
 	ml_onlinesong_uploaded[ml_onlinesongcount] = 0
 	ml_uploadablemusic += 1
 	ml_onlinesongcount += 1	
@@ -162,12 +180,11 @@ if $ARGS[0] = 'uploadallmusic':
 	i = 0
 	:uploadallmusic			
 		if ml_onlinesong_uploaded[i] = 0: 
-			ml_onlinesong_uploaded[i] = 1
-			ml_uploadablemusic -= 1 
+			ml_onlinesong_uploaded[i] = 1			
 		end
 		i += 1
 	if i < ml_onlinesongcount:jump 'uploadallmusic'
-
+	ml_uploadablemusic -= 0
 	killvar 'will_cost'
 
 	if $loc = 'sitr':

locations/torgcentr.qsrc

@@ -49,10 +49,14 @@ if hour >= 8 and hour <= 20:
 		*p '   '
 	*p '<a href="exec: minut += 3 & gt ''shopdacha''"><img src="images/locations/city/citycenter/mall/constructiont.png"></a>'
 !! Ilyich and Biryukov Construction - Builders / Land developers
+		*p '   '
+	*p '<a href="exec: minut += 3 & gt ''city_musicstore''musicshop"><img src="images/locations/city/citycenter/mall/musicstore.pmg"></a>'
+!! O''Skull music store
 
 	act 'Go to the O''Skull Music Store': 
 		ml_boughtamp = 0
 		ml_boughtguitar = 0
+		minut += 3
 		gt 'city_musicstore', 'musicshop'
 	end