Преглед на файлове

Merging the mod into the main code finished.

Netuttki преди 4 години
родител
ревизия
ddb30553c4

+ 71 - 23
locations/bedrPar.qsrc

@@ -270,7 +270,7 @@ end
 
 if hour > 8 and hour < 20:
 
-	if ml_guitar = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0):
+	if ml_guitar = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performed_minutes <= ml_maxperform_minutes:
 		if sisterHere = 1 and pcs_inhib < 30:
 			if pcs_inhib < 10: 
 				$diff = 'hard'
@@ -286,21 +286,22 @@ if hour > 8 and hour < 20:
 					inhib_exp += rand(0,1)
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					gt 'music_bedroomPractice', 'guitar', 'bedrPar'
+					gt 'music_bedroomPractice', 'guitar'
 				end
 			else
 				act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
 			end
 		else
-			act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar', 'bedrPar'
+			act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
 		end
 	end
 			
 	if ml_online['account'] = 0 and internet > 0:
-		act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount', 'bedrPar'
+		act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
 	end
 
-	if ml_online['account'] = 1 and internet > 0 and sisterHere = 0:
+	!! Streaming music 
+	if ml_guitar = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performed_minutes <= ml_maxperform_minutes:
 		if pcs_inhib < 30:
 			if pcs_inhib < 10: 
 				$diff = 'hard'
@@ -311,37 +312,84 @@ if hour > 8 and hour < 20:
 			end
 			gs 'willpower', 'skill', 'self', $diff
 			will_cost = (will_cost * 3) - (pcs_perform)
-			
-			if ml_performed_hours <= ml_maxperform_hours:
-				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', 'bedrPar'
-					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>'
+	
+			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_guitar = 1 and sisterHere = 0 and 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 (1:00) (<<will_cost>> Willpower)': 
+				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', 'bedrPar'
+					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 
-				act 'Record a song (1:00) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				$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
-		else 
-			act 'Live stream (1:00)': gt 'music_onlinemusic', 'liveStream', 'bedrPar'			
-			act 'Record a song (1:00)': gt 'music_onlinemusic', 'recordSong', 'bedrPar'
 		end
-		
+		act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
 	end
 end
 
+
+
 if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
 	'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
 elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:

+ 23 - 17
locations/cikl.qsrc

@@ -1861,57 +1861,63 @@ end
 !!-------------Music career related variables and calculations------------------------------------------------
 
 !! 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's more realistic for this.
+!! Using the actual skill level, not the one modified by Attributes because that is more realistic for this.
 
-ml_max_instrument = instrmusic_lvl/30
-ml_max_vocal = vocal_lvl/30
-ml_maxperform_hours = max(ml_max_instrument, ml_max_vocal)
+ml_maxperform_minutes = instrmusic_lvl + vocal_lvl
+ml_performed_minutes = 0
 
-!! Calculating the fame increase from the uploaded songs and removing ones that don't effect fame anymore to keep the 
+
+!! Calculating the fame increase from the uploaded songs and removing ones that do not effect fame anymore to keep the 
 !! data at a sane level
 if ml_onlinesongcount > 0:
 	i = 0
 	j = 0
-    :looponlinesongs        
+    
+	:looponlinesongs        
 !!      this so every song counts only every 7 days and only for a limited number of weeks 
-        if ml_onlinesong_freshness[i] > 0:			
-			ml_tempsong_freshness[j] = ml_onlinesong_freshness[i]
+		if ml_onlinesong_freshness[i] > 0:		
+			ml_tempsong_freshness[j] = ml_onlinesong_sfreshness[i]
 			ml_tempsong_lastcalcday[j] = ml_onlinesong_lastcalcday[i]
 			ml_tempsong_hotcat[j] = ml_onlinesong_hotcat[i]
 			ml_tempsong_skilllevel[j] = ml_onlinesong_skilllevel[i]
-		
-			if ml_tempsong_lastcalcday[j] <= (daystart - 7):
+			ml_tempsong_uploaded[j] = ml_onlinesong_uploaded[i]
+			*nl
+			if ml_tempsong_lastcalcday[j] <= (daystart - 7) and ml_tempsong_uploaded = 1:
             	pav_music += rand(0, ml_tempsong_freshness[j]/50)
             	city_music += rand(0, ml_tempsong_freshness[j]/100)
             	ml_tempsong_freshness[j] -= 10
             	ml_tempsong_lastcalcday[j] = daystart
