Merge branch 'ML-DEV'

locations/city_musicstore_stock.qsrc

@@ -20,14 +20,14 @@ if $ARGS[0]='electric':
 
     '<center><table>
         <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/burny-rlg55-vld.png" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/epiphone-les-paul-express.png" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/fender-american-professional-stratocaster.png" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/burny-rlg55-vld.jpg" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/epiphone-les-paul-express.jpg" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/fender-american-professional-stratocaster.jpg" align="left"></td>
         </tr>
         <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/fender-player-tele.png" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/fender-player-tele.jpg" align="left"></td>
             <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/gibson-2019-les-paul.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/yamaha-pacifica-012-rm.png" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/yamaha-pacifica-012-rm.jpg" align="left"></td>
         </tr>
     </table>
     </center>' 
@@ -115,10 +115,10 @@ if $ARGS[0]='acoustic':
 
     '<center><table border=1>
         <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-hdc-28e.png" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-d10e-01.png" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-ed-sheeran.png" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-lx-1.png" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-hdc-28e.jpg" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-d10e-01.jpg" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-ed-sheeran.jpg" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-lx-1.jpg" align="left"></td>
         </tr>
     </table>
     </center>'
@@ -189,9 +189,9 @@ if $ARGS[0]='amplifier':
 
     '<center><table>
         <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/kustom-kg112fx.png" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/orange-rocker-32.png" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/blackstar-artisan-15.png" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/kustom-kg112fx.jpg" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/orange-rocker-32.jpg" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/blackstar-artisan-15.jpg" align="left"></td>
         </tr>
     </table>
     </center>'
@@ -244,7 +244,7 @@ if $ARGS[0]='studio':
 
     '<center><table>
         <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/home-studio.png" align="left"></td>
+            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/home-studio.jpg" align="left"></td>
         </tr>
     </table>
     </center>'

locations/music_bedroompractice.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'guitar':
 	minut += 30
 	ml_performed_minutes += 15
 
-	'<center><img <<$set_imgh>> src="images/pc/music/guitarpractice_1.png"></center>'
+	'<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'
 		instrmusic_exp += rand(1,3)

locations/music_buskingevents.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'busking':
 	
 	*clr & cla
 !!	TODO: More meat to the scene.	
-	'<center><img <<$set_imgh>> src="images/pc/music/guitarf'+ rand(1,2) +'.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/pc/activities/music/guitarf'+ rand(1,2) +'.jpg"></center>'	
 	'You start to play the songs you know, pushing your open guitar case forward a little in case people drop some change there.' + iif(ml_online['account'] = 1 and ml_online['active'] = 1, ' You also set up the sign with the link to your webprofile.', '') + ' After playing for an hour you have made <<ml_tipsearned>> <b>P</b> in tips.'
 
 	act 'Finish': gt $curloc, 'start'	

locations/music_gigstarts.qsrc

@@ -3,7 +3,7 @@
 !!	This is where all the gig introduction meetings will go (pub owners, cafe managers, etc.)
 
 if $ARGS[0] = 'delparco_start':
-	'<center><img src="images/locations/pavlovsk/busking.jpg"></center>'
+	'<center><img src="images/pc/activities/music/busking.jpg"></center>'
 	'As you finish your set, a tall woman steps up to you with a smile. "Hi, you are really good at this." she looks at you thoughtfully, then nods. "I''m Zariyah, I''m managing Del Parco and we are planning to run some live music evenings. Would you be interested in playing in a more formal setting?"'
 	
 	if pcs_inhib < 30:
@@ -35,7 +35,7 @@ if $ARGS[0] = 'delparco_accept':
 	*clr & cla
 	ml_venues['del_parco'] = 1
 	ml_delparcoQW = 1
-	'<center><img src="images/locations/pavlovsk/zariyah.jpg"></center>'
+	'<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.'
 	act 'Leave': gt $loc, 'start'
@@ -44,7 +44,7 @@ end
 if $ARGS[0] = 'delparco_decline':
 	*clr & cla
 	ml_venues['del_parco'] = 1	
-	'<center><img src="images/locations/pavlovsk/zariyah.jpg"></center>'
+	'<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."'
 	act 'Leave': gt $loc, 'start'

locations/music_guitarlesson.qsrc

@@ -56,7 +56,7 @@ end
 if $ARGS[0] = 'lesson':
 !! TODO: Do the guitarlesson stuff here - a few different scenes maybe?
 	
-	'<center><img <<$set_imgh>> src="mod/musiclife/images/pc/music/guitarteach_'+ rand(1,2) +'.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="mod/musiclife/images/locations/pavlovsk/community/guitarlesson/guitarteach_'+ rand(1,2) +'.jpg"></center>'	
 	if instrmusic_lvl < 15:
 		instrmusic_exp += rand(1,3)
 		'You spend the next 45 minutes learning the basics of the guitar and some chords. At the end of the lesson your fingers and hands hurt, but you feel that you have learned a lot.'
@@ -103,7 +103,7 @@ if $ARGS[0] = 'advertisement':
 	
 	'<center>As you pass by the community centre door you see a new colour note screaming "Guitar Lessons!" in bright letters over the image of a guitar.<center>'
 	*nl
-	'<center><img src="images/locations/pavlovsk/glessonad.jpg"></center>'
+	'<center><img src="images/locations/pavlovsk/community/guitarlesson/glessonad.jpg"></center>'
 	
 	act 'Leave': gt 'pav_commcenter'
 	

locations/music_onlinemusic.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'liveStream':
 		karta += superchats
 		ml_online['livestreamcount'] += 1
 		ml_performed_minutes += 60
-		'<center><img <<$set_imgh>> src="images/pc/music/gomixer_hero.jpg"/></center>'
+		'<center><img <<$set_imgh>> src="images/pc/activities/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.'
 		if bankAccount = 0:
@@ -37,7 +37,7 @@ end
 
 if $ARGS[0] = 'recordSong':
 !!	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>'
+	'<center><img <<$set_imgh>> src="images/pc/activites/music/phonerecording.jpg"/></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.'
 	
@@ -82,7 +82,7 @@ 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>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/music/phonerecording.jpg"/></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
@@ -152,6 +152,7 @@ end
 
 
 if $ARGS[0] = 'uploadallmusic':
+	'<center><img src="images/pc/activities/music/uploadmusic.jpg"/></center>'
 	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.'