[fixes] small edits to club

locations/club.qsrc

@@ -2,11 +2,13 @@
 CLOSE ALL
 
 if $ARGS[0] = 'start':
-	$sexloc = $CURLOC
-    $location_type = 'public_outdoors'
+	$loc = 'club'
+	$metka = 'start'
 	$menu_loc = 'club'
 	$menu_arg = 'start'
 	menu_off = 0
+	$location_type = 'public_outdoors'
+	$sexloc = $curloc
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -15,10 +17,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club.jpg"></center>'
 	'The entrance area of the club is full of young people. The entrance itself is guarded by the heavy and strong type of men, who check everyones passport. A Ticket costs 250 <b>₽</b>.'
 
-	act 'Return to the city center':
-		minut += 5
-		gt 'down'
-	end
+	act 'Return to the city center': minut += 5 & gt 'down'
 
 	if clubwork = 1:
 		act 'Meet Erik for work':
@@ -79,9 +78,12 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'inside':
+	$loc = 'club'
+	$metka = 'inside'
 	$menu_loc = 'club'
 	$menu_arg = 'inside'
 	menu_off = 0
+	$location_type = 'public_indoors'
 	*clr & cla
 	minut += 5
 	frost = 0
@@ -89,27 +91,25 @@ if $ARGS[0] = 'inside':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Night club</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club9.jpg"></center>'
-	'<a href="exec:gt ''club'', ''vip''">Vip-room.</a>'
 	'The music here is loud and the bass is thumping. You see a laser show on the stage and on the poorly lit dancefloor you see the people dancing, like there''s no tomorrow.'
+	*nl
+	'There is also a <a href="exec:gt ''club'', ''vip''">vip-room</a>.'
 
 	if hour >= 18 and pcs_apprnc > 88 and clubwork = 0 and clubno = 0 and rand (0,10) = 0:
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 		'You are approached by a man in a suit, at first you think he must be security, but his suit looks too expensive.'
 		'"Hi there, my name''s Erik, I''m the promoter for the club. I''m looking for someone for some casual work and you have the right look."'
 		act 'Hear him out':
-			cla
-			*clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 			'"The club opens at 6pm you can work for an hour at a time upto 1am. The jobs vary according to time and demand, It includes finding customers to bring to the club, promoting drinks and some dancing."'
 			'"The pay depends on results, get more people in, get people taking up drink promotions or dance well and you get 200 <b>₽</b>. Do worse, you get less, do well, you get a bonus. When you finish you can stay in the club, so you get free entry."'
 			'"So, are you interested?"'
 			act 'No':clubno = 1 & gt 'club', 'inside'
 			act 'Yes':
-				cla
-				*clr
+				*clr & cla
 				clubwork = 1
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 				'You tell Erik you are interested and he takes your details.'
@@ -128,10 +128,9 @@ if $ARGS[0] = 'inside':
 		gt 'down'
 	end
 	
-	if hour >= 18  and clubwork = 0 and clubno = 1:
+	if hour >= 18 and clubwork = 0 and clubno = 1:
 		act 'Look for the promoter':
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
@@ -159,14 +158,13 @@ if $ARGS[0] = 'inside':
 
 	if hour <= 3 or hour >= 18:
 		act 'Use the toilet':gt 'club', 'toi'
-		act 'Have a dance':gt 'club', 'dance'
+		act 'Go to the dance floor':gt 'club', 'dance'
 		act 'Go to the bar':gt 'club', 'bar'
 	end
 
 	if (hour < 1 or hour >= 18) and clubwork = 1:
 		act 'Find Erik for work':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 			'You search around and it only takes a few minutes to find Erik in his suit.'
@@ -180,6 +178,7 @@ if $ARGS[0] = 'toi':
 	$menu_arg = 'toi'
 	menu_off = 0
 	*clr & cla
+	gs 'stat'
 	'Shit, there''s a very long queue infront of the womens toilet. You can''t tell how long this is going to take.'
 
 	act 'Wait in line':
@@ -220,10 +219,8 @@ if $ARGS[0] = 'toi':
 end
 
 if $ARGS[0] = 'tou':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'tou'
+	$loc = 'club'
 	$locM = 'club'
 	$metkaM = 'tou'
     $location_type = 'bathroom'
@@ -236,7 +233,7 @@ if $ARGS[0] = 'tou':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">WC</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club3.jpg"></center>'
-	''
+	*nl
 
 	act 'Leave the toilet':gt 'club', 'inside'
 
@@ -259,7 +256,7 @@ if $ARGS[0] = 'dance':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club9.jpg"></center>'
 	'The club is filled to the brink with people. Most of which are dancing on the dancefloor.'
 	
-	act 'Leave':gt 'club', 'inside'
+	act 'Leave the dance floor':gt 'club', 'inside'
 	
 	if hour <= 3 or hour >= 18:
 		act 'Dance (0:15)':
@@ -285,8 +282,7 @@ if $ARGS[0] = 'dance':
 				act 'Stop dancing':gt 'club', 'inside'
 				
 				act 'Dance with him':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club8.jpg"></center>'
 					'You continue to dance with the guy on the dancefloor, but he doesn''t stop touching your. It somehow gets you excited, when a random guy is touching you in public.'
 
@@ -309,10 +305,7 @@ if $ARGS[0] = 'dance':
 							gs 'stat'
 							picrand = 38
 
-							if pcs_horny < 70:
-								act 'Go to the dance floor':gt 'club', 'dance'
-							end
-
+							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
 							act 'Go to Vip-room with the guy':$sexloc = 'vipclub' & xgt 'sex', 'var'
 						elseif dansexclub = 0:
 							'You''re passionately kissing the guy, while he''s continously groping you, always dedicating one of his hands to either your tits or your ass. "Let''s go to the toilet.", he says with a smile.'
@@ -320,18 +313,14 @@ if $ARGS[0] = 'dance':
 							gs 'arousal', 'kiss', 15, 'sub'
 							gs 'stat'
 
-							if pcs_horny < 70:
-								act 'Go to the dance floor':gt 'club', 'dance'
-							end
-
+							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
 							act 'Go to the toilet with a guy':gt 'club', 'sex'
 						end
 					end
 				end
 
 				if clrand > 85:
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/dancelezb.jpg"></center>'
 					'While you''re dancing you a hand groping your ass. You turn around to see who touched your, but you''re surprised to see women smiling at you, she seems to be biting her lips.'
 					dansexclub = rand(0, 1)
@@ -425,7 +414,7 @@ if $ARGS[0] = 'dance':
 	else
 		menu_off = 1
 		'Its getting late and the music stops, looks like it might be time to go home.'
-		act 'Leave':gt 'club', 'inside'
+		act 'Leave the dance floor': gt 'club', 'inside'
 	end	
 end