Merge remote-tracking branch 'upstream/master'

glife.qproj

@@ -753,6 +753,7 @@
 		<Location name="burgerWork"/>
 		<Location name="BurgerTip"/>
 		<Location name="moncheri"/>
+		<Location name="lusso"/>
 		<Location name="butoilet"/>
 		<Location name="cfnm"/>
 		<Location name="club"/>
@@ -778,6 +779,8 @@
 		<Location name="yarik"/>
 		<Location name="zoomagazine"/>
 		<Location name="budgetclothes"/>
+		<Location name="city_musicstore"/>
+		<Location name="city_musicstore_stock"/>
 	</Folder>
 	<Folder name="Photo studio">
 		<Location name="foto"/>
@@ -872,6 +875,13 @@
 		<Location name="boyfrend"/>
 		<Location name="boylove"/>
 	</Folder>
+	<Folder name="music">
+		<Location name="music_bedroompractice"/>
+		<Location name="music_onlinemusic"/>
+ 		<Location name="music_gigstarts"/>
+   		<Location name="music_guitarlesson"/>   
+   		<Location name="music_buskingevents"/>
+	</Folder>
 	<Folder name="Lover">
 		<Location name="girl"/>
 		<Location name="girlfriend"/>

locations/FedorMisc.qsrc

@@ -899,9 +899,9 @@ if $ARGS[0] = 'Outcast':
 
 					act 'Remain here':gt 'FedorMisc', 'Outcast'
 
-					act 'Return to park':gt 'gskver', 'start'
+					act 'Return to park':gt 'pav_park', 'start'
 				end
-				act 'I need some time to think about it':gt 'gskver', 'start'
+				act 'I need some time to think about it':gt 'pav_park', 'start'
 			end
 		end	
 	elseif fedorKozlovQW = -15:

locations/NikoSlut.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'Customers':
 			gt 'NikoSlut', 'Customer 4'	
 		elseif NikoCust = 5 and NikoCust5 ! daystart:
 			gt 'NikoSlut', 'Customer 5'	
-		elseif NikoCust = 6 and NikoCust6 ! daystart and VKWip = 100:
+		elseif NikoCust = 6 and NikoCust6 ! daystart:
 			gt 'NikoSlut', 'Customer 6'
 		elseif NikoCust = 7 and NikoCust7 ! daystart:
 			gt 'NikoSlut', 'Customer 7'	
@@ -694,7 +694,7 @@ if $ARGS[0] = 'Customer 6':
 			*clr & cla
 			minut -= 5
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/vag1.jpg"></center>'
+			!!'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/vag1.jpg"></center>'
 			'The trucker unbuttons his pants then sits down on a bench before motioning you to mount him. The give the man a smile as you turn around in front of him then begin riding his hard penis. You continue riding the mans dick when he says, "Now that is what a bitch is for. Spread your cheeks for me bitch!" You do as he says and spread your ass cheeks for him. The trucker begins roughly fingering your anus, causing strong pressure to build up inside your ass as his finger is shoved deeper inside of you.'		
 			gs 'arousal', 'anal_finger', 5, 'sub'				
 			gs 'arousal', 'vaginal', 5, 'sub'			
@@ -703,7 +703,7 @@ if $ARGS[0] = 'Customer 6':
 			act 'Continue':			
 				*clr & cla
 				gs'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/vag2.jpg"></center>'
+				!!'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/vag2.jpg"></center>'
 				'After riding the trucker as he fingers you, you lean back then wrap your arm around his back while he begins licking your nipple. The feeling of his long hard dick in your vagina is starting to hurt, so you do your best to hold up your own weight while the trucker continues to fuck your pussy. After a few more seconds the man says, "Time for you to swallow my load bitch. Get down on your knees." You meekly nod, relieved that he isn''t going to fuck you anymore. You climb off of the trucker then drop to your knees in front of him.'
 				gs 'arousal', 'vaginal', 5, 'sub'			
 				gs 'stat'		
@@ -751,7 +751,7 @@ if $ARGS[0] = 'Customer 6':
 		act 'Pull down your pants':	
 			*clr & cla
 			gs'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/rear1.jpg"></center>'
+			!!'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/rear1.jpg"></center>'
 			'The trucker grabs you by your hips then pushes you toward a nearby tree before bending you over. The trucker rubs his penis against your vagina for a few seconds before sliding it inside, causing a jolt of pleasure to fill your lower abdomen. The man begins fucking you roughly as he says, "How do you like my dick bitch?" You reply, "It''s so big and feels so good inside my pussy." The man then smacks your ass as he responds, "You know it girl." He then picks up his pace.'		
 			gs 'arousal', 'vaginal', 5, 'sub'				
 			gs 'stat'		
@@ -759,7 +759,7 @@ if $ARGS[0] = 'Customer 6':
 			act 'Continue':	
 				*clr & cla
 				gs'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/rear2.jpg"></center>'
+				!!'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/6/rear2.jpg"></center>'
 				'You grab onto the tree as the man''s dick is ramming so far inside your vagina that it starts to hurt. You try standing up so that his access to your pussy is limited to slow him down a bit. The man leans forward then pinches your nipples as he says, "Time for you to swallow my load bitch. Get down on your knees." You meekly nod, relieved that he isn''t going to fuck you anymore then drop to your knees in front of him.'
 				gs 'arousal', 'vaginal', 5, 'sub'			
 				gs 'stat'		
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'Customer 9':
 	VK = rand(1,3)
 	minut += 15
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/6.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/9.jpg"></center>'
 	'A trucker approaches Niko then says, "I wound like to borrow <<$NikoSlutName>> for a few minutes." Niko replies, "Sure, pay 2000 <b>₽</b> and you can borrow her for a time." The trucker responds, "Kinda high but I guess I can spare a few bucks." He hands Niko the money then wraps his arm around your waist and leads you toward the restroom.'
 
 	if VK = 1:
@@ -1305,6 +1305,7 @@ if $ARGS[0] = 'Diner Exterior':
 	
 	act 'Enter the diner': gt 'NikoSlut', 'Diner Interior'
 	act 'Go back to the highway':nroad = 20 & gt 'road'
+	act 'Wait (0:30)': minut += 30 & gt 'NikoSlut', 'Diner Exterior'
 end
 
 if $ARGS[0] = 'Diner Interior':
@@ -1312,11 +1313,11 @@ if $ARGS[0] = 'Diner Interior':
 	if $YurikEv['Name'] = '':$YurikEv['Name'] = 'a burly bearded man'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/interior1.jpg"></center>'
-	if hour >= 7 and hour <= 17 and BorisDiner_Trucker_Daystart ! daystart:
+	if hour >= 7 and hour <= 17 and hour ! BorisDiner['Trucker']:
 		'You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. Their is a <a href="exec:gt ''NikoSlut'', ''Truckers''">trucker</a> sitting on a stool, enjoying his meal.'
-	elseif hour >= 7 and hour <= 17 and BorisDiner_Trucker_Daystart = daystart:
+	elseif hour >= 7 and hour <= 17 and hour = BorisDiner['Trucker']:
 		'You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. Their is a trucker sitting on a stool, enjoying his meal..'	
-	elseif BorisDiner_Biker_Daystart ! daystart:
+	elseif hour ! BorisDiner['Biker']:
 		'You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. The stools and counters are nearly empty but you can see some <a href="exec:gt ''NikoSlut'', ''Bikers''">bikers</a> sitting at the tables, chatting and drinking beer.'
 	else
 		'You see a row of stools along the counter and booths along the walls next to the windows. A couple of waitress''s work behind the counter and carry food out to the booths, while a large man works in the back as a cook. The stools and counters are nearly empty but you can see some bikers sitting at the tables, chatting and drinking beer.'
@@ -1356,8 +1357,8 @@ if $ARGS[0] = 'Meal 1':
 	cumspclnt = 2
 	money -= 200
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/Meal 1.jpg"></center>'
-	'You order some eggs, it doesn''t take to long until your food is ready. You get a plate of two eggs, hashbrowns, biscuit and some fruit, along with a cup hot tea. The food is better than expected.'
+	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/meal1.jpg"></center>'
+	'You order some eggs, it doesn''t take to long until your food is ready. You get a plate of two eggs, hash browns, biscuit and some fruit, along with a cup hot tea. The food is better than expected.'
 	act 'Finish':gt 'NikoSlut', 'Diner Interior'
 end
 
@@ -1372,7 +1373,7 @@ if $ARGS[0] = 'Meal 2':
 	cumspclnt = 2
 	money -= 300
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/Meal 2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/meal2.jpg"></center>'
 	'You order a burger, it doesn''t take to long until your food is ready. You get a plate with a large burger and fries, along with a cup tea. The food is better than expected.'
 	act 'Finish':gt 'NikoSlut', 'Diner Interior'
 end
@@ -1388,7 +1389,7 @@ if $ARGS[0] = 'Meal 3':
 	cumspclnt = 2
 	money -= 300
 	gs'stat'
-	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/Meal 3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/food/meal3.jpg"></center>'
 	'You order fried chicken, it doesn''t take to long until your food is ready. You get a plate of three pieces of chicken, fries and coleslaw, along with a cup tea. The food is better than expected.'
 	act 'Finish':gt 'NikoSlut', 'Diner Interior'
 end
@@ -1473,7 +1474,7 @@ end
 if $ARGS[0] = 'Truckers':
 	*clr & cla
 	minut += 5
-	BorisDiner_Trucker_Daystart = daystart
+	BorisDiner['Trucker'] = hour
 	gs'stat'
 	VK = rand (1,6)
 	if VK = 1:
@@ -1528,7 +1529,7 @@ end
 if $ARGS[0] = 'Bikers':
 	*clr & cla
 	minut += 5
-	BorisDiner_Biker_Daystart = daystart
+	BorisDiner['Biker'] = hour
 	gs'stat'
 	VK = rand (1,4)
 	if VK = 1:
@@ -1599,8 +1600,8 @@ if $ARGS[0] = 'Yurik In':
 	elseif NikoEv > 21 and YurikEv['Romance'] = 1:
 		'You approach Yurik and he turns to face you before giving you a smile and saying, "<<$pcs_firstname>> the love of my life. Did you stop by to pay me a visit or do you need something? Anything my kitten wants, she gets."'
 		act 'Eat with Yurik': gt 'NikoSlut', 'Yurik Dinner'
-		act 'Ask for a ride': gt 'YurikEv', 'Ride'
-		act 'Ask for some money': gt 'YurikEv', 'Money'
+!!		act 'Ask for a ride': gt 'YurikEv', 'Ride'
+!!		act 'Ask for some money': gt 'YurikEv', 'Money'
 	else
 		'You can see a Yurik laughing with the ghosts of the fallen. He tells them of how he loves to ride bikes to hell and then he actually flies in the sky before landing on a dragon, which he uses to scorch the city in flames.  <font color=#FF00FF>Pssst, you should not be seeing this message. Please report this in the Girl Life tfg/f95 forum, on our discord or directly to me, Violet Kitten.</font>'
 	end

