[Modified] Changed 'club' to 'city_nightclub'

changes from 0_8_5 to 0_8_6.txt

@@ -17,6 +17,7 @@ npc_intro					-> gs 'npc','intro',..,..
 gschool_schedule			-> gs 'gschool', 'schedule'
 cum_arrcheat				-> gs 'fertility', 'cum_arrcheat'
 gKristinaZv					-> gt 'Zvereva_sub_1', 'showers'
+club                                    -> gt 'city_nightclub'
 
 Variables:
 

glife.qproj

@@ -829,7 +829,7 @@
 		<Location name="lusso"/>
 		<Location name="butoilet"/>
 		<Location name="cfnm"/>
-		<Location name="club"/>
+		<Location name="city_nightclub"/>
 		<Location name="Club2"/>
 		<Location name="vipclub"/>
 		<Location name="danceclass"/>

locations/Club2.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'toilet1':
 	'The next thing you know, a cock is pushed through the hole. A lustful voice says, "here''s a treat for you, baby."'
 	'This is so unexpected, that you hardly believe any of this is real, as you tentatively touch their member. It is hard and hot.'
 
-	act 'Leave':gt 'club', 'inside'
+	act 'Leave':gt 'city_nightclub', 'inside'
 
 	act 'Take a closer look':
 		*clr & cla
@@ -53,7 +53,7 @@ if $ARGS[0] = 'toilet1':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave':gt 'club', 'inside'
+				act 'Leave':gt 'city_nightclub', 'inside'
 			end
 
 			act 'Spit out':
@@ -69,7 +69,7 @@ if $ARGS[0] = 'toilet1':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave':gt 'club', 'inside'
+				act 'Leave':gt 'city_nightclub', 'inside'
 			end
 		end
 	end
@@ -83,7 +83,7 @@ if $ARGS[0] = 'toilet':
 	gs 'arousal', 'clit_finger', 3 
 	gs 'stat'
 
-	act 'Leave':gs 'arousal', 'end' & gt 'club', 'inside'
+	act 'Leave':gs 'arousal', 'end' & gt 'city_nightclub', 'inside'
 
 	act 'Caress yourself':
 		cla
@@ -102,7 +102,7 @@ if $ARGS[0] = 'toilet':
 		gs 'arousal', 'end'
 		gs 'stat'
 	
-		act 'Leave':gt 'club', 'inside'
+		act 'Leave':gt 'city_nightclub', 'inside'
 	end
 end
 
@@ -111,7 +111,7 @@ if $ARGS[0] = 'toilet2':
 	'You sit in a booth and hear both adjacent doors closing as two others enter.'
 	'A voice from the next stall tells you - "Don''t be afraid baby, we won''t hurt you! On the contrary, we will give you some delicious candy with extra cream filling.'
 
-	act 'Leave':gt 'club', 'inside'
+	act 'Leave':gt 'city_nightclub', 'inside'
 
 	act 'Take a closer look':
 		*clr & cla
@@ -189,10 +189,10 @@ if $ARGS[0] = 'toilet2':
 								'A male voice says "I have some more work for you."'
 								'He pushes a card through the hole and says "Come find me at my studio if you want to have fun and make more money."'
 
-								act 'Leave':gt 'club', 'inside'
+								act 'Leave':gt 'city_nightclub', 'inside'
 							end
 						else
-							act 'Leave':gt 'club', 'inside'
+							act 'Leave':gt 'city_nightclub', 'inside'
 						end
 					end
 				end

locations/city_center.qsrc

@@ -182,7 +182,7 @@ end
 'A few buildings away is <<$desc_txt1>> and <<$desc_txt2>>, a place for cheap fast food. For a more lavish dining experience, <<$desc_txt3>> is available.'
 *nl
 if week >= 4 and (hour >= 18 or hour <= 3):
-	$desc_txt3 = '<a href="exec:gt ''club'', ''start''">the nightclub</a>'
+	$desc_txt3 = '<a href="exec:gt ''city_nightclub'', ''start''">the nightclub</a>'
 else
 	$desc_txt3 = '<a href="exec:msg ''The nightclub is closed and will open from Friday to Sunday at 18:00''">The nightclub</a>'
 end