-        	end
+
+			end
 			j += 1
 		end
-        i += 1
-    if i < ml_onlinesongcount: jump 'looponlinesongs'
+		i += 1
+	if i < ml_onlinesongcount: jump 'looponlinesongs'
+
 	killvar 'ml_onlinesong_freshness'
 	killvar 'ml_onlinesong_lastcalcday'
 	killvar 'ml_onlinesong_hotcat'
 	killvar 'ml_onlinesong_skilllevel'
+	killvar 'ml_onlinesong_uploaded'
 
 	i = 0
+	
 	:looprebuildsongs
 		ml_onlinesong_freshness[i] = ml_tempsong_freshness[i]
 		ml_onlinesong_hotcat[i] = ml_tempsong_hotcat[i]
 		ml_onlinesong_lastcalcday[i] = ml_tempsong_lastcalcday[i]
 		ml_onlinesong_skilllevel[i] = ml_tempsong_skilllevel[i]
+		ml_onlinesong_uploaded[i] = ml_tempsong_uploaded[i]
+		i += 1
 	if i < j: jump 'looprebuildsongs'
 
 	killvar 'ml_tempsong_freshness'
 	killvar 'ml_tempsong_lastcalcday'
 	killvar 'ml_tempsong_hotcat'
 	killvar 'ml_tempsong_skilllevel'
-end
+	killvar 'ml_tempsong_uploaded'
 
-!! Resetting the performance time variables.
-    ml_performed_hours = 0
-end 
+end
 
 --- cikl ---------------------------------
 

+ 1 - 1
locations/city_center.qsrc

@@ -101,7 +101,7 @@ if shantpopala > 0:
 	exit
 end
 
-if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_hours <= ml_maxperform_hours:
+if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
 	*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.'
 	if pcs_inhib < 30: 

+ 1 - 0
locations/city_musicstore.qsrc

@@ -61,6 +61,7 @@ if $ARGS[0] = 'firstvisit':
 					'<center><img src="images/locations/city/citycenter/mall/musicstore/starterkit.jpg"></center>'
 					'You finally decide to buy the guitar, taking it to the checkout. Jimmy throws in a bag to carry the gitar and a set of strings and picks. "A proper starter kit" he states and rings up the purchase.'
 					'He looks at you thoughtfully, then drops a thick, slightly worn booklet in the bag "Some stuff to learn from" he says handing your purchase to you "Congratulations, welcome to the starving musician community."'
+					ml_guitars['jb-budget-acoustic'] = 1
 					ml_strings = 2
 					ml_chordbook = 1
 					ml_guitar = 1 

+ 43 - 1
locations/city_musicstore_stock.qsrc

@@ -13,6 +13,9 @@ if $ARGS[0]='electric':
         <TH>
             <center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
         </TH>
+        <TH>
+            <center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio</a></center>
+        </TH>
     </table></center>'
 
     '<center><table>
@@ -105,6 +108,9 @@ if $ARGS[0]='acoustic':
         <TH>
             <center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
         </TH>
+        <TH>
+            <center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio</a></center>
+        </TH>
     </table></center>'
 
     '<center><table border=1>
@@ -176,6 +182,9 @@ if $ARGS[0]='amplifier':
         <TH>
             <center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
         </TH>
+        <TH>
+            <center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio</a></center>
+        </TH>
     </table></center>'
 
     '<center><table>
@@ -213,7 +222,40 @@ if $ARGS[0]='amplifier':
             gt 'city_musicstore_stock', 'amplifier'
         end
     end
-
 end
 