locations/ParkKafe.qsrc

@@ -1172,7 +1172,7 @@ if $ARGS[0] = 'the_boy':
 			'The two of you exchange glances and it doesn''t take long before he walks over to your table to introduce himself, "Hi, I''m Gosha!"'
 			'"<<$pcs_firstname>>, but you can call me <<$pcs_nickname>>" You smile as you reply.'
 			'"Cute name!" he says as the two of you become acquainted with one another. You learn that he is a student and that he lives in the hostel. Gosha invites you visit him. He even gives you directions to the hostel and how to find his dorm. "Well, I won''t disturb you anymore, <<$pcs_nickname>>! Don''t be a stranger and come by!"'
-			act 'Leave': gt 'parkKafe', 'end', 'cafe'
+			act 'Leave': gosh = 1 & gt 'parkKafe', 'end', 'cafe'
 		end
 	elseif hotcat < 5 and gosh = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/gosha.jpg"></center>'

locations/bedrPar.qsrc

@@ -254,6 +254,142 @@ if pcs_sewng >= 80:
 	end
 end
 
+if ml_guitarWithMe = 1:
+	act 'Place the guitar next to your desk': 
+		ml_guitarWithMe = 0
+		ml_guitarAtHome = 1
+		gt 'bedrPar', 'start'
+	end
+elseif ml_guitarAtHome = 1:
+	act 'Pick up the guitar':
+		ml_guitarWithMe = 1
+		ml_guitarAtHome = 0
+		gt 'bedrPar', 'start'
+	end
+end
+
+if hour > 8 and hour < 20:
+
+	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'
+			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 'Practice guitar (0:30) (<<will_cost>> Willpower)': 
+					inhib_exp += rand(0,1)
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					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'
+		end
+	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_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'
+			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_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 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
+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:

locations/cikl.qsrc

@@ -1855,5 +1855,69 @@ else
 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 is more realistic for this.
+
+ml_maxperform_minutes = instrmusic_lvl + vocal_lvl
+ml_performed_minutes = 0
+
+
+!! 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        
+!!      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_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]
+			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
+			j += 1
+		end
+		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'
+	killvar 'ml_tempsong_uploaded'
+
+end
+
 --- cikl ---------------------------------
 

locations/city_center.qsrc

@@ -101,6 +101,36 @@ if shantpopala > 0:
 	exit
 end
 
+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: 
+		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 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+				inhib_exp += rand(1,3)
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gs 'music_buskingevents', 'busking', 'city'
+			end
+		else	
+			act 'Start busking (1 hour) (<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 'Start busking (1 hour)': gs 'music_buskingevents', 'busking', 'city'
+	end	
+end
+
 if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
 act 'Wait':gs 'obj_din', 'wait'

locations/city_musicstore.qsrc

@@ -0,0 +1,98 @@
+# city_musicstore
+
+if $ARGS[0] = 'musicshop':
+	*clr & cla	
+	if ml_musicstorevisited = 0:
+			ml_musicstorevisited = 1
+			gt 'city_musicstore', 'firstvisit'
+	else
+		'<center><img src="images/locations/city/citycenter/mall/musicstore/music-store-600.jpg"></center>'
+		'You enter the store, welcomed by the familiar mix of random notes and bits of songs screaming from the back.'
+		'Jimmy just nods at you, then returns his attention to the guitar laying on the counter in front of him.'
+
+		act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
+		act 'Try some guitars': 
+!!			TODO: Better scenes here			
+			if pcs_instrmusic < 30 and pcs_performing < 10:
+				'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
+			else
+				'Some texts here depending on music skill and performing skill'			
+			end
+		end
+		act 'Leave': 
+			if ml_boughtguitar > 0 or ml_boughtamp > 0:
+				gt 'city_musicstore', 'payandtakestuff'
+			end
+			gt 'torgcentr'
+		end
+	end
+
+end
+
+if $ARGS[0] = 'firstvisit':
+	'<center><img src="images/locations/city/citycenter/mall/musicstore/music-store-600.jpg"></center>'
+	*nl
+	'You enter the store, passing the door to be submerged in a loud, cacophonic environment. 
+	The walls are filled with guitars, and in the back three teenaged guys are trying instruments in a very loud way.'
+
+!!	TODO: Replace the image, Waynes world is fun but silly
+
+	'<center><img src="images/locations/city/citycenter/mall/musicstore/waynesworld.jpg"></center>'
+	*nl
+    'A tall, dark haired man turns to you with a bored expression that turns into a perplexed smile as he takes your sight in.'
+   	'He straightens up "Hello there, I''m Jimmy" - he greets you - "Is there anything I can help you with?"'
+	*nl
+	'<center><img src="images/locations/city/citycenter/mall/musicstore/jimmy.jpg"></center>'
+	*nl
+  	'Suddenly he turns and throws a sponge at one of the boys playing in the back "No. Stairway. To. Heaven." he growls and points at the sign on the wall before turning back to you.'
+ 	'<center><img src="images/locations/city/citycenter/mall/musicstore/nostairways.jpg"></center>'
+
+	if guitar = 0:
+			act 'Look for a guitar':
+				*clr & cla
+				'<center><img src="images/locations/city/citycenter/mall/musicstore/cheap_acoustic_1.jpg"></center>'		
+				'You start to browse the guitars in the shop, not entirely sure what you are looking for and gladly accept the help of the store clerk. After answering his questions and chatting about music and what you are looking for he finally picks up an affordable acoustic guitar as a recommendation.'
+				'After some conversation with the store owner he offers you an affordable acoustic guitar to buy'
+				'Jimmy leaves you alone with the instrument, so you sit down to try it, strumming the chords that you know, trying to play something.'
+				'While the guitar is not the best sounding one it''s comfortable' + iif(money <= 5000, ' and looking at the price tags, the only one you can afford.','.')
+			
+				act 'Buy a cheap acoustic guitar (3,400 <b>P</b>)': 
+					*clr & cla
+					'<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 
+					ml_guitarWithMe = 1
+					money -= 3400
+					gs 'stat'
+					act 'Leave': gt 'torgcentr'
+				end
+				act 'Leave': gt 'torgcentr'
+			end
+		end
+
+	act 'Leave': gt 'torgcentr'
+end
+
+
+if $ARGS[0] = 'payandtakestuff':
+	if ml_boughtamp + ml_guitarWithMe > 0 or ml_boughtguitar > 1:
+		minut += (ml_boughtguitar * 5) + (ml_boughtguitar * 5)
+		'Jimmy takes your details and your home address after you pay, and sets up the delivery. "It should be there tomorrow, <<$pcs_nickname>>."'
+	else	
+		minut += 20
+        ml_guitarWithMe = 1
+		'Jimmy disappears with your chosen guitar in the back of the shop only to return after about 10 minutes. "It''s all set up, <<$pcs_nickname>>, if you need to tweak anything, just bring it in, we will do it, no charge."'
+		*nl
+		'He puts the guitar in ' + iif(ml_gigbag = 1, 'a gigbag', '') + iif(ml_hardcase = 1, 'its case', '') + ' and hands it to you. "All the best, <<$pcs_nickname>>."'
+	end
+	killvar 'ml_boughtamp'
+	killvar 'ml_boughtguitar'
+	killvar 'ml_gigbag'
+	killvar 'ml_hardcase'
+	act 'Leave': gt 'torgcentr'
+end
+--- city_musicstore ---------------------------------

locations/city_musicstore_stock.qsrc

@@ -0,0 +1,261 @@
+# city_musicstore_stock
+
+if $ARGS[0]='electric':
+    *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/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.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.jpg" align="left"></td>
+        </tr>
+    </table>
+    </center>' 
+    act 'Leave': gt 'city_musicstore', 'musicshop'
+
+    if karta >= 43990 and  ml_guitars['burny-rlg55-vld'] = 0:
+        act 'Buy the Burny RLG55 VLD (43,990 P)': 
+            ml_guitars['burny-rlg55-vld'] = 1
+            karta -= 43990
+            ml_boughtguitar += 1  
+            ml_gigbag = 1          
+            gt 'city_musicstore_stock', 'electric'
+        end        
+    end
+
+    if karta >= 14280  and ml_guitars['epiphone-les-paul-express'] = 0:
+        act 'Buy the Epiphone Les Paul Express (14,280 P)': 
+            ml_guitars['epiphone-les-paul-express'] = 1
+            karta -= 14280
+            ml_boughtguitar += 1   
+            ml_gigbag = 1         
+            gt 'city_musicstore_stock', 'electric'
+        end        
+    end
+
+    if karta >= 179000 and ml_guitars['fender-american-professional-stratocaster'] = 0:
+        act 'Buy the Fender American Professional Stratocaster (179,000 P)':
+            ml_guitars['fender-american-professional-stratocaster'] = 1
+            karta -= 179000            
+            ml_boughtguitar += 1 
+            ml_hardcase = 1           
+            gt 'city_musicstore_stock', 'electric'
+        end
+    end
+
+    if karta >= 83000 and ml_guitars['fender-player-tele'] = 0:
+        act 'Buy the Fender Player Tele (83,000 P)':
+            ml_guitars['fender-player-tele'] = 1
+            karta -= 83000
+            ml_boughtguitar += 1            
+            ml_hardcase = 1  
+            gt 'city_musicstore_stock', 'electric'
+        end
+    end
+
+    if karta >= 241000 and ml_guitars['gibson-2019-les-paul'] = 0:
+        act 'Buy the Gibson 2019 Les Paul (241,000 P)':
+            ml_guitars['gibson-2019-les-paul'] = 1
+            karta -= 241000
+            ml_boughtguitar += 1  
+            ml_hardcase = 1            
+            gt 'city_musicstore_stock', 'electric'
+        end        
+    end 
+
+    if karta >= 17990 and ml_guitars['yamaha-pacifica-012-rm'] = 0:
+        act 'Buy the Yamaha Pacifica 012 RM (17,900 P)':
+            ml_guitars['yamaha-pacifica-012-rm'] = 1
+            karta -= 17990
+            ml_boughtguitar += 1    
+            ml_gigbag =  1        
+            gt 'city_musicstore_stock', 'electric'
+        end
+    end
+end
+
+
+if $ARGS[0]='acoustic':
+    *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 border=1>
+        <tr>
+            <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>'
+    act 'Leave': gt 'city_musicstore', 'musicshop'
+
+    if karta >= 320000 and ml_guitars['martin-hdc-28e'] = 0:
+        act 'Buy the Martin HDC-28E (320,000 P)': 
+            ml_guitars['martin-hdc-28e'] = 1
+            karta -= 320000
+            ml_boughtguitar += 1  
+            ml_hardcase = 1 
+            if ml_guitarWithMe = 0: ml_guitarWithMe = 1       
+            gt 'city_musicstore_stock', 'acoustic'
+        end
+    end
+
+    if karta >= 81990 and ml_guitars['martin-d10e-01'] = 0:    
+        act 'Buy the Martin D-10E-01 (81,990 P)':
+            ml_guitars['martin-d10e-01'] = 1
+            karta -= 81990
+            ml_boughtguitar += 1 
+            ml_hardcase = 1
+            if ml_guitarWithMe = 0: ml_guitarWithMe = 1    
+            gt 'city_musicstore_stock', 'acoustic'
+        end
+    end
+
+    if karta >= 63900 and ml_guitars['martin-ed-sheeran'] = 0:
+        act 'Buy the Martin Ed Sheeran Signature Edition (63,900 P)':
+            ml_guitars['martin-ed-sheeran'] = 1
+            karta -= 63900
+            ml_boughtguitar += 1     
+            ml_hardcase = 1
+            if ml_guitarWithMe = 0: ml_guitarWithMe = 1          
+            gt 'city_musicstore_stock', 'acoustic'
+        end
+    end
+
+    if karta >= 41990 and ml_guitars['martin-lx-1'] = 0:
+        act 'Buy the Martin LX-1 (41,900 P)': 
+            ml_guitars['martin-lx-1'] = 1
+            karta -= 41900
+            ml_boughtguitar += 1
+            ml_gigbag = 1
+            if ml_guitarWithMe = 0: ml_guitarWithMe = 1   
+            gt 'city_musicstore_stock', 'acoustic'
+        end
+    end
+end
+
+if $ARGS[0]='amplifier':
+    *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/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>'
+    act 'Leave': gt 'city_musicstore', 'musicshop'
+    if karta >= 10790 and ml_amplifiers['kustom-kg112fx'] = 0:
+        act 'Buy Kustom KG112FX (10,790 P)':
+            ml_amplifiers['kustom-kg112fx'] = 1
+            karta -= 10790
+            ml_boughtamp += 1
+            gt 'city_musicstore_stock', 'amplifier'
+        end
+    end
+
+    if karta >= 99990 and ml_amplifiers['orange-rocker-32'] = 0:
+        act 'Buy Kustom KG112FX (99,990 P)':
+            ml_amplifiers['orange-rocker-32'] = 1
+            karta -= 99990
+            ml_boughtamp += 1
+            gt 'city_musicstore_stock', 'amplifier'
+        end
+    end
+
+    if karta >= 145900 and ml_amplifiers['blackstar-artisan-15'] = 0:
+        act 'Buy Kustom KG112FX (145.900 P)':
+            ml_amplifiers['blackstar-artisan-15'] = 1
+            karta -= 145900
+            ml_boughtamp += 1
+            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.jpg" 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 ---------------------------------