locations/club.qsrc → locations/city_nightclub.qsrc

@@ -1,15 +1,15 @@
-# club
+# city_nightclub
 !!2021/04/15
 CLOSE ALL
 !!needs a complete rework of the club
 if $ARGS[0] = 'start':
-	$loc = 'club'
+	$loc = 'nightclub'
 	$loc_arg = 'start'
-	$menu_loc = 'club'
+	$menu_loc = 'nightclub'
 	$menu_arg = 'start'
 	menu_off = 0
 	$location_type = 'public_outdoors'
-	$sexloc = 'club'
+	$sexloc = 'nightclub'
 	*clr & cla
 	minut += 5
 	gs 'stat'
@@ -30,22 +30,22 @@ if $ARGS[0] = 'start':
 			if pcs_makeup > 1 and pcs_sweat < 30 and (PCloSkirt > 2 or PCloPants > 4 or ($clothingworntype = 'salacious_dress' or $clothingworntype = 'salacious_outfits')):
 				minut += 5
 				'He nods and says something into his walkie-talkie. A couple of minutes later you meet Erik in the foyer.'
-				act 'Talk to him':gt 'club', 'work'
+				act 'Talk to him':gt 'city_nightclub', 'work'
 			elseif PCloStyle = 4:
 				'He shakes his head, if you''re looking for paying clients, try the road by the park this is not a brothel.'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			elseif pcs_sweat >= 30:
 				'"God, you actually smell!"'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			elseif pcs_makeup = 1:
 				'You have to wear some makeup to start your work.'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			elseif pcs_makeup = 0:
 				'"Fix your makeup first, girl. You look horrible."'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			else
 				'He tells you that you are over-dressed, you need to wear something shorter, or much more daring if you want to work.'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			end
 		end
 	end
@@ -58,27 +58,27 @@ if $ARGS[0] = 'start':
 				minut += 5
 				money -= 250
 				frost = 0
-				gt 'club', 'inside'
+				gt 'city_nightclub', 'inside'
 			elseif PCloStyle = 4:
 				cla
 				'He shakes his head, if you''re looking for paying clients, try the road by the park this is not a brothel.'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			elseif pcs_sweat >= 50:
 				cla
 				'The bouncer shakes his head. "God, girl, you actually smell!"'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			elseif pcs_makeup = 1:
 				cla
 				'The bouncer shakes his head. "At least wear some makeup, girl."'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			elseif pcs_makeup = 0:
 				cla
 				'The bouncer shakes his head. "Fix your makeup first, girl."'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			else
 				cla
 				'The bouncer shakes his head. "Don''t you have some sexy clothes?"'
-				act 'Continue':gt 'club', 'start'
+				act 'Continue':gt 'city_nightclub', 'start'
 			end
 		end
 	end
@@ -101,7 +101,7 @@ if $ARGS[0] = 'inside':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club9.jpg"></center>'
 	'The music here is loud and the bass is thumping. You see a laser show on the stage and on the poorly lit dance floor filled with people dancing, like there''s no tomorrow.'
 	*nl
-	'There is also a <a href="exec:gt ''club'', ''vip''">vip-room</a>.'
+	'There is also a <a href="exec:gt ''city_nightclub'', ''vip''">vip-room</a>.'
 
 	if hour >= 18 and hotcat >= 6 and clubwork = 0 and clubno = 0 and rand (0,10) = 0:
 		*clr & cla
@@ -115,14 +115,14 @@ if $ARGS[0] = 'inside':
 			'"The club opens at 6pm you can work for an hour at a time up to 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 buying up the promotional drinks or if you dance well and you get 200 <b>₽</b>. Do worse, you get less, do very well, you get a bonus. When you finish you can stay in the club, so you get free entry as well."'
 			'"So, are you interested?"'
-			act 'No':clubno = 1 & gt 'club', 'inside'
+			act 'No':clubno = 1 & gt 'city_nightclub', 'inside'
 			act 'Yes':
 				*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.'
 				'"Great <<$pcs_nickname>>, you can find me here, and I''ll place your details on the door so you can get in, but you still have to do your makeup and dress for clubbing."'