+if $ARGS[0]='studio':
+    *clr & cla
+    $store = 'musicstore'
+    '<center><table border=1>
+        <TH>
+            <center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
+        </TH>
+        <TH>
+            <center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
+        </TH>
+        <TH>
+            <center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
+        </TH>
+        <TH>
+            <center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio</a></center>
+        </TH>
+    </table></center>'
+
+    '<center><table>
+        <tr>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/home-studio.png" align="left"></td>
+        </tr>
+    </table>
+    </center>'
+    act 'Leave': gt 'city_musicstore', 'musicshop'
+    if karta >= 19980 and ml_studio['scarlet-3rd-gen'] = 0:
+        act 'Buy Focusrite Scarlett Solo Studio 3rd Gen (19,980 P)':
+            ml_studio['scarlet-3rd-gen'] = 1
+            karta -= 19980
+            ml_boughtamp += 1
+            gt 'city_musicstore_stock', 'studio'
+        end
+    end
+end
 --- city_musicstore_stock ---------------------------------

+ 1 - 1
locations/city_park.qsrc

@@ -181,7 +181,7 @@ if $ARGS[0] = 'start':
 	end
 
 
-	if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_hours <= ml_maxperform_hours:
+	if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
 		*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.'
 		if pcs_inhib < 30: 

+ 1 - 1
locations/liames.qsrc

@@ -95,7 +95,7 @@ if rand(1,100) >= 95:
 	act 'Continue': gt'liames'
 end
 
-if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_hours <= ml_maxperform_hours:
+if hour >= 8 and hour <= 20 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
 	*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.'
 	

+ 9 - 3
locations/music_bedroompractice.qsrc

@@ -3,12 +3,14 @@
 if $ARGS[0] = 'guitar':
 	*clr & cla
 	minut += 30
+	ml_performed_minutes += 15
+
 	'<center><img <<$set_imgh>> src="images/pc/music/guitarpractice_1.png"></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'
 		instrmusic_exp += rand(1,3)
 		
-	elseif ml_guitarlessoncount = 0 and ml_chordbook = 1 and instrmusic_lvl > 15 and internet < 1:
+	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'
 		instrmusic_exp += rand(1,2)	
 	elseif ml_guitarlessoncount = 0 and ml_chordbook = 1 and instrmusic_lvl > 15 and internet > 0:
@@ -16,9 +18,13 @@ if $ARGS[0] = 'guitar':
 		instrmusic_exp += rand(1,3)	
 	elseif ml_guitarlessoncount > 0:
 		'You pick up you guitar and the lessons from the guitar teacher and start to practice.'
-		instrmusic_exp += rand(1,5)
+		instrmusic_exp += rand(2,5)
+	end
+	if $loc = 'sitr':
+		act 'Finish practice': gt $loc
+	else
+		act 'Finish practice': gt $loc, 'start'
 	end
-	act 'Finish practice': gt $ARGS[1], 'start'
 end
 
 

+ 1 - 1
locations/music_buskingevents.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'busking':
 	
 	dynamic '<<$ARGS[1]>>_music += rand(0,3)'
 	
-	ml_performed_hours += 1
+	ml_performed_minutes += 60
 	
 	*clr & cla
 !!	TODO: More meat to the scene.	

+ 137 - 18
locations/music_onlinemusic.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'liveStream':
 		perform_exp += rand(0,3)	
 		karta += superchats
 		ml_online['livestreamcount'] += 1
-		ml_performed_hours += 1
+		ml_performed_minutes += 60
 		'<center><img <<$set_imgh>> src="images/pc/music/gomixer_hero.jpg"/></center>'
 		'You set up your phone on a little tri-pod and log into your account. After settling down comfortably, you start to stream.'			
 		'Your fans tipped you <<superchats>> rubels for your performance.'
@@ -36,25 +36,144 @@ if $ARGS[0] = 'liveStream':
 end
 
 if $ARGS[0] = 'recordSong':