locations/city_park.qsrc

@@ -180,6 +180,37 @@ if $ARGS[0] = 'start':
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 
+
+	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: 
+			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 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+					inhib_exp += rand(1,3)
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					gs 'music_buskingevents', 'busking', 'city'
+				end
+			else	
+				act 'Start busking (1 hour) (<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 'Start busking (1 hour)': gs 'music_buskingevents', 'busking', 'city'
+		end
+	end
+
 	if hour <= 7 or hour >= 21:
 		!!Succubus active hunting, can only hunt successfully once a day, but can try until success
 		If succubusQW = 5 and suchuntday ! daystart:

locations/dimaRevenge.qsrc

@@ -570,6 +570,16 @@ end
 
 if dimaRevChoice = 2:
 	menu_off = 1
+	if fedorKozlovQW >= 0:
+		$dimaRevenge['Fedor Involved'] = ' and Fedor '
+	else
+		$dimaRevenge['Fedor Involved'] = ' '
+	end	
+	if fedorKozlovQW >= 0:
+		$dimaRevenge['Fedor Involved 2'] = 'Fedor'
+	else
+		$dimaRevenge['Fedor Involved 2'] = 'Svyatoslav'
+	end	
 	if ARGS[0] = 4:
 		if $ARGS[1] = 'day4jockbefore':
 			!!fourth day before class!!
@@ -607,22 +617,22 @@ if dimaRevChoice = 2:
 						!!combat!!
 						!!if you win!!
 						'Lera is unconscious on the ground as you hold Lena by the hair. "I didn''t say shit about you," you tell her.'
-						'You let go of her and turn to head home, but then you see Vitek walking towards you. He looks pissed. He must have just seen you beat up his sister. You make to run but are tripped by Lena. You close your eyes, afraid of what he''ll do to you, but nothing happens. You open your eyes to see Ivan Fedor holding Vitek back. Vitek is swearing at the top of his lungs. As you get up and dust yourself off, Dan, Vasily, Paulina and Ekaterina come to investigate and see Vitek getting ganged up on. Things get crazy after that.'
+						'You let go of her and turn to head home, but then you see Vitek walking towards you. He looks pissed. He must have just seen you beat up his sister. You make to run but are tripped by Lena. You close your eyes, afraid of what he''ll do to you, but nothing happens. You open your eyes to see Ivan<<$dimaRevenge[''Fedor Involved'']>>holding Vitek back. Vitek is swearing at the top of his lungs. As you get up and dust yourself off, Dan, Vasily, Paulina and Ekaterina come to investigate and see Vitek getting ganged up on. Things get crazy after that.'
 					elseif win = 1:
 						!!if you lose!!
-						'The two of them are too strong for you and you get knocked to the ground. They start kicking you. You do your best to block their kicks while trying to get up, but they keep knocking you down. You are about to give up when Ivan and Fedor show up. Fedor tosses Lera aside and Ivan grabs Lena by the shoulders and tries to calm her down. Suddenly you hear an angry yell, and you see Vitek charging towards Ivan.
+						'The two of them are too strong for you and you get knocked to the ground. They start kicking you. You do your best to block their kicks while trying to get up, but they keep knocking you down. You are about to give up when Ivan<<$dimaRevenge[''Fedor Involved'']>>show up. Fedor tosses Lera aside and Ivan grabs Lena by the shoulders and tries to calm her down. Suddenly you hear an angry yell, and you see Vitek charging towards Ivan.
 						You get up in time to see Dan, Vasily Paulina, and Ekaterina arrive, followed by Erast and Lazar. Things get crazy after that, with Roman showing up last.'
 						act 'School brawl':
 							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/bigbrawl.jpg"></center>'
-							'Ivan and Vitek trade blows that would knock anyone else out. Roman, crazy little shit that he is, takes on Erast. Dan and Vasily double up on Fedor, Ekaterina decides she wants to fight Lazar who refuses to hit a girl. Ekaterina scoffs at him and proceeds to kick his ass anyway. You lose track of Lena and Lera. As you look around you see a security camera looking straight at you. Before you can tell anyone about it, a brick hits you in the back causing a great deal of pain. You turn around and see Pauline. "Fucking bitch," you shout as you run at her. "I''ll fucking kill you!"'
+							'Ivan and Vitek trade blows that would knock anyone else out. Roman, crazy little shit that he is, takes on Erast. Dan and Vasily double up on <<$dimaRevenge[''Fedor Involved 2'']>>, Ekaterina decides she wants to fight Lazar who refuses to hit a girl. Ekaterina scoffs at him and proceeds to kick his ass anyway. You lose track of Lena and Lera. As you look around you see a security camera looking straight at you. Before you can tell anyone about it, a brick hits you in the back causing a great deal of pain. You turn around and see Pauline. "Fucking bitch," you shout as you run at her. "I''ll fucking kill you!"'
 							act 'Fight':
 								*clr & cla
 								'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/thepopo.jpg"></center>'
-								'You and Pauline go at for quite a while. Eventually you are both tired and catch your breath before having another go. As you try to catch your breath, exhausted, you see how the others are doing. You see Ivan and Vitek still at it, neither one of them running out of energy, though it looks like Ivan''s superior skill is starting to become the deciding factor. It seems Dan agree''s, after he and Vasily have Fedor down, he jumps in to help Vitek against Ivan, leaving Vasily to kick Fedor while he is down.'
+								'You and Pauline go at for quite a while. Eventually you are both tired and catch your breath before having another go. As you try to catch your breath, exhausted, you see how the others are doing. You see Ivan and Vitek still at it, neither one of them running out of energy, though it looks like Ivan''s superior skill is starting to become the deciding factor. It seems Dan agree''s, after he and Vasily have <<$dimaRevenge[''Fedor Involved 2'']>> down, he jumps in to help Vitek against Ivan, leaving Vasily to kick <<$dimaRevenge[''Fedor Involved 2'']>> while he is down.'
 								*nl
 								'You see battered and bloody Roman pull out a knife and charge at Erast, who seems to have taken his fair share of blow from Roman. As Roman charges him though, Erast side steps just in time and delivers and powerful blow, that sends Roman sprawling unconscious.
-								Erast looks around and then heads over to help Fedor. Lazar is trying to block Ekaterina''s attacks but his refusal to hit her back means she is beating him down. He goes down and once he does, it is all over. Just then you catch sight of Lena and Lera walking towards you. Apparently they were waiting for you to tire yourself out. Lera grabs you and hold you for Lena, but before she can do anything, you hear the sounds of sirens. Several officers show up and arrest everyone.'
+								Erast looks around and then heads over to help <<$dimaRevenge[''Fedor Involved 2'']>>. Lazar is trying to block Ekaterina''s attacks but his refusal to hit her back means she is beating him down. He goes down and once he does, it is all over. Just then you catch sight of Lena and Lera walking towards you. Apparently they were waiting for you to tire yourself out. Lera grabs you and hold you for Lena, but before she can do anything, you hear the sounds of sirens. Several officers show up and arrest everyone.'
 								act 'In custody':
 									*clr & cla
 									'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/jailcell.jpg"></center>'

locations/family_schedule.qsrc

@@ -11,7 +11,7 @@ kolloc = 0
 !! sister_opr_indorf = 1 means Anya is in the village
 if sister_opr_indorf = 0:
 	if week <= 5:
-		if hour = 6 and minut < 45:
+		if (hour < 6) or (hour = 6 and minut < 45):
 			!!Asleep
 			anyaloc = 1
 		elseif hour = 7 and minut < 15:

locations/fbgameout.qsrc

@@ -43,7 +43,12 @@ if $ARGS[0] = 'start':
 		'"Over here <<$pcs_nickname>>! You arrived just in time, we were just picking teams." Lazar explains.'
 		'You quickly move over to the other girls while Lazar and Ivan continue on discussing on how to split up the teams.'
 		'"I say we go for mixed teams, there''s no other way it will work Ivan!" Lazar is trying his best to reason with Ivan.'