-				act 'Return':gt 'club', 'inside'
+				act 'Return':gt 'city_nightclub', 'inside'
 			end
 		end
 
@@ -145,7 +145,7 @@ if $ARGS[0] = 'inside':
 			'You search the club for a few minutes, before finding the promoter.'
 			if hotcat >= 6:
 				'He asks you if you''ve changed your mind and want to do some work for him.'
-				act 'No':clubno = 1 & gt 'club', 'inside'
+				act 'No':clubno = 1 & gt 'city_nightclub', 'inside'
 				act 'Yes':
 					cla
 					*clr
@@ -154,7 +154,7 @@ if $ARGS[0] = 'inside':
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 					'You tell Erik you are interested and he takes your details.'
 					'"Great <<$pcs_nickname>>, you can find me here, and I''ll place your details on the door so you can get in, but you still have to do your makeup and dress for clubbing."'
-					act 'Return':gt 'club', 'inside'
+					act 'Return':gt 'city_nightclub', 'inside'
 				end
 			else
 				'You ask him about work, but he says you''re not pretty enough and walks off. You are shocked enough that you just stand there and watch him walk away.'
@@ -165,9 +165,9 @@ if $ARGS[0] = 'inside':
 	end
 
 	if hour <= 3 or hour >= 18:
-		act 'Use the toilet':gt 'club', 'toi'
-		act 'Go to the dance floor':gt 'club', 'dance'
-		act 'Go to the bar':gt 'club', 'bar'
+		act 'Use the toilet':gt 'city_nightclub', 'toi'
+		act 'Go to the dance floor':gt 'city_nightclub', 'dance'
+		act 'Go to the bar':gt 'city_nightclub', 'bar'
 	end
 
 	if (hour < 1 or hour >= 18) and clubwork = 1:
@@ -176,7 +176,7 @@ if $ARGS[0] = 'inside':
 			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.'
-			act 'Talk to him':gt 'club', 'work'
+			act 'Talk to him':gt 'city_nightclub', 'work'
 		end
 	end
 end
@@ -196,7 +196,7 @@ if $ARGS[0] = 'toi':
 		gs 'stat'
 		'Finally there''s a free booth for you.'
 
-		act 'WC':gt 'club', 'tou'
+		act 'WC':gt 'city_nightclub', 'tou'
 	end
 
 	act 'Sneak into the mens toilet':
@@ -208,7 +208,7 @@ if $ARGS[0] = 'toi':
 		act 'Find a free cubicle':
 
 			if TQuest = 0 and pcs_horny < 50:
-				gt 'club', 'tou'
+				gt 'city_nightclub', 'tou'
 			elseif TQuest = 0 and pcs_horny >= 50:
 				gt 'Club2', 'toilet'
 			elseif TQuest = 1:
@@ -216,14 +216,14 @@ if $ARGS[0] = 'toi':
 			elseif TQuest = 2:
 				gt 'Club2', 'toilet2'
 			elseif TQuest >= 3 and rand(1, 100) < 60:
-				gt 'club', 'tou'
+				gt 'city_nightclub', 'tou'
 			elseif TQuest >= 3:
 				gt 'Club2', 'toilet1'
 			end
 		end
 	end
 
-	act 'Go back to the dancefloor':gt 'club', 'inside'
+	act 'Go back to the dancefloor':gt 'city_nightclub', 'inside'
 end
 
 if $ARGS[0] = 'tou':
@@ -244,7 +244,7 @@ if $ARGS[0] = 'tou':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club3.jpg"></center>'
 	*nl
 
-	act 'Leave the toilet':gt 'club', 'inside'
+	act 'Leave the toilet':gt 'city_nightclub', 'inside'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
@@ -265,7 +265,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 whom are on the dance floor having a great time.'
 	
-	act 'Leave the dance floor':gt 'club', 'inside'
+	act 'Leave the dance floor':gt 'city_nightclub', 'inside'
 	
 	if hour <= 3 or hour >= 18:
 		act 'Dance (0:15)':
