Merge remote-tracking branch 'Anjuna/master'

locations/intro_city.qsrc

@@ -163,6 +163,7 @@ if $ARGS[0] = 'family_goodbye':
 end
 
 if $ARGS[0] = 'welcome_intro':
+	music_loop = 0
 	CLOSE ALL
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech

locations/intro_city_m.qsrc

@@ -109,7 +109,8 @@ if $ARGS[0] = 'wakeup':
 							act 'Follow Gustav':
 								money = 5000
 								*clr & cla
-								'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/start_sg.jpg"></center>'
+								!! Not sure what this should be???
+								'<center><img <<$set_imgh>> src="images/system/1_openings/5_city/city_start.jpg"></center>'
 								'You give Gustav directions to your apartment building. Half an hour later, he drops you off in front of your apartment building in Pavlovsk. You head inside and, feeling exhausted after the days events, you go to your room and collapse on the bed, quickly falling asleep.'
 								act '<center><b>Done</b></center>': gt 'intro_city', 'start'
 							end
@@ -122,6 +123,7 @@ if $ARGS[0] = 'wakeup':
 end
 
 if $ARGS[0] = 'welcome_intro':
+	music_loop = 0
 	CLOSE ALL
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech

locations/intro_city_tg.qsrc

@@ -389,6 +389,7 @@ if $ARGS[0] = 'sleepPRE':
 end
 
 if $ARGS[0] = 'welcome_intro':
+	music_loop = 0
 	CLOSE ALL
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech

locations/intro_sg.qsrc

@@ -54,6 +54,7 @@ if $ARGS[0] = 'five':
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/start_sg.jpg"></center>'
 	'Welcome to the Schoolgirl version! You will need to carry on with your school life, manage your relationships and deal with whatever else comes up along the way!'
 	act 'Start':
+		music_loop = 0
 		close all
 		if start_location = 0:
 			gt 'intro_sg', 'intro_pavlovsk'
@@ -73,6 +74,7 @@ end
 
 
 if $ARGS[0] = 'intro_pavlovsk':
+	music_loop = 0
 	CLOSE ALL
 	menu_off = 1
 	grandmaQW['last_month_paid'] = month
@@ -136,6 +138,7 @@ if $ARGS[0] = 'intro_pavlovsk':
 end
 
 if $ARGS[0] = 'intro_gadukino':
+	music_loop = 0
 	CLOSE ALL
 	menu_off = 1
 	grandmaQW['last_month_paid'] = month

locations/intro_sg_m.qsrc

@@ -136,6 +136,7 @@ if $ARGS[0] = 'six':
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/start_csg.jpg"></center>'
 	'Welcome to the Cursed Schoolgirl version! Guide <<$pcs_nickname>> through her school life, relationships and myriad of other issues that might pop up, all with the added spice of magic to keep things interesting!'
 	act 'Begin':
+		music_loop = 0
 		close all
 		if start_location = 0:
 			gt 'intro_sg', 'intro_pavlovsk'

locations/intro_uni.qsrc

@@ -294,6 +294,7 @@ if $ARGS[0] = 'family_goodbye':
 end
 
 if $ARGS[0] = 'welcome_intro':
+	music_loop = 0
 	CLOSE ALL
 	daystart_start = 603
 	daystart = daystart_start

locations/intro_uni_m.qsrc

@@ -121,6 +121,7 @@ if $ARGS[0] = 'wakeup':
 end
 
 if $ARGS[0] = 'welcome_intro':
+	music_loop = 0
 	CLOSE ALL
 	daystart_start = 603
 	daystart = daystart_start

locations/intro_uni_tg.qsrc

@@ -387,6 +387,7 @@ if $ARGS[0] = 'sleepPRE':
 end
 
 if $ARGS[0] = 'welcome_intro':
+	music_loop = 0
 	CLOSE ALL
 	daystart_start = 603
 	daystart = daystart_start

locations/stwork3.qsrc

@@ -221,13 +221,9 @@ end
 
 if $ARGS[0] = 'events1':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
-	'Your break over, you get back to work serving the crowd of thirsty patrons.'
 