-		'"Sure sure..." Ivan waves his hands, "Let''s start already! I pick Fedor first!" as he points to Fedor to come over.'
+		if fedorKozlovQW >= 0:
+			'"Sure sure..." Ivan waves his hands, "Let''s start already! I pick Fedor first!" as he points to Fedor to come over.'
+		else
+			'"Sure sure..." Ivan waves his hands, "Let''s start already! I pick Erast first!" as he points to Erast to come over.'
+		end
+		
 		act 'Leave': gt 'gschool_grounds', 'main'
 		act 'Wait to get picked': gt 'fbgameout', 'football'
 	end
@@ -63,7 +68,11 @@ if $ARGS[0] = 'football':
 	'"Over here <<$pcs_nickname>>! You arrived just in time, we were just picking teams." Lazar explains.'
 	'You quickly move over to the other girls while Lazar and Ivan continue on discussing on how to split up the teams.'
 	'"I say we go for mixed teams, there''s no other way it will work Ivan!" Lazar is trying his best to reason with Ivan.'
-	'"Sure sure..." Ivan waves his hands, "Let''s start already! I pick Fedor first!" as he points to Fedor to come over.'
+	if fedorKozlovQW >= 0:
+		'"Sure sure..." Ivan waves his hands, "Let''s start already! I pick Fedor first!" as he points to Fedor to come over.'
+	else
+		'"Sure sure..." Ivan waves his hands, "Let''s start already! I pick Erast first!" as he points to Erast to come over.'
+	end
 
 	act 'Wait to get picked':
 		*clr & cla

locations/gLakeNude.qsrc

@@ -46,11 +46,11 @@ elseif month < 3 or month = 12:
 	*nl
 end
 
-if storyline = 1 and month >= 3 and month <= 8 and week >= 6 and hour >= 8 and hour <= 10 and ivanfedorseennaked ! daystart and rand(0,3) = 0:
+if storyline = 1 and month >= 3 and month <= 8 and week >= 6 and hour >= 8 and hour <= 10 and ivanfedorseennaked ! daystart and rand(0,3) = 0 and fedorKozlovQW >= 0:
 	if $clothingworntype = 'nude':
 		gs 'exhibitionism', 3
 		gs 'fame', 'pav', 'sex', 3
-		'You''re walking down the secluded beach, enjoying the sensation of feeling free and the cool breeze on your naked body. When all of a sudden you hear some heavy running steps coming up behind you followed by heavy panting. Expecting the worse, you turn around only to see a sweaty Ivan with a huge grin on his face, closely followed by Feodor. As they get a look at your face and realize who you are, they slow down and stop, looking a bit surprised to see... well all of you on display.'
+		'You''re walking down the secluded beach, enjoying the sensation of feeling free and the cool breeze on your naked body. When all of a sudden you hear some heavy running steps coming up behind you followed by heavy panting. Expecting the worse, you turn around only to see a sweaty Ivan with a huge grin on his face, closely followed by Fedor. As they get a look at your face and realize who you are, they slow down and stop, looking a bit surprised to see... well all of you on display.'
 		act 'Run away': ivanfedorseennaked = daystart & gt 'gLakeNude'
 		act 'Say hi to them': ivanfedorseennaked = daystart & gt 'gschool_socialchg1', 'ivan_fedor_naked'
 	else

locations/gdksport.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'start':
 		'You see <a href="exec:minut += 3 & gt ''IvanEv''">Ivan Prokhorov</a> with a large sports bag entering the sports club.'
 	end
 
-	if npc_rel['A5'] >= 80 and fedorKozlovQW = 0 and pcs_apprnc >= 20 and fedorkozbreak < 2 and GorSlut < 2: gt 'gdksport', 'Fedor First Date'
+	if npc_rel['A5'] >= 80 and fedorKozlovQW = 0 and hotcat >= 5 and fedorkozbreak < 2 and pav_slut <= 75: gt 'gdksport', 'Fedor First Date'
 
 	if week <= 5 and hour >= 16 and hour < 18 and fedorKozlovQW >= 20:
 		'You can see <a href="exec: gt ''FedorMisc'', ''Fedor Workout''">Fedor</a> on his phone next to some punching bags.'
@@ -1264,7 +1264,7 @@ if $ARGS[0] = 'Fedor First Date':
 	if fedorkozbreak = 1:
 		'You enter the sports club and see Fyodor Kozlov, standing by the front door. He looks as though he is waiting for someone and as soon as he sees you, he flashes you a smile and he approaches with an affable smile on his face. "Hello <<$pcs_firstname>>." he says with a warm smile. He pauses for a moment then reaches into his pockets and pulls out 2 tickets and says, "Here is the deal ... I know that we had a bit of a bumpy relationship before but I would like to try again if you will. So what do you say? Wanna go on another date with me?'
 	else
-		'You enter the sports club and see Fyodor Kozlov, standing by the front door. He looks as though he is waiting for someone and as soon as he sees you, his eyes light up and he approaches you with an affable smile on his face. "Hello <<$pcs_firstname>>." he says with a warm smile. He pauses for a moment then reaches into his pockets and pulls out 2 tickets and says, "Here is the deal ... I have an extra ticket to the movies and I would you like know if you would be up for a good comedy?"'
+		'You enter the sports club and see Fyodor Kozlov, standing by the front door. He looks as though he is waiting for someone and as soon as he sees you, his eyes light up and he approaches you with an affable smile on his face. "Hello <<$pcs_firstname>>." he says with a warm smile. He pauses for a moment then reaches into his pockets and pulls out 2 tickets and says, "Here is the deal ... I have an extra ticket to the movies and I would like know if you would be up for a good comedy?"'
 	end
 
 	act 'Agree':
@@ -1293,11 +1293,12 @@ if $ARGS[0] = 'Fedor First Date':
 
 				act 'Leave': gt 'pav_residential'
 			end
+			
 			act 'Refuse':
 				*clr & cla
 				if fedorkozbreak = 0:fedorKozlovQW = 0
 				if fedorkozbreak = 1:fedorKozlovQW = -1
-				npc_rel['A5'] = 75
+				npc_rel['A5'] = 70
 				minut += 15
 				gs 'stat'
 				'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
@@ -1312,6 +1313,7 @@ if $ARGS[0] = 'Fedor First Date':
 			end
 		end
 	end
+	
 	act 'Refuse':
 		*clr & cla
 		npc_rel['A5'] = 70

locations/grigory.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'meet':
 	minut += 2
 	npc_qw['A221'] = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big221.jpg"></center>'
 	'When you near the fields you notice a man walking near your grandparents'' cows.'
 	'Curious, you slow your pace, watching the man for several minutes as he inspects one of the cows then starts walking towards a nearby pickup truck with its back end full of hay.'
 	'He just reaches for the pitch fork sticking out of the hay when he finally notices you. He stops mid motion and seems to ponder something for several seconds before starting to walk your direction.'
@@ -27,7 +27,7 @@ if $ARGS[0] = 'meet':
 		*clr & cla
 		minut += 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big221.jpg"></center>'
 		'"Grigory? Grigory Chekov?" You ask, a smile blossoming on your face, "Its been a long time. I thought you had moved to the city?"'
 		'Grigory gives you an authentic smile, "Yes and no. There''s a big corporate farm to the southeast of Saint Petersburg. I worked there for a couple of years, but," Grimacing, "It just wasn''t a good fit for me so I came home," He gestures at the area around him.'
 		'His smile is a little self conscious, "I love this little town, and I missed it.'
@@ -39,7 +39,7 @@ if $ARGS[0] = 'meet':
 			*clr & cla
 			minut += 2
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big221.jpg"></center>'
 			'"That''s great!" You say, authentically happy for him.'
 			'"Besides, your grandparents were always good to me growing up, letting me do yard work and helping with the animals. By being back here I can help keep an eye on them," He suddenly looks self conscious, "They might not be blood, but they treated me better than my own parents, and that makes them family if you ask me."'
 			'You''re a little surprised at the admission, remembering all the times you saw him hanging out around your grandparents and helping out over the years. In spite of all the memories of him hanging around, you''re still taken back by how close he feels to your grandparents.'
@@ -56,7 +56,7 @@ if $ARGS[0] = 'meet':
 
 			act 'Say goodbye':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big221.jpg"></center>'
 				'"I enjoyed getting to talk to you again," You admit, "I''ll be sure to say hi the next time I see you." With a smile, you wave and start to make your exit.'
 				'Grigory smiles broadly, waving goodbye as you leave.'
 
@@ -71,7 +71,7 @@ if $ARGS[0] = 'meet':
 					gs 'willpower', 'misc', 'self', 'easy'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big221.jpg"></center>'
 					'He seems surprised when you reach out, putting your arms around his powerful frame. Your arms barely reach all the way around his middle.'
 					'"Whoa," Grigory says in surprise, then bends down slightly as he wraps his own big arms around you.'
 					'The hug lingers, then just before it starts to become awkward, he lifts you off of your feet and twirls you around once before sitting you back on your feet. You can''t help but laugh as you remember all the times he did exactly the same thing to you when you were little.'
@@ -104,7 +104,7 @@ if $ARGS[0] = 'barn':
 		*clr & cla
 		minut += 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big221.jpg"></center>'
 		'"Hi!" You call out.'
 		'"Hey there Kiska!" He replies with a smile and a little wave, "Any chance you''d be willing to help look for their shovel?"'
 		'You don''t have quite enough time to answer before he speaks again, "Nevermind, there it is." He says.'
@@ -122,7 +122,7 @@ if $ARGS[0] = 'barn':
 			gs 'willpower', 'misc', 'self', 'easy'
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big221.jpg"></center>'
 			'"Hi," You say, playfully biting your lip when you see him look your way.'
 			'You can see a hint of a smile touch his lips, "Well you''re a sight for sore eyes there Kiska," He replies, reaching into his back pocket before taking a sip, "You wouldn''t be trying to distract me with your feminine wiles would you?"'
 			'You put a hand to your chest in mock offence, unable to keep a smile off your face, "Would I do something like that?"'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'barn_closer':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/grigory/grigory.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big221.jpg"></center>'
 			'"Whoa," You say, putting a hand on his chest and pushing lightly. Grigory is far too big of a man to be pushed away, but he takes a hint and steps back anyway.'
 			'With a slight grimace, he reaches for his flask and takes a sip.'
 			act 'Continue': gt 'grigory', 'barn_stand'

locations/liames.qsrc

@@ -95,6 +95,35 @@ 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_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: 
+		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 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+				inhib_exp += rand(1,3)
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gs 'music_buskingevents', 'busking', 'oldtown'
+			end
+		else	
+			act 'Start busking (1 hour) (<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 'Start busking (1 hour)': gs 'music_buskingevents', 'busking', 'oldtown'
+	end
+end
 
 if hour >= 15 and hour <= 22 and tusa = 0:
 	act 'Go to the local hangout':