@@ -293,7 +293,7 @@ if $ARGS[0] = 'dance':
 
 				'While you''re dancing you feel that someone is groping your ass, you turn around and see <<$boybod>>, <<$boyface>> haired guy of <<$boybody>> height. He''s <<$boyClo>>'
 
-				act 'Stop dancing':gt 'club', 'inside'
+				act 'Stop dancing':gt 'city_nightclub', 'inside'
 				
 				act 'Dance with him':
 					*clr & cla
@@ -304,7 +304,7 @@ if $ARGS[0] = 'dance':
 					gs 'stat'
 
 					if pcs_horny < 90:
-						act 'Go to the dance floor':gt 'club', 'dance'
+						act 'Go to the dance floor':gt 'city_nightclub', 'dance'
 					end
 
 					act 'Kiss':
@@ -316,7 +316,7 @@ if $ARGS[0] = 'dance':
 							gs 'arousal', 'kiss', 15, 'sub'
 							gs 'stat'							
 
-							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
+							if pcs_horny < 70: act 'Go to the dance floor':gt 'city_nightclub', 'dance'
 							act 'Go to Vip-room with the guy':picrand = 38 & $sexloc = 'vipclub' & xgt 'sex', 'var'
 
 							act 'Suggest going to his place':
@@ -335,8 +335,8 @@ if $ARGS[0] = 'dance':
 							gs 'arousal', 'kiss', 15, 'sub'
 							gs 'stat'
 
-							if pcs_horny < 70: act 'Go to the dance floor':gt 'club', 'dance'
-							act 'Go to the toilet with a guy':gt 'club', 'sex'
+							if pcs_horny < 70: act 'Go to the dance floor':gt 'city_nightclub', 'dance'
+							act 'Go to the toilet with a guy':gt 'city_nightclub', 'sex'
 							act 'Suggest going to his place':
 								cla
 								'You lean in and whisper: "How about we have fun at your place?". His eyes light up. Before you even notice, he grabs your hand and walk you toward the exit.'
@@ -355,10 +355,10 @@ if $ARGS[0] = 'dance':
 					'<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 butt, but you''re surprised to see a woman smiling at you, she is seductively biting her lip.'
 					
-					act 'Stop dancing':gt 'club', 'inside'
+					act 'Stop dancing':gt 'city_nightclub', 'inside'
 					
 					if rand(0, 1) = 0:
-						act '"Let''s go to the toilet, to have fun."':gt 'club', 'lezbsort'
+						act '"Let''s go to the toilet, to have fun."':gt 'city_nightclub', 'lezbsort'
 					else
 						act '"Let''s go to VIP-Room, to have fun."': picrand = rand(13, 17) & $sexloc = 'vipclub' & xgt 'lezbsex', 'var'
 					end
@@ -366,7 +366,7 @@ if $ARGS[0] = 'dance':
 			end
 
 			killvar 'clrand'
-			act 'Go away':gt 'club', 'dance'
+			act 'Go away':gt 'city_nightclub', 'dance'
 		end
 
 		act 'Go up to the DJ (0:30)':
@@ -393,13 +393,13 @@ if $ARGS[0] = 'dance':
 						'Into the booth came a man, who seems to be somewhere in forties. He has a large belly, has a bald head and is wearing glasses. Alexei greeted him and introduced you to him, his name is Alexander E. and he''s the owner of the club.'
 						'Alexander had a small talk with Alexei, then he left again.'
 
-						act 'Leave the booth':gt 'club', 'dance'
+						act 'Leave the booth':gt 'city_nightclub', 'dance'
 
 						exit
 					end
 
 					if alexeyClubSex ! 3 or sashaClubQW > 0:
-						act 'Leave the booth':gt 'club', 'dance'
+						act 'Leave the booth':gt 'city_nightclub', 'dance'
 
 						act 'Get on your knees and give him a BJ':
 							*clr & cla
@@ -429,19 +429,19 @@ if $ARGS[0] = 'dance':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act 'Leave the booth':gt 'club', 'dance'
+								act 'Leave the booth':gt 'city_nightclub', 'dance'
 							end
 						end
 					end
 				end
 			end
 