-	internet -= 1
-	if komp = 0 or webcamera = 0:
-	!!	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/music/phonerecording.png"/></center>'
-		'You set up your phone and settle down comfortably to record a song. After several tries you finally end up with a version you are content with and upload it to your account.'
-		'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 += 60
-        instrmusic_exp += rand(0,2)		
-		vokal_exp += rand(0,2)	
-		perform_exp += rand(0,3)	
-		musicprod_exp += rand(0,3)
-		ml_onlinesong_hotcat[ml_onlinesongcount] = hotcat
-		ml_onlinesong_skilllevel[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform
-		ml_onlinesong_lastcalcday[ml_onlinesongcount] = daystart
-		ml_onlinesong_freshness[ml_onlinesongcount] = pcs_instrmusic + pcs_vokal + pcs_perform + ((hotcat-4)*10)
-		ml_onlinesongcount += 1
+!!	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/music/phonerecording.png"/></center>'
+	'You set up your phone and settle down comfortably to record a song. After several tries you finally end up with a version you are content with and upload it to your account.'
+	'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
+	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		
+
+	if ml_online['account'] = 1 and internet > 0:
+		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
+		else
+			act 'Upload music': gt 'music_onlinemusic', 'uploadmusic'
+		end
+	else 
+		act 'Leave': gt $loc, 'start'
+	end
+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/music/phonerecording.png"/></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
+	instrmusic_exp += rand(1,4)		
+	vokal_exp += rand(1,4)	
+	perform_exp += rand(1,3)	
+	musicprod_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 + pcs_musicprod
+	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	
+
+	if ml_online['account'] = 1 and internet > 0:
+		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
+		else 
+			act 'Upload music': gt 'music_onlinemusic', 'uploadmusic'
+		end
+	else
+		if $loc = 'sitr':
+			act 'Leave': gt $loc
+		else
+			act 'Leave': gt $loc, 'start'
+		end
+	end
+
+end
+
+
+if $ARGS[0] = 'uploadmusic':
+	if will_cost > 0:
+		'You hesitate for a long moment, but finally take a deep breath and click on the "Upload" button and your newly recorded song moves over to the internet for all to see.'
+		'You bite in your lip, then close the screen before you change your mind and delete it.'
+	else
+		'You smile brightly and click on the "Upload" button. Now the whole world can see you play. And if they don''t like it, well... "Haters gonna hate" you shrug mentally and close the screen. They will like it."'
+	end
+	ml_uploadablemusic -= 1 
+	ml_onlinesong_uploaded[ml_onlinesongcount-1] = 1
+
+	killvar 'will_cost'
+
+	if $loc = 'sitr':
+		act 'Leave': gt $loc
+	else
+		act 'Leave': gt $loc, 'start'
+	end
+end
+
+
+if $ARGS[0] = 'uploadallmusic':
+	if will_cost > 0:
+		'You hesitate for a long moment, but finally take a deep breath and click on the "Upload" button and all your recorded songs, one by one move over to the internet for all to see.'
+		'You bite in your lip, then close the screen before you change your mind and delete them.'
+	else
+		'You smile brightly and click on the "Upload" button. Now the whole world can see you play. And if they don''t like it, well... "Haters gonna hate" you shrug mentally and close the screen, this is how art grows."'
+	end
+	i = 0
+	:uploadallmusic			
+		if ml_onlinesong_uploaded[i] = 0: 
+			ml_onlinesong_uploaded[i] = 1
+			ml_uploadablemusic -= 1 
+		end
+		i += 1
+	if i < ml_onlinesongcount:jump 'uploadallmusic'
+
+	killvar 'will_cost'
+
+	if $loc = 'sitr':
+		act 'Leave': gt $loc
+	else
+		act 'Leave': gt $loc, 'start'
 	end
-	act 'Leave': gt $loc, 'start'
 end
 
 

+ 1 - 1
locations/pav_commercial.qsrc

@@ -147,7 +147,7 @@ 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_guitarWithMe = 1 and ml_performed_hours <= ml_maxperform_hours:
+if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
 	*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.'
 	if pcs_inhib < 30: 

+ 1 - 1
locations/pav_park.qsrc

@@ -170,7 +170,7 @@ if $ARGS[0] = 'start':
 	end
 
 
-	if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_hours <= ml_maxperform_hours:
+	if hour >= 8 and hour <= 22 and sunWeather = 1 and temper >= 15 and ml_guitarWithMe = 1 and ml_performed_minutes <= ml_maxperform_minutes:
 		*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.'
 		if pcs_inhib < 30: 

+ 112 - 0
locations/sitr.qsrc

@@ -89,6 +89,118 @@ if student > 0 and kursovik < 100:
 	end
 end
 
+!!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 'Go out on the balcony': gt 'balkon','start'
 
 gs 'events', 'read'