locations/lusso.qsrc

@@ -0,0 +1,88 @@
+# lusso
+
+if $ARGS[0] = 'start':
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+    $location_type = 'public_indoors'
+	$menu_loc = 'lusso'
+	$menu_arg = 'start'
+	menu_off = 0
+	*clr & cla
+	mag = 1
+	gs 'stat'
+	gs 'themes', 'indoors'
+	'<center><b><font color="maroon">Lusso Intimo</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/lusso/lusso.jpg"></center>'
+	*nl
+	'The décor is bright and modern the flowers are real and the dressers made with expensive woods.'
+	'This is clearly a high end underwear shop. Just knowing you are wearing these will make you stand out more and they will feel so nice you might never want to go back to wearing the cheap ill fitting underwear you used to have to put up with. That is of course assuming you can afford the prices here.'
+	act 'View panties': minut += 5 & gt 'lusso', 'panties'
+
+	act 'View bras': minut += 5 & gt 'lusso', 'bras'
+end
+
+if $ARGS[0] = 'panties':
+	$metka = 'panties'
+	$loc = 'lusso'
+	$menu_loc = 'lusso'
+	$menu_arg = 'panties'
+	menu_off = 0
+	*clr & cla
+	gs'stat'
+
+	act 'Return': minut += 1 & gt 'lusso', 'start'
+
+	i = 1
+
+	:loopboutique_panties
+		if boutique_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''panties2''"><img src="images/pc/panties/boutique/<<i>>.jpg" 	height="150" /></a> '
+		i += 1
+	if i <= 82:jump 'loopboutique_panties'
+end
+
+if $ARGS[0] = 'panties2':
+	cla
+	menu_off = 1
+	if boutique_panties[i] ! 0:
+		msg 'You already own these panties.'
+		gt 'lusso', 'panties'
+	end
+
+	gt 'panties', 'view_panty_item', 'shop', 'boutique',i, 1000
+
+end
+
+if $ARGS[0] = 'bras':
+	$metka = 'bras'
+	$loc = 'lusso'
+	$menu_loc = 'lusso'
+	$menu_arg = 'bras'
+	menu_off = 0
+	*clr & cla
+	gs'stat'
+
+	act 'Return': minut += 1 & gt 'lusso', 'start'
+
+	i = 1
+
+	:loopboutique_bras
+		if boutique_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bras2''"><img src="images/pc/bras/boutique/<<i>>.jpg" 	height="150" /></a> '
+		i += 1
+	if i <= 33:jump 'loopboutique_bras'
+end
+
+if $ARGS[0] = 'bras2':
+	cla
+	menu_off = 1
+	if boutique_bras[i] ! 0:
+		msg 'You already own these bras.'
+		gt 'lusso', 'bras'
+	end
+
+	gt 'bras', 'view_bra_item', 'shop', 'boutique',i, 1000
+
+end
+
+
+--- lusso ---------------------------------
+

locations/moncheri.qsrc

@@ -1,6 +1,5 @@
 # moncheri
 
-
 if $ARGS[0] = 'start':
 	$metka = $ARGS[0]
 	$loc = $CURLOC
@@ -42,16 +41,12 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	'The boutique sells designer winter coats, formal clothing, beautiful shoes, expensive underwear and exquisite handbags.'
+	'The boutique sells designer winter coats, formal clothing, beautiful shoes and exquisite handbags.'
 
 	act 'Leave the boutique': minut += 3 & gt 'torgcentr'
 	
 	act 'View clothing': minut += 5 & gt 'moncheri', 'clothes'
 
-	act 'View panties': minut += 5 & gt 'moncheri', 'panties'
-
-	act 'View bras': minut += 5 & gt 'moncheri', 'bras'
-
 	act 'View shoes': minut += 5 & gt 'moncheri', 'shoes'
 
 	act 'View purses': minut += 5 & gt 'moncheri', 'purses'
@@ -113,68 +108,6 @@ if $ARGS[0] = 'formal':
 
 end
 
-if $ARGS[0] = 'panties':
-	$metka = 'panties'
-	$loc = 'moncheri'
-	$menu_loc = 'moncheri'
-	$menu_arg = 'panties'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
-
-	i = 1
-
-	:loopboutique_panties
-		if boutique_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''panties2''"><img src="images/pc/panties/boutique/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 82:jump 'loopboutique_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	menu_off = 1
-	if boutique_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'moncheri', 'panties'
-	end
-
-	gt 'panties', 'view_panty_item', 'shop', 'boutique',i, 1000
-
-end
-
-if $ARGS[0] = 'bras':
-	$metka = 'bras'
-	$loc = 'moncheri'
-	$menu_loc = 'moncheri'
-	$menu_arg = 'bras'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
-
-	i = 1
-
-	:loopboutique_bras
-		if boutique_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''bras2''"><img src="images/pc/bras/boutique/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 33:jump 'loopboutique_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	menu_off = 1
-	if boutique_bras[i] ! 0:
-		msg 'You already own these bras.'
-		gt 'moncheri', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'boutique',i, 1000
-
-end
-
 if $ARGS[0] = 'shoes':
 	$metka = $ARGS[0]
 	$loc = $CURLOC

locations/music_bedroompractice.qsrc

@@ -0,0 +1,31 @@
+# music_bedroompractice
+
+if $ARGS[0] = 'guitar':
+	*clr & cla
+	minut += 30
+	ml_performed_minutes += 15
+
+	'<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)
+		
+	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:
+		'You look at the book you got from Jimmy, then decide to turn to the internet for new lessons.'
+		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(2,5)
+	end
+	if $loc = 'sitr':
+		act 'Finish practice': gt $loc
+	else
+		act 'Finish practice': gt $loc, 'start'
+	end
+end
+
+
+--- music_bedroompractice ---------------------------------

locations/music_buskingevents.qsrc

@@ -0,0 +1,48 @@
+# music_buskingevents
+
+if $ARGS[0] = 'busking':
+	minut += 60	
+	instrmusic_exp += rand(1,3)
+	vokal_exp += rand(1,3)
+	perform_exp += rand(1,2)
+	
+	gs 'music_buskingevents', 'calculate_tips', $ARGS[1]
+	money += ml_tipsearned
+	gs 'stat'
+	
+	dynamic '<<$ARGS[1]>>_music += rand(0,3)'
+	
+	ml_performed_minutes += 60
+	
+	*clr & cla
+!!	TODO: More meat to the scene.	
+	'<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'	
+end
+
+if $ARGS[0] = 'calculate_tips':
+	
+	if $ARGS[1] = 'city':
+		ml_location_mod = 6
+	elseif $ARGS[1] = 'pav':
+		ml_location_mod = 1
+	elseif $ARGS[1] = 'oldtown'
+		ml_location_mod = 3
+	end 	
+
+	if week >= 5: ml_time_mod += 2
+	if hour >= 17: ml_time_mod += 2
+	
+	ml_time_loc_mod = (ml_location_mod + ml_time_mod) / 2
+	
+	
+	ml_tipsmax = (pcs_instrmusic + pcs_vokal + pcs_perform + ((hotcat-4)*35)) * ml_time_loc_mod
+	ml_tipsearned = max(rand(0,ml_tipsmax),0)
+
+	killvar 'ml_location_mod'
+	killvar 'ml_time_mod'	
+end
+
+--- music_buskingevents ---------------------------------

locations/music_gigstarts.qsrc

@@ -0,0 +1,54 @@
+# music_gigstarts
+
+!!	This is where all the gig introduction meetings will go (pub owners, cafe managers, etc.)
+
+if $ARGS[0] = 'delparco_start':
+	'<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:
+        if pcs_inhib < 10: 
+			$diff = 'hard'
+		elseif pcs_inhib < 20: 
+			$diff = 'medium'
+		elsei
+			$diff = 'easy'
+		end
+
+		gs 'willpower', 'skill', 'self', $diff
+		will_cost = (will_cost * 3) - (pcs_perform)
+		if will_cost <= pcs_willpwr:
+			act 'Accept (<<will_cost>> Willpower)': gt 'music_gigstarts', 'delparco_accept'
+		else	
+			act 'Accept (<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 'Accept (<<will_cost>> Willpower)': gt 'music_gigstarts', 'delparco_accept'
+    end
+	
+    act 'Decline': gt 'music_gigstarts', 'delparco_decline'
+end
+
+
+if $ARGS[0] = 'delparco_accept':
+	*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, 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'
+end
+
+if $ARGS[0] = 'delparco_decline':
+	*clr & cla
+	ml_venues['del_parco'] = 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."'
+	act 'Leave': gt $loc, 'start'
+end
+
+
+--- music_gigstarts ---------------------------------

locations/music_guitarlesson.qsrc

@@ -0,0 +1,112 @@
+# music_guitarlesson
+
+if $ARGS[0] = 'enquiry':
+	'You follow the directions from the receptionist and reach the room where the guitar lessons take place. 
+	The door is half open, and peeking in you see a dark haired man in his thirties sitting at a table, scribbling in a note book.'
+	'"Uhm, hi, I''m looking for the guitar lessons?" you call outas you step into the room.
+	The man looks up, then smiles as he sees you "Please, come in. I''m Viktor Zenchuk, and yes, this is where I teach guitar. Would you be interested?"'
+	*nl
+	'You shift on your feet "I''m <<$pcs_name>>, and yes, I think. Can you please tell me a bit more?"'
+	' "Sure. I assume you are a beginner..." he looks at you, and you nod "Then obviously we would start at the basics. The instrument, chords, some basic theory. We would meet once a week, here. 
+	If you have a guitar, that''s great, if not, you can use mine. But you will really need to get a guitar to practice at home. The lessons cost 500 rubels, but if you are under 18' +iif(vidage < 18, ', which I assume you are,', '')+ ' then it''s only 300 rubels."'
+	*nl
+	'He looks at you "So, <<$pcs_name>>, do you think you would be interested in taking lessons?"'
+	npc_rel['ML1'] = 45
+	ml_enquired = 1
+	act 'Sign up': 		
+		'You nod "Yes, I really would like to learn to play the guitar. When can we start?"'
+		'The teacher pushes the book closer to you "I will need your name here, and the school and class you attend, and also, I need to see your passport, to confirm you are under 18." You write down the information, and show him your passport.'
+		'"Eccellent, now, what day would you like to come for your first lesson?"'		
+		'<a href="exec: ml_lessonday = 1 & $ml_lessonday = ''Monday'' & gt ''music_guitarlesson'', ''goodbye''">Monday</a>'
+		'<a href="exec: ml_lessonday = 2 & $ml_lessonday = ''Tuesday'' & gt ''music_guitarlesson'', ''goodbye''">Tuesday</a>'
+		'<a href="exec: ml_lessonday = 3 & $ml_lessonday = ''Wednesday''  & gt ''music_guitarlesson'', ''goodbye''">Wednesday</a>'
+		'<a href="exec: ml_lessonday = 4 & $ml_lessonday = ''Thursday''  & gt ''music_guitarlesson'', ''goodbye''">Thursday</a>'
+		'<a href="exec: ml_lessonday = 5 & $ml_lessonday = ''Friday''  & gt ''music_guitarlesson'', ''goodbye''">Friday</a>'
+		'<a href="exec: ml_lessonday = 6 & $ml_lessonday = ''Saturday''  & gt ''music_guitarlesson'', ''goodbye''">Saturday</a>'
+		'<a href="exec: ml_lessonday = 8 & $ml_lessonday = ''None''  & gt ''music_guitarlesson'', ''goodbye''">You don''t know yet</a>'
+	end
+	act 'You have to think':
+		'You hesitate for a moment "I would be, but I have to talk with my <<$npc_nickname[''A29'']>> first."'
+		'The teacher nods "That''s understandable. Just come in when you know and we can set up the lesson" He smiles at you "It was a pleasure to meet you, <<$pcs_name>>, and I''m looking forward to seeing you again."'
+		act 'Leave': gt 'pav_commclubs'
+	end
+end
+
+if $ARGS[0] = 'setlessonday':
+!!	TODO: Write the proper scene here
+	'You meet the teacher and agree on your next lesson.'
+	
+	'Select your next lesson'
+	'<a href="exec: ml_lessonday = 1 & $ml_lessonday = ''Monday'' & gt ''music_guitarlesson'', ''goodbye''">Monday</a>'
+	'<a href="exec: ml_lessonday = 2 & $ml_lessonday = ''Tuesday'' & gt ''music_guitarlesson'', ''goodbye''">Tuesday</a>'
+	'<a href="exec: ml_lessonday = 3 & $ml_lessonday = ''Wednesday''  & gt ''music_guitarlesson'', ''goodbye''">Wednesday</a>'
+	'<a href="exec: ml_lessonday = 4 & $ml_lessonday = ''Thursday''  & gt ''music_guitarlesson'', ''goodbye''">Thursday</a>'
+	'<a href="exec: ml_lessonday = 5 & $ml_lessonday = ''Friday''  & gt ''music_guitarlesson'', ''goodbye''">Friday</a>'
+	'<a href="exec: ml_lessonday = 6 & $ml_lessonday = ''Saturday''  & gt ''music_guitarlesson'', ''goodbye''">Saturday</a>'
+end
+
+
+if $ARGS[0] = 'firstLesson':
+!!	TODO: Write a proper scene here
+	
+	gt 'music_guitarlesson', 'lesson'
+end
+
+
+if $ARGS[0] = 'lesson':
+!! TODO: Do the guitarlesson stuff here - a few different scenes maybe?
+	
+	'<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.'
+	else
+		instrmusic_exp += rand(1,3)
+		'You spend the next 45 minutes working on songs you have learned and improving some specific techniques.'
+	end
+	
+	'Select your next lesson'
+	'<a href="exec: ml_lessonday = 1 & $ml_lessonday = ''Monday'' & gt ''music_guitarlesson'', ''goodbye''">Monday</a>'
+	'<a href="exec: ml_lessonday = 2 & $ml_lessonday = ''Tuesday'' & gt ''music_guitarlesson'', ''goodbye''">Tuesday</a>'
+	'<a href="exec: ml_lessonday = 3 & $ml_lessonday = ''Wednesday''  & gt ''music_guitarlesson'', ''goodbye''">Wednesday</a>'
+	'<a href="exec: ml_lessonday = 4 & $ml_lessonday = ''Thursday''  & gt ''music_guitarlesson'', ''goodbye''">Thursday</a>'
+	'<a href="exec: ml_lessonday = 5 & $ml_lessonday = ''Friday''  & gt ''music_guitarlesson'', ''goodbye''">Friday</a>'
+	'<a href="exec: ml_lessonday = 6 & $ml_lessonday = ''Saturday''  & gt ''music_guitarlesson'', ''goodbye''">Saturday</a>'
+	'<a href="exec: ml_lessonday = 8 & $ml_lessonday = ''None''  & gt ''music_guitarlesson'', ''goodbye''">You don''t know yet</a>'
+	
+	money -= ml_gitlesson_cost
+	ml_guitarlessonday = daystart
+	ml_glessonweekday = week
+	ml_guitarlessoncount += 1	
+	minut += 45
+	npc_rel['ML1'] += 1
+	
+	
+	act 'End lesson': gt 'pav_commclubs'
+end
+
+
+if $ARGS[0] = 'goodbye':
+!!	TODO: Kinda ok for now but needs a less awkward phrasing
+	*clr & cla
+	if ml_lessonday < 8:
+		'You agree to meet for your next lesson on <<$ml_lessonday>> at <<hour>>:00. The teacher enters it in the diary and you say good bye before you leave.'
+	else
+		'You are not sure when it would be a good day right now, so you agree to decide on a day later, you say good bye and leave.'
+	end
+	act 'Leave': gt 'pav_commclubs'
+end
+
+
+if $ARGS[0] = 'advertisement':
+	ml_guitarlessonadv = 1
+	
+	'<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/community/guitarlesson/glessonad.jpg"></center>'
+	
+	act 'Leave': gt 'pav_commcenter'
+	
+end
+
+--- music_guitarlesson ---------------------------------

locations/music_onlinemusic.qsrc

@@ -0,0 +1,181 @@
+# music_onlinemusic
+
+if $ARGS[0] = 'setupAccount':
+	ml_online['account'] = 1
+	'You log into Youtube to set up a channel for your music. You can upload videos or live stream, but you will need to open a bank account if you want to receive any tips from viewers of your stream.'	
+!!	TODO: Ask for a screen name? 
+	act 'Leave': gt $loc, 'start'
+end
+
+
+if $ARGS[0] = 'liveStream':
+	internet -= 1
+	if komp = 0 or webcamera = 0:
+!!	TODO: Much, much better scene.
+		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
+		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
+		ml_online['livestreamcount'] += 1
+		ml_performed_minutes += 60
+		'<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:
+			'You need to open a bank account before you can receive the money.'
+		end
+
+	end
+	act 'Stop the stream': gt $loc, 'start'
+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/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.'
+	
+	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/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
+	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':
+	'<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.'
+	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
+end
+
+
+--- music_onlinemusic ---------------------------------

locations/pav_commcenter.qsrc

@@ -18,6 +18,8 @@ else
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 end
 
+if month > 8 and ml_guitarlessonadv = 0: gt 'music_guitarlesson', 'advertisement'
+
 if hour >= 20 and hour <= 23 and week >= 5 and week < 7:
 	'The entrance to the Community Centre is full of young people, the guys are just hanging around smoking and joking. The girls in small groups, all dressed up and gossiping. You see the bushes moving, Pavlovsks'' famous make out garden.'
 	'You hear people in the alley beside the club. <a href="exec:minut += 5 & gt ''ugel''">Investigate</a>.'

locations/pav_commclubs.qsrc

@@ -76,6 +76,26 @@ if hour >= 12 and hour < 20:
 			act 'Leave': gt 'pav_commclubs'
 		end
 	end
+
+	if ml_guitarlessonadv = 1 and ml_enquired = 0:
+		act 'Enquire about the guitar lessons': gt 'music_guitarlesson', 'enquiry'
+	end
+
+	if ml_lessonday = 8:
+		act 'Arrange a lesson day': gt 'music_guitarlesson', 'setlessonday'
+	end
+
+	if (daystart - ml_guitarlessonday) + ml_glessonweekday >= 8 and ml_lessonday = week:
+		if age <= 18:
+			ml_gitlesson_cost = 300
+		else
+			ml_gitlesson_cost = 500
+		end
+		
+		act 'Go to your guitar lesson (<<ml_gitlesson_cost>> rubles)': gt 'music_guitarlesson', 'lesson'
+	end
+	
+end
 else
 	'Club''s closed.'
 end

locations/pav_commercial.qsrc

@@ -144,6 +144,45 @@ 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_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: 
+		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 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+				inhib_exp += rand(1,3)
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gs 'music_buskingevents', 'busking', 'pav'
+				
+				if rand(0,100) > 80 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
+					gt 'music_gigstarts', 'delparco_start', 'pav_commercial'
+				end
+			end
+		else	
+			act 'Start busking (1 hour) (<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 'Start busking (1 hour)':
+			gs 'music_buskingevents', 'busking', 'pav'
+			if rand(0,100) > 80 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
+				gt 'music_gigstarts', 'delparco_start', 'pav_commercial'
+			end		
+		end
+	end		
+end
+
 act 'Wait':gs 'obj_din', 'wait'
 
 !!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check

locations/pav_park.qsrc

@@ -169,6 +169,46 @@ if $ARGS[0] = 'start':
 		end
 	end
 
+
+	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: 
+			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 'Start busking (1 hour) (<<will_cost>> Willpower)': 
+					inhib_exp += rand(1,3)
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					gs 'music_buskingevents', 'busking', 'pav'
+					if rand(0,100) > 75 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
+						gt 'music_gigstarts', 'delparco_start', 'pav_park'
+					end						
+				end
+			else	
+				act 'Start busking (1 hour) (<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 'Start busking (1 hour)':
+				gs 'music_buskingevents', 'busking', 'pav'
+				if rand(0,100) > 75 and (pcs_instrmusic + pcs_vokal + pcs_perform) >= 120 and hotcat >= 5:
+					gt 'music_gigstarts', 'delparco_start', 'pav_park'
+				end				
+			end
+		end		
+	end
+
+
+
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
 		if hour >= 20 or (week > 5 and hour < 8) or (week < 6 and week mod 2 = 0 and hour < 14) or (week mod 2 = 1 and hour < 18):
 			'<br>Vicky and Vanya never are in the park at this time.'
@@ -233,9 +273,9 @@ if $ARGS[0] = 'alb_father_meeting_1':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting1.jpg"></center>'
-	'<i>"First of all, we need to take care of the corruption originating from the police force!!!"</i> the speech is ringing out to the crowd that are cheering on...'
-	'You take a closer look to see that is Albina''s father holding the speech. He''s really going hard on the authorities while the crowd is getting more and more rowdy.'
-	'<i>"Calm down everyone, don''t take out your anger now, instead go and show them at the ballots how upset you truly are!!!"</i> Albina''s father finishes to cheers from the crowd.'
+	'"First of all, we need to take care of the corruption originating from the police force!" A speech is ringing out to a cheering crowd.'
+	'You take a closer look and see that it is Albina''s father. He''s really going hard on the authorities while the crowd is getting more and more rowdy.'
+	'"Calm down everyone! Don''t take out your anger now! Instead, go and show them at the ballots how upset you truly are!" Albina''s father finishes to cheers from the crowd.'
 
 	act 'Go on with your day': gt 'pav_park', 'start'
 end