-			act 'Leave the booth':gt 'club', 'dance'
+			act 'Leave the booth':gt 'city_nightclub', 'dance'
 		end
 	else
 		menu_off = 1
 		'It''s getting late and the music stops, looks like it might be time to go home.'
-		act 'Leave the dance floor': gt 'club', 'inside'
+		act 'Leave the dance floor': gt 'city_nightclub', 'inside'
 	end	
 end
 
@@ -458,12 +458,12 @@ if $ARGS[0] = 'bar':
 
 	if pcs_apprnc > 56:
 		barsexrand = rand(0, 10)
-		if barsexrand = 1: killvar 'barsexrand' & gt 'club', 'bar0'
-		if barsexrand = 2: killvar 'barsexrand' & gt 'club', 'bar1'
+		if barsexrand = 1: killvar 'barsexrand' & gt 'city_nightclub', 'bar0'
+		if barsexrand = 2: killvar 'barsexrand' & gt 'city_nightclub', 'bar1'
 		killvar 'barsexrand'
 	end
 
-	act 'Go back':gt 'club', 'inside'
+	act 'Go back':gt 'city_nightclub', 'inside'
 
 	if alko >= 7:
 		*clr & cla
@@ -760,7 +760,7 @@ if $ARGS[0] = 'bar':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club6.jpg"></center>'
 			'You found a free bar stool and sat down on it. You ordered the barkeeper to mix you a cocktail and a few moments later, you sipping on a sweet one.'
 
-			act 'Stand up':gt 'club', 'bar'
+			act 'Stand up':gt 'city_nightclub', 'bar'
 		end
 	end
 end
@@ -807,7 +807,7 @@ if $ARGS[0] = 'sex':
 					gs 'cum_manage'
 					'You take his cock and point it away from you. He groans as he cums and most of his cum gets splattered onto the floor, with a few drips covering your hand.'
 
-					act 'Stand up':gt 'club', 'tou'
+					act 'Stand up':gt 'city_nightclub', 'tou'
 				end
 
 				act 'Let him cum on your face':
@@ -818,7 +818,7 @@ if $ARGS[0] = 'sex':
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/clubfacial1.jpg"></center>'
 					'You grabbed his cock and point his "gun" at your face. He groans as he cums and you can feel hot streams of semen covering your face.'
 
-					act 'Stand up':gt 'club', 'tou'
+					act 'Stand up':gt 'city_nightclub', 'tou'
 				end
 
 				exit
@@ -831,7 +831,7 @@ if $ARGS[0] = 'sex':
 				'The bloke grabs your hair and cums on your face. You quickly close your eyes, but it''s too late, a few drips of semen make it into your eyes. It hurts a bit.'
 			end
 
-			act 'Stand up':gt 'club', 'tou'
+			act 'Stand up':gt 'city_nightclub', 'tou'
 		end
 
 		act 'Swallow his cum':
@@ -846,7 +846,7 @@ if $ARGS[0] = 'sex':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Stand up':gt 'club', 'tou'
+			act 'Stand up':gt 'city_nightclub', 'tou'
 		end
 	end
 
@@ -877,7 +877,7 @@ if $ARGS[0] = 'sex':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave cubicle':gt 'club', 'tou'
+		act 'Leave cubicle':gt 'city_nightclub', 'tou'
 	end
 end
 
@@ -890,7 +890,7 @@ if $ARGS[0] = 'bar0':
 	'As you sit at the bar, a woman walk up to you and begins to chat with you.'
 	'During the conversation you get the feeling that she''s flirting with you and before you even can react, her hands wander over your body, giving you a sensational feeling.'
 
-	act 'Move away from her':gt 'club', 'bar'
+	act 'Move away from her':gt 'city_nightclub', 'bar'
 
 	act 'Kiss her':
 		cla
@@ -901,7 +901,7 @@ if $ARGS[0] = 'bar0':
 		gs 'arousal', 'kiss', 5, 'lesbian'
 		gs 'stat'
 