-	strip_club['rand'] = rand(0,8)
+	strip_club['rand'] = rand(0, 8)
 	if strip_club['rand'] = 0:
-		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/.jpg"></center>'
 		'Serving a table at one of the private booths, you see two intimidating men sitting with a girl who looks like she''s high on something, and probably a little drunk as well. She crawls under the table as one of the men glares at you.'
 		'"Just put the drinks down and leave. You didn''t see anything."'
@@ -235,8 +231,6 @@ if $ARGS[0] = 'events1':
 		act 'Leave': gt 'stwork3', 'shift_end'
 
 	elseif strip_club['rand'] = 1:
-		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/serve.jpg"></center>'
 		'You serve a table with two men watching the show on stage. They both drunkenly slap and grope your ass as you serve them their drinks.'
 
@@ -256,8 +250,7 @@ if $ARGS[0] = 'events1':
 			'You stuff it away and smile sweetly at the men, putting some sway in your hips as you walk away.'
 			act 'Leave': gt 'stwork3', 'shift_end'
 		end
-	elseif strip_club['rand'] = 2 and pcs_apprnc > 60:
-		*clr & cla
+	elseif strip_club['rand'] = 2 and pcs_hotcat >= 6:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/waitress_client.jpg"></center>'
 		'You serve a man sitting at a table in a private booth. He looks at you appreciatively. "Hey girl, want to keep me company?"'
 		'You notice the bulge in his pants.'
@@ -301,7 +294,6 @@ if $ARGS[0] = 'events1':
 			end
 		end
 	elseif strip_club['rand'] = 4:
-		*clr & cla
 		pcs_horny += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand.jpg"></center>'
@@ -325,7 +317,6 @@ if $ARGS[0] = 'events1':
 		end
 	elseif strip_club['rand'] = 5:
 		if AlbinaQW['seen_strip'] = 0 and locat['A23'] = 21:
-			*clr & cla
 			AlbinaQW['seen_strip'] = 1
 			gs 'stat'
 			!! IMAGE
@@ -341,6 +332,10 @@ if $ARGS[0] = 'events1':
 				act 'Get back to work': gt 'stwork3', 'shift_end'
 			end
 		elseif AlbinaQW['seen_strip'] = 1 and locat['A23'] = 21:
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+			'Your break over, you get back to work serving the crowd of thirsty patrons.'
+
 			if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 				'You see Albina out on the floor in search of clients. She flashes you a smile and wiggles her ass in your direction, which gets the attention of a man who approaches and asks for a dance.'
 				'She winks at you before seductively leading him to one of the private rooms.'
@@ -350,11 +345,13 @@ if $ARGS[0] = 'events1':
 				act 'Get back to work': gt 'stwork3', 'shift_end'
 			end
 		else
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+			'Your break over, you get back to work serving the crowd of thirsty patrons.'
 			'You see a stripper prowling the floor in search of a client wanting a lap dance. She quickly sets her sights on a man in the queue at the bar and starts flirting with him.'
 			act 'Get back to work': gt 'stwork3', 'shift_end'
 		end
 	elseif strip_club['rand'] = 6:
-		*clr & cla
 		minut += 2
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/ruby_sex.mp4"></video></center>'
@@ -410,7 +407,6 @@ if $ARGS[0] = 'events1':
 			end
 		end
 	elseif strip_club['rand'] = 7:
-		*clr & cla
 		minut += 2
 		gs 'stat'
 		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/stripper_bj.mp4"></video></center>'
@@ -446,7 +442,6 @@ if $ARGS[0] = 'events1':
 			act 'Leave': gt 'stwork3', 'shift_end'
 		end
 	elseif strip_club['rand'] = 8 and pcs_hotcat >= 6:
-		*clr & cla
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
@@ -459,6 +454,11 @@ if $ARGS[0] = 'events1':
 			act 'Go to his office': gt 'stwork2', 'manager_bonus'
 			act 'Turn him down': gt 'stwork3', 'shift_end'
 		end
+	else
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+		'Your break over, you get back to work serving the crowd of thirsty patrons.'
+		act 'Leave': gt 'stwork3', 'shift_end'
 	end
 end