@@ -247,9 +287,9 @@ if $ARGS[0] = 'alb_father_meeting_2':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting2.jpg"></center>'
-	'<i>"Don''t believe the ridiculous accusations thrown against me! They''re just trying to smear me!"</i> he''s slamming the speaking booth as he passionately speaks.'
-	'The crowd is keeping calm except his most die hard supporters that are yelling profanities against the current administration.'
-	'Albina''s father continues on, <i>"I''m just a regular guy, just like the rest of you! My opponents are jealous of my self-made fortune! Why would I be corrupt if I''m already well-off?! No one can pay me off!"</i> he slams the booth again.'
+	'"Don''t believe the ridiculous accusations thrown against me! They''re just trying to smear me!" He''s slamming the podium as he passionately speaks.'
+	'The crowd is keeping calm, except for his most die hard supporters, who are yelling profanities against the current administration.'
+	'Albina''s father continues on. "I''m just a regular guy, just like the rest of you! My opponents are jealous of my self-made fortune! Why would I be corrupt if I''m already well-off?! No one can pay me off!" He slams the podium again.'
 	
 	act 'Go on with your day': gt 'pav_park', 'start'
 end
@@ -261,10 +301,10 @@ if $ARGS[0] = 'alb_father_meeting_3':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting3.jpg"></center>'
-	'You walk over to see what the commotion is about and you see Albina''s father speaking to the crowd as usual, the difference this time is that he seems a bit nervous and stutters a lot while speaking to the crowd. He continues on for a couple more minutes and by the end of the speech he''s profoundly sweating.'
-	'Just as he''s about to finish you hear him say, <i>And now for some entrainment, my daughter and her dance group and if you look at the right there are some refreshments for you all.</i>'
-	'The music starts and the dance group steps out, they''re all wearing really skimpy clothes and directly you can hear the hollering from the men while the females at the gathering are whispering amongst each other that they can''t believe that someone would walk out in those type of outfits...'
-	'You stay for a little while and watch the performance and after you get tired of it you move away while the music is still loudly playing in the background.'
+	'You walk over to see what the commotion is about and you see Albina''s father speaking to the crowd as usual. This time however, he seems very nervous and stutters a lot while speaking to the crowd. He continues on for a couple more minutes and by the end of the speech, he''s profoundly sweating.'
+	'He clears his throat a few times. "And now for some entertainment from my daughter and her dance group. If you look to the right, there are some refreshments available." He awkwardly steps away from the podium.'
+	'The music starts and the girls reluctantly step out. They''re all wearing skintight, skimpy leotards that leave nothing to the imagination. The men whistle and holler while the women look on in disgust, whispering amongst themselves that they can''t believe that young girls would wear such revealing outfits.'
+	'You stay and watch the performance. The girls are cleRrly uncomfortable with the situation and you see Albina glare at her father a few times. The girls finish their performance and quickly run from the stage as Albina''s father desperately tries to appease his dimishing crowd as everyone leaves, yourself included.'
 
 	act 'Leave': gt 'pav_park', 'start'
 end

locations/pav_shared_apt.qsrc

@@ -254,6 +254,7 @@ if $ARGS[0] = 'start':
 			!rent was forepaid, everything OK, proceed to next week
 			rentLeft += 2000
 			cashPaid = 0
+			servicePaid = 0			
 			rentWeekNum = weekNum + 1
 		elseif rentLeft > 0:
 			!rent was not fully paid
@@ -284,7 +285,7 @@ if $ARGS[0] = 'start':
 	end
 	
 	if rentPaid = 1:
-		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pavShared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pavShared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pavShared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>.'
+		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pav_shared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pav_shared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pav_shared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>.'
 		'You stand in the hallway. '
 		*nl
 		'From the hallway several doors lead to <a href="exec:gt ''pav_shared_apt'', ''ndRoom''"><<$nd_name>>''s</a>, <a href="exec:gt ''pav_shared_apt'', ''gpRoom''"><<$gp_name>>''s</a> and <a href="exec:gt ''pav_shared_apt'', ''spRoom''"><<$sp_name>>''s</a> rooms.'
@@ -549,7 +550,7 @@ if $ARGS[0] = 'list':
 	'---------------'
 	''
 	'Not having paid the full weekly rent at the beginning of a new week will lead to termination of the accommodation services.'
-	'Signed: <a href="exec: gt ''pavShared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pavShared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pavShared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>, <<$pcs_firstname>>.'
+	'Signed: <a href="exec: gt ''pav_shared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pav_shared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pav_shared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>, <<$pcs_firstname>>.'
 	''
 	'---------------'
 	act 'Continue':gt 'pav_shared_apt', 'start'
@@ -871,12 +872,12 @@ if $ARGS[0] = 'ndRoom':
 		'<<$nd_name>> is sleeping in his bed.'
 	elseif hour >= nd_wakes and hour < nd_leaves:
 		'<<$nd_name>> is already awake, getting ready to leave.'
-		act 'Approach him': gt 'pavShared_nd', 'nd'
+		act 'Approach him': gt 'pav_shared_nd', 'nd'
 	elseif hour >= nd_leaves and hour < nd_comes:
 		'<<$nd_name>> is not here.'
 	elseif hour >= nd_comes and hour < nd_sleeps:
 		'<<$nd_name>> is currently behind his desk, doing some clever IT stuff.'
-		act 'Approach him': gt 'pavShared_nd', 'nd'
+		act 'Approach him': gt 'pav_shared_nd', 'nd'
 	end
 	if servitudeLvl >= 1 and nd_cleaned = 0:
 		if poroshok >= 1:
@@ -902,12 +903,12 @@ if $ARGS[0] = 'gpRoom':
 
 	if hour >= gp_wakes and hour < gp_leaves:
 		'<<$gp_name>> is already awake, getting ready to leave.'
-		act 'Approach him': gt 'pavShared_gp', 'gp'
+		act 'Approach him': gt 'pav_shared_gp', 'gp'
 	elseif hour >= gp_leaves and hour < gp_comes:
 		'<<$gp_name>> is not here.'
 	elseif hour >= gp_comes and hour < gp_sleeps:
 		'<<$gp_name>> is currently on his bed, listing through some magazines.'
-		act 'Approach him': gt 'pavShared_gp', 'gp'
+		act 'Approach him': gt 'pav_shared_gp', 'gp'
 	elseif hour >= gp_sleeps or hour < gp_wakes:
 		'<<$gp_name>> is sleeping in his bed.'
 	end
@@ -935,14 +936,14 @@ if $ARGS[0] = 'spRoom':
 
 	if hour >= sp_wakes and hour < sp_leaves:
 		'<<$sp_name>> is already awake, packing his bags to leave.'
-		act 'Approach him': gt 'pavShared_sp', 'sp'
+		act 'Approach him': gt 'pav_shared_sp', 'sp'
 	elseif hour >= sp_leaves and hour < sp_comes:
 		'<<$sp_name>> is not here.'
 	elseif hour >= sp_comes and hour < sp_sleeps:
 		doesStuff = rand (0, 100)
 		if doesStuff < 50:'<<$sp_name>> is currently on his bed, listing through sport magazines.'
 		if doesStuff >= 50:'<<$sp_name>> is working out on the floor.'
-		act 'Approach him': gt 'pavShared_sp', 'sp'
+		act 'Approach him': gt 'pav_shared_sp', 'sp'
 	elseif hour >= sp_sleeps or hour < sp_wakes:
 		'<<$sp_name>> is sleeping in his bed.'
 	end

locations/saveupdater.qsrc

@@ -1,140 +1,5 @@
 # saveupdater
 