-		act 'Tell her to meet at the toilet':gt 'club', 'lezbsort'
+		act 'Tell her to meet at the toilet':gt 'city_nightclub', 'lezbsort'
 
 		act 'Strip her':
 			cla
@@ -943,7 +943,7 @@ if $ARGS[0] = 'bar0':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Leave':gt 'club', 'inside'
+						act 'Leave':gt 'city_nightclub', 'inside'
 					elseif dildo > 0:
 						act 'Get dildo':
 							cla
@@ -971,7 +971,7 @@ if $ARGS[0] = 'bar0':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act 'Leave':gt 'club', 'inside'
+								act 'Leave':gt 'city_nightclub', 'inside'
 							end
 						end
 					end
@@ -991,9 +991,9 @@ if $ARGS[0] = 'bar1':
 
 	act 'Turn him down':
 		if alko < 4:
-			gt 'club', 'bar'
+			gt 'city_nightclub', 'bar'
 		else
-			gt 'club', 'rape'
+			gt 'city_nightclub', 'rape'
 		end
 	end
 
@@ -1008,15 +1008,15 @@ if $ARGS[0] = 'bar1':
 			'He kneels down and begins to move his tongue between your folds. You immediately begin to moan softly. You close your eyes and admit to yourself, that he''s not half bad at it.'
 			gs 'arousal', 'cuni', 10, 'dom'
 			gs 'stat'
-			act 'Turn him down':gt 'club', 'bar'
-			act 'Suck his cock':gt 'club', 'bar2'
-			act 'Let him fuck you':gt 'club', 'bar3'
+			act 'Turn him down':gt 'city_nightclub', 'bar'
+			act 'Suck his cock':gt 'city_nightclub', 'bar2'
+			act 'Let him fuck you':gt 'city_nightclub', 'bar3'
 		end
 	else
 		act 'Tell him to lick you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
-	act 'Blow job':gt 'club', 'bar2'
-	act 'Let him fuck you':gt 'club', 'bar3'
+	act 'Blow job':gt 'city_nightclub', 'bar2'
+	act 'Let him fuck you':gt 'city_nightclub', 'bar3'
 end
 
 if $ARGS[0] = 'bar2':
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'bar2':
 	gs 'arousal', 'bj', 10, 'sub'
 	gs 'stat'
 
-	act 'Let him fuck you':gt 'club', 'bar3'
+	act 'Let him fuck you':gt 'city_nightclub', 'bar3'
 
 	act 'Continue to suck':
 		cla
@@ -1048,7 +1048,7 @@ if $ARGS[0] = 'bar2':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Move away':gt 'club', 'inside'
+		act 'Move away':gt 'city_nightclub', 'inside'
 	end
 end
 
@@ -1089,7 +1089,7 @@ if $ARGS[0] = 'bar3':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave':gt 'club', 'inside'
+	act 'Leave':gt 'city_nightclub', 'inside'
 end
 
 if $ARGS[0] = 'rape':
@@ -1122,7 +1122,7 @@ if $ARGS[0] = 'rape':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Leave':gt 'club', 'inside'
+				act 'Leave':gt 'city_nightclub', 'inside'
 			else
 				cla
 				*clr
@@ -1139,7 +1139,7 @@ if $ARGS[0] = 'rape':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Leave':gt 'club', 'inside'
+				act 'Leave':gt 'city_nightclub', 'inside'
 			end
 		end
 	else
@@ -1152,7 +1152,7 @@ if $ARGS[0] = 'rape':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave':gt 'club', 'inside'
+		act 'Leave':gt 'city_nightclub', 'inside'
 	end
 end
 
@@ -1165,9 +1165,9 @@ if $ARGS[0] = 'lezbsort':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/lezbsort.jpg"></center>'
 	'She follows you into the womens bathroom and you lure her into one of the empty booths.'
 
-	act 'Lick her':gt 'club', 'lezbsort1'
-	act 'Tell her to lick you':gt 'club', 'lezbsort2'
-	act 'Leave her':gt 'club', 'tou'
+	act 'Lick her':gt 'city_nightclub', 'lezbsort1'
+	act 'Tell her to lick you':gt 'city_nightclub', 'lezbsort2'
+	act 'Leave her':gt 'city_nightclub', 'tou'
 end
 
 if $ARGS[0] = 'lezbsort1':
@@ -1182,12 +1182,12 @@ if $ARGS[0] = 'lezbsort1':
 	gs 'arousal', 'cuni_give', 10, 'sub', 'lesbian'
 	gs 'stat'
 
-	if hour >= 15 or hour <= 3:act 'Now it''s your turn':gt 'club', 'lezbsort2'
+	if hour >= 15 or hour <= 3:act 'Now it''s your turn':gt 'city_nightclub', 'lezbsort2'
 
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave her':gt 'club', 'tou'
+	act 'Leave her':gt 'city_nightclub', 'tou'
 end
 
 if $ARGS[0] = 'lezbsort2':
@@ -1203,12 +1203,12 @@ if $ARGS[0] = 'lezbsort2':
 	gs 'arousal', 'cuni', 10, 'sub', 'lesbian'
 	gs 'stat'
 
-	if hour >= 15 or hour <= 3:act 'Lick her':gt 'club', 'lezbsort1'
+	if hour >= 15 or hour <= 3:act 'Lick her':gt 'city_nightclub', 'lezbsort1'
 
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Leave her':gt 'club', 'tou'
+	act 'Leave her':gt 'city_nightclub', 'tou'
 end
 
 if $ARGS[0] = 'vip':
@@ -1233,7 +1233,7 @@ if $ARGS[0] = 'vip':
 
 	if vipday = daystart:act 'Return to the VIP area':gt 'vipclub', 'start'
 
-	act 'Leave him be and go away':gt 'club', 'inside'
+	act 'Leave him be and go away':gt 'city_nightclub', 'inside'
 end
 
 if $ARGS[0] = 'work':
@@ -1271,10 +1271,10 @@ if $ARGS[0] = 'work':
 					'You hardy found anyone, Erik doesn''t seem happy, but he pays you 100 <b>₽</b> for your efforts.'
 				end
 				if hour < 1 or hour >= 18:
-					act 'Get another job from Erik':gt 'club', 'work'
+					act 'Get another job from Erik':gt 'city_nightclub', 'work'
 				end
 				
-				act 'Go to dancefloor':gt 'club', 'inside'
+				act 'Go to dancefloor':gt 'city_nightclub', 'inside'
 			end
 		end
 	elseif clubr = 1:
@@ -1292,9 +1292,9 @@ if $ARGS[0] = 'work':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'
 				'You hand Erik the empty bottles, he gives you 200 <b>₽</b>.'
-				if hour < 1 or hour >= 18: act 'Get another job from Erik':gt 'club', 'work'
+				if hour < 1 or hour >= 18: act 'Get another job from Erik':gt 'city_nightclub', 'work'
 
-				act 'Go to dancefloor':gt 'club', 'inside'
+				act 'Go to dancefloor':gt 'city_nightclub', 'inside'
 			end
 		end
 	elseif clubr = 2:
@@ -1315,13 +1315,13 @@ if $ARGS[0] = 'work':
 				'Erik thanks you for helping when he was short and pays you 200 <b>₽</b>, but doesn''t even mention your dancing.'
 			end
 			gs 'stat'
-			if hour < 1 or hour >= 18: act 'Get another job from Erik':gt 'club', 'work'
+			if hour < 1 or hour >= 18: act 'Get another job from Erik':gt 'city_nightclub', 'work'
 
-			act 'Go to dancefloor':gt 'club', 'inside'
+			act 'Go to dancefloor':gt 'city_nightclub', 'inside'
 		end
 	end
 	killvar 'clubr'
 end
 
---- club ---------------------------------
+--- city_nightclub ---------------------------------
 

locations/vipclub.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/vipclub.jpg"></center>'
 	'The VIP area is divided into several rooms without doors. As you pass by some, you see scenes so depraved that even a porn director would blush at the sight.'
 
-	act 'Leave':gt 'club', 'inside'
+	act 'Leave':gt 'city_nightclub', 'inside'
 
 	if hour >= 15 or hour <= 3:
 		act 'Cocktails':