-!0.73 new menu.
-!delete old menus and rebuild.
-!killobj
-killvar 'Enable_settingmode'
-killvar 'menu_character'
-killvar 'menu_lookon'
-killvar 'menu_view'
-killvar 'menu_other'
-delobj '[Autosave]'
-delobj '<font color = green>Character</font>'
-delobj 'Skills'
-delobj 'Statistics'
-delobj 'Pain'
-delobj 'Traits'
-delobj 'Fame'
-delobj 'Renown'
-delobj 'Magic'
-delobj 'Face'
-delobj 'Body'
-delobj 'Clothing'
-delobj 'Panties'
-delobj 'Shoes'
-delobj 'Tattoos'
-delobj 'Piercing'
-delobj 'Phone'
-delobj 'Purse'
-delobj 'Notebook'
-delobj 'Refresh'
-delobj 'Settings'
-delobj 'Cheats'
-delobj '<font color = red><b>[</b></font>Autosave<font color = red><b>]</b></font>'
-delobj '<font color = green><b>[</b></font>Autosave<font color = green><b>]</b></font>'
-delobj ''
-delobj '<font color = red>Emergency</font>'
-delobj '<img src="images/system/icon/pers.png">'
-delobj '<img src="images/system/icon/look.png">'
-delobj '<img src="images/system/icon/proch.png">'
-delobj '<img src="images/system/icon/menu.png">'
-delobj '<img src="images/system/icon/phone.png">'
-delobj '<img src="images/system/icon/purse.png">'
-!add menus back to utility menu.
-gs 'obj_din', 'old'
-
-! 0.72 water to pcs_hydra
-if water > 0: pcs_hydra = water & killvar 'water'
-! 0.72 pavSharedApt changes.
-if step > 0: pavIntroStep = step & killvar 'step'
-
-pcs_dob = (birthyear * 10000) + (birthmonth * 100) + birthday
-
-if karinsucsexday > 0:tatianasucsexday = karinsucsexday & killvar 'karinsucsexday'
-if karinsucsex > 0: tatianasucsex = karinsucsex & killvar 'karinsucsex'
-if KarinSex > 0: tatianaSex = KarinSex & killvar 'KarinSex'
-
-if JenyaLCfirst > 0: LCEugenefirst = JenyaLCfirst & killvar 'JenyaLCfirst'
-if JenyaLC > 0:npc_rel['A89'] = JenyaLC & killvar 'JenyaLC'
-if serge_shulgin > 0:npc_rel['A112'] = serge_shulgin & killvar 'serge_shulgin'
-if barmenshameet > 0: npc_Qstlvl['A89'] = barmenshameet & killvar 'barmenshameet'
-if npc_QW['A66'] = 0: npc_QW['A66'] = piratsuka & killvar 'piratsuka'
-if npc_horny['A66'] = 0: npc_horny['A66'] = piratHorny & killvar 'pirathorny'
-if mirabandit = 0: mirabandit = mirapirat & killvar 'mirapirat'
-if banditfrend = 0: banditfrend = piratfrend & killvar 'piratfrend'
-killvar 'piratknow'
-killvar 'piratboggle'
-killvar 'know_no_pirat'
-if nastjaqw > 0: npc_QW['A192'] = nastjaqw
-killvar 'nastjaqw'
-if trenerepa > 0: npc_rel['A69'] = trenerepa
-killvar 'trenerepa'
-
-if Givi > 0: npc_rel['A41'] = Givi 
-killvar 'Givi'
-!! rachels - boyfriend stuff 2017 09 05
-if arrsize('pcs_lovers') > 0 and pcs_lovers[0] = 0:
-	copyarr '$loverdick_girth','$dick_girth'
-	copyarr 'loversilaVag','silaVag'
-	copyarr 'loverfinance','finance'
-	copyarr 'hairlover','haerlover'
-	copyarr 'loverizvrat','izvrat'
-	killvar '$dick_girth'
-	killvar 'silaVag'
-	killvar 'finance'
-	killvar 'haerlover'
-	killvar 'izvrat'
-
-	gs 'lover', 'remove', 0
-	pcs_lover += 1
-	boypic[0] = boypicA
-	meethour[0] = meethourA
-	svidanie[0] = svidanieA
-	meetday[0] = meetdayA
-
-	boypic[1] = boypicB
-	meethour[1] = meethourB
-	svidanie[1] = svidanieB
-	meetday[1] = meetdayB
-
-	boypic[2] = boypicC
-	meethour[2] = meethourC
-	svidanie[2] = svidanieC
-	meetday[2] = meetdayC
-
-	if pcs_lovers[2] = 0: gs 'lover', 'remove', 2
-	if pcs_lovers[1] = 0: gs 'lover', 'remove', 1
-	if pcs_lovers[0] = 0: gs 'lover', 'remove', 0
-end
-!! migrate picture ID
-if boypic[0] > 0 and lover_picture[0] = 0:
-	lover_picture[0] = boypic[0]
-	killvar 'boypic', 0
-end
-if boypic[1] > 0 and lover_picture[1] = 0:
-	lover_picture[1] = boypic[1]
-	killvar 'boypic', 1
-end
-if boypic[2] > 0 and lover_picture[2] = 0:
-	lover_picture[2] = boypic[2]
-	killvar 'boypic', 2
-end
-!! end boyfriend stuff
-!! rachels - pool/billiard skill- 2017 09 13
-if billiardnav > 0: pool_exp += billiardnav & killvar 'billiardnav' & killvar 'pcs_billiard'
-!! end pool stuff
-
-!! rachels - new years party stuff - 2017 10 28
-!! added because December saves have not calculated the nyp data
-	temp = func('shortgs','dow',year,12,31)
-	if temp < 6:
-		nyp_day = 31
-	elseif temp = 6:
-		nyp_day = 30
-	else
-		nyp_day = 29
-	end
-!!
 
 !!{if $pcs_dna = '':
 	$npc_dna['A1'] = '1594378993 1607632682 1428796224 1448474566 1775134737 1909315069 1882255348'
@@ -454,37 +319,6 @@ if spell_update < 2:
 end
 gs 'spellList'
 
-!! Updater for manna > mana conversions
-
-if pcs_manna ! 0:
-	pcs_mana = pcs_manna
-	killvar 'pcs_manna'
-end
-
-if mannaMax ! 0:
-	manaMax = mannaMax
-	killvar 'mannaMax'
-end
-
-if mannaV ! 0:
-	manaV = mannaV
-	killvar 'mannaV'
-end
-
-if KGManna ! 0:
-	KGMana = KGmanna
-	killvar 'KGManna'
-end
-
-if bonusmanna ! 0:
-	bonusmana = bonusmanna
-	killvar 'bonusmanna'
-end
-
-if mannareset ! 0:
-	manareset = mannareset
-	killvar 'mannareset'
-end
 
 if array_updater = 0:
 	array_updater = 1
@@ -567,11 +401,9 @@ if npcSex[6] > 0: npcSex[6] = 0 & npc_sex['A6'] = 1
 if npcSex[9] > 0: npcSex[10] = 0 & npc_sex['A9'] = 1
 if npcSex[10] > 0: npcSex[10] = 0 & npc_sex['A10'] = 1
 if npcSex[11] > 0: npcSex[11] = 0 & npc_sex['A11'] = 1
-if npcSex[14] > 0: npcSex[14] = 0 and npc_sex['A14'] = 1
-if npcSex[16] > 0: npcSex[16] = 0 and npc_sex['A16'] = 1
-if npcSex[23] > 0: npcSex[23] = 0 and npc_sex['A23'] = 1
-
-if npc_dob['A34'] ! 20001219: npc_dob['A34'] = 20001219
+if npcSex[14] > 0: npcSex[14] = 0 & npc_sex['A14'] = 1
+if npcSex[16] > 0: npcSex[16] = 0 & npc_sex['A16'] = 1
+if npcSex[23] > 0: npcSex[23] = 0 & npc_sex['A23'] = 1
 
 if telefon_rev < 2:
 	killvar '$contact'
@@ -595,9 +427,6 @@ if pee > 0: stat['pee'] += pee & killvar 'pee'
 if NatbelQW['pee'] > stat['pee_give']: stat['pee_give'] += NatbelQW['pee']
 if mistpiss > stat['pee_give'] - NatbelQW['pee']: stat['pee_give'] += mistpiss
 
-!!0.7.4 pavChurch variable rename
-if moral > 0: church_moral = moral & killvar 'moral'
-
 if thpic ! 0: killvar 'thpic'
 if puspic ! 0: killvar 'puspic'
 

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'

locations/sny.qsrc

@@ -192,8 +192,12 @@ if $ARGS[0] = '7':
 		act 'Hey! Where are you dragging me?': minut += 5 & gt 'sny', '10'
 	elseif alko > 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/alb.jpg"></center>'
-		'You are a little drunk, but having fun. When you notice, Albina sitting on the couch and kissing Ivan, while Fedor paws at her breasts. Looking around you some more you notice that Katja nowhere to be seen.'
-
+		if fedorKozlovQW = 0:
+			'You are a little drunk, but having fun. When you notice, Albina sitting on the couch and kissing Ivan, while Fedor paws at her breasts. Looking around you some more you notice that Katja nowhere to be seen.'
+		else	
+			'You are a little drunk, but having fun. When you notice, Albina sitting on the couch and kissing Ivan. Looking around you some more you notice that Katja nowhere to be seen.'
+		end
+		
 		act 'Search for Katja':
 			*clr & cla
 			SeeKatBang = 1
@@ -243,14 +247,18 @@ if $ARGS[0] = '8':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa8.jpg"></center>'
-	'Back in the main room, you saw, that most continue to drink and dance. Albina, Ivan and Fedor are no where to be seen anymore. Some of the girls are getting wild in the middle of the room Kristinka even pulls down her pants showing off her bare ass.'
+	'Back in the main room, you saw, that most continue to drink and dance. Albina, Ivan and Fedor are no where to be seen anymore. Some of the girls are getting wild in the middle of the room Christina even pulls down her pants showing off her bare ass.'
 
 	act 'Search Albina':
 		*clr & cla
 		seeAlbinaFuck = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/alb.jpg"></center>'
-		'You began to walk around the apartment in search of Albina, behind one of the doors you hear woman moaning and a creaking bed. Peeking in the door you see Fedor and Ivan fucking Albina hard. Albina is covered in sweat, with smeared makeup on her face, muffled moans or groans it is hard to tell come from Albina. Fedor has his cock stuffed in her mouth, while Ivan is taking her from behind. Judging by the height and angle it looks like he is fucking her in the ass and just tearing it up.'
+		if fedorKozlovQW = 0:
+			'You began to walk around the apartment in search of Albina, behind one of the doors you hear woman moaning and a creaking bed. Peeking in the door you see Fedor and Ivan fucking Albina hard. Albina is covered in sweat, with smeared makeup on her face, muffled moans or groans it is hard to tell come from Albina. Fedor has his cock stuffed in her mouth, while Ivan is taking her from behind. Judging by the height and angle it looks like he is fucking her in the ass and just tearing it up.'
+		else
+			'You began to walk around the apartment in search of Albina, behind one of the doors you hear woman moaning and a creaking bed. Peeking in the door you see Lazar and Ivan fucking Albina hard. Albina is covered in sweat, with smeared makeup on her face, muffled moans or groans it is hard to tell come from Albina. Lazar has his cock stuffed in her mouth, while Ivan is taking her from behind. Judging by the height and angle it looks like he is fucking her in the ass and just tearing it up.'
+		end
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'

locations/torgcentr.qsrc

@@ -15,12 +15,12 @@ if hour >= 8 and hour <= 20:
 	*p '<center><a href="exec: minut += 3 & gt ''pussykats'', ''start''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a>'
 !! Pussy-Kats - Youth clothing shop
 		*p '   '
-	*p '<a href="exec: minut += 3 & gt ''sportShop'', ''start''"><img src="images/locations/city/citycenter/mall/sports.png"></a>'
-!! Danilovich Sporting goods - Sports shop
-		*p '   '
 	*p'<a href="exec: minut += 3 & gt ''moncheri'', ''start''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a>'
 !!Mon Cheri - European style expensive boutique
 		*p '   '
+	*p'<a href="exec: minut += 3 & gt ''lusso'', ''start''"><img src="images/locations/city/citycenter/mall/lusso.png"></a>'
+!!Lusso Intimo - European style expensive underwear
+		*p '   '
 	*p '<a href="exec: minut += 3 & gt ''NewCloShop'',''start''"><img src="images/locations/city/citycenter/mall/fashionistat.png"></a>'
 !! Fashionista - Shop for designer brands
 	
@@ -28,6 +28,9 @@ if hour >= 8 and hour <= 20:
 	*nl
 	*nl
 	
+	*p '<a href="exec: minut += 3 & gt ''sportShop'', ''start''"><img src="images/locations/city/citycenter/mall/sports.png"></a>'
+!! Danilovich Sporting goods - Sports shop
+		*p '   '
 	*p '<a href="exec: minut += 3 & gt ''salon'', ''start''"><img src="images/locations/city/citycenter/mall/beautybart.png"></a>'
 !! Beauty bar - Salon
 		*p '   '
@@ -47,6 +50,11 @@ if hour >= 8 and hour <= 20:
 	*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
 
+	act 'Go to the O''Skull Music Store': 
+		ml_boughtamp = 0
+		ml_boughtguitar = 0
+		gt 'city_musicstore', 'musicshop'
+	end
 
 	act 'Leave': minut += 5 & gt 'city_center'
 	act 'Go to the supermarket': gt 'shop', 'start'