Merge remote-tracking branch 'upstream/master'

glife.qproj

@@ -345,23 +345,23 @@
 		<Location name="post_events"/>
 	</Folder>
 	<Folder name="BDSM Club">
-		<Location name="BDSM_Club"/>
-		<Location name="BDSM_training"/>
-		<Location name="MHall"/>
-		<Location name="MDressing"/>
-		<Location name="MLanding"/>
-		<Location name="MDining"/>
-		<Location name="MLibrary"/>
-		<Location name="MBallroom"/>
-		<Location name="MRear"/>
-		<Location name="MConservatory"/>
-		<Location name="MKitchen"/>
-		<Location name="MBasement"/>
-		<Location name="MWestbed"/>
-		<Location name="MEastbed"/>
-		<Location name="MGames"/>
-		<Location name="MLiving"/>
-		<Location name="MBathrooms"/>
+		<Location name="bdsm_mansion"/>
+		<Location name="bdsm_training"/>
+		<Location name="bdsm_hallway"/>
+		<Location name="bdsm_dressing"/>
+		<Location name="bdsm_landing"/>
+		<Location name="bdsm_dining"/>
+		<Location name="bdsm_library"/>
+		<Location name="bdsm_ballroom"/>
+		<Location name="bdsm_garden"/>
+		<Location name="bdsm_conservatory"/>
+		<Location name="bdsm_kitchen"/>
+		<Location name="bdsm_basement"/>
+		<Location name="bdsm_bedwest"/>
+		<Location name="bdsm_bedeast"/>
+		<Location name="bdsm_gameroom"/>
+		<Location name="bdsm_livingroom"/>
+		<Location name="bdsm_bathrooms"/>
 	</Folder>
 	<Folder name="Trade Representative">
 		<Location name="city_trademission"/>

locations/BDSM_training.qsrc

@@ -1,20 +1,20 @@
-# BDSM_training
+# bdsm_training
 if $ARGS[0] = 'start':
 	menu_off = 1
 	if BDSMpayDay < daystart - 30:
 		BDSMpayDay = daystart
 		money -= 10000
 		'You pay for another 30 days access to the club.'
-		act 'Continue':gt 'BDSM_training', 'start'
+		act 'Continue':gt 'bdsm_training', 'start'
 	elseif BDSMmeet = 1:
 		BDSMmeet += 1
-		gt 'BDSM_training', '1'
+		gt 'bdsm_training', '1'
 	elseif BDSMmeet = 2:
 		BDSMmeet += 1
-		gt 'BDSM_training', '2'
+		gt 'bdsm_training', '2'
 	elseif BDSMmeet = 3:
 		BDSMmeet += 1
-		gt 'BDSM_training', '3'
+		gt 'bdsm_training', '3'
 	end
 end	
 	
@@ -155,7 +155,7 @@ if $ARGS[0] = '1':
 										'Mistress picks up a rope and wraps it around your breasts, tightly binding the left and right. The pain makes you start crying, but Mistress is not through, she hangs on you nipple clamps with weights and forces you to crouch, so, the weights are swinging. You hurt, but at the same time it''s nice, and you stay there as instructed.'
 										$orgasm_or = 'yes'
 										gs 'stat'
-										act 'Further':gt 'BDSM_training', 'BDSMend'
+										act 'Further':gt 'bdsm_training', 'BDSMend'
 									end
 								else
 									act 'Cheat and cum (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -169,7 +169,7 @@ if $ARGS[0] = '1':
 									'Mistress forbids you to cum, and you struggle, hampered.'
 									$orgasm_or = 'no'
 									gs 'stat'
-									act 'Further':gt 'BDSM_training', 'BDSMend'
+									act 'Further':gt 'bdsm_training', 'BDSMend'
 								end
 							end
 						end
@@ -194,7 +194,7 @@ if $ARGS[0] = 'BDSMend':
 	gs 'arousal', 'end'
 	gs 'stat'
 			
-	act 'Leave':gt 'BDSM_Club','start'
+	act 'Leave':gt 'bdsm_mansion','start'
 end
 
 if $ARGS[0] = '2':
@@ -351,7 +351,7 @@ if $ARGS[0] = '2':
 															gs 'arousal', 'vaginal_strap', 10, 'sub', 'lesbian', 'maso', 'bound'
 															gs 'arousal', 'end'
 															gs 'stat'
-															act 'Leave':gt 'BDSM_Club','start'
+															act 'Leave':gt 'bdsm_mansion','start'
 														end
 													end
 												end
@@ -475,7 +475,7 @@ if $ARGS[0] = '3':
 											'Hardly able to walk and your legs buckling you get in the shower. As you exit, you are handed a membership card, you can now enter to the Club as a full member.'
 											gs 'arousal', 'end'
 											gs 'stat'
-											act 'Leave':gt 'BDSM_Club','start'
+											act 'Leave':gt 'bdsm_mansion','start'
 										end
 									end
 								end
@@ -540,12 +540,12 @@ if $ARGS[0] = 'd_start':
 					minut -= 10
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':gt 'BDSM_Club','start'
+					act 'Leave':gt 'bdsm_mansion','start'
 				end
 			end
 		end
 	end
 end
 
---- BDSM_training ---------------------------------
+--- bdsm_training ---------------------------------
 

locations/MLanding.qsrc

@@ -1,56 +0,0 @@
-# MLanding
-$location_type = 'private'
-killvar '$locclass'
-
-if $ARGS[0] = 'west':
-	*clr & cla
-	$loc = 'MLanding'
-	$loc_arg = 'west'
-	$menu_loc = 'MLanding'
-	$menu_arg = 'west'
-	menu_off = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/wlanding.jpg"></center>'
-	act 'Go to the east wing landing':gt 'MLanding', 'east'
-	act 'Go downstairs to the foyer':gt 'MHall', 'foyer'
-	act 'Visit the master bedroom':gt 'MWestbed', 'master'
-	act 'Visit guest bedroom A':gt 'MWestbed', 'guest'
-	act 'Visit the games room':gt 'MGames'
-
-	if rand (0,100) < 3:
-		menu_off = 1
-		*clr & cla
-		gs 'stat'
-		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_sex_b1.mp4"></video></center>'
-		'A maid is being helped with the vacuum cleaning by a man in casual clothing, you think about reporting him, but he''s a bit busy right now.'
-		
-		gs 'arousal', 'voyeur_sex', 5
-		gs 'arousal', 'end'
-		gs 'stat'
-		
-		act 'Return': gt 'MLanding', 'west'
-	end
-end
-
-if $ARGS[0] = 'east':
-	*clr & cla
-	killvar '$locclass'
-	$loc = 'MLanding'
-	$loc_arg = 'east'
-	$menu_loc = 'MLanding'
-	$menu_arg = 'east'
-	menu_off = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/elanding.jpg"></center>'
-	act 'Go to the west wing landing':gt 'MLanding', 'west'
-	act 'Go downstairs to the foyer':gt 'MHall', 'foyer'
-	act 'Go downstairs to the west wing hallway':gt 'MHall', 'west'
-	act 'Visit guest bedroom B':gt 'MEastbed', 'guestB'
-	act 'Visit guest bedroom C':gt 'MEastbed', 'guestC'
-	act 'Visit guest bedroom D':gt 'MEastbed', 'guestD'
-	act 'Go to the bathroom': gt 'MBathrooms', 'bath'
-	act 'Go to the living room': gt 'MLiving'
-end
-
---- MLanding ---------------------------------
-

locations/MBallroom.qsrc → locations/bdsm_ballroom.qsrc

@@ -1,26 +1,26 @@
-# MBallroom
+# bdsm_ballroom
 
 if $ARGS[0] = 'ballroom':
     $location_type = 'private'
-	$loc = 'MBallroom'
+	$loc = 'bdsm_ballroom'
 	$loc_arg = 'ballroom'
-	$menu_loc = 'MBallroom'
+	$menu_loc = 'bdsm_ballroom'
 	$menu_arg = 'ballroom'
 	menu_off = 0
 	cls
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/ballroom.jpg"></center>'
 	'Ballroom'
-	act 'Go to west wing hall': gt 'MHall', 'west'
-	act 'Go to the atrium': gt 'MBallroom', 'atrium'
+	act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
+	act 'Go to the atrium': gt 'bdsm_ballroom', 'atrium'
 end
 
 
 if $ARGS[0] = 'atrium':
     $location_type = 'private'
-	$loc = 'MBallroom'
+	$loc = 'bdsm_ballroom'
 	$loc_arg = 'atrium'
-	$menu_loc = 'MBallroom'
+	$menu_loc = 'bdsm_ballroom'
 	$menu_arg = 'atrium'
 	menu_off = 0
 	cls
@@ -28,8 +28,8 @@ if $ARGS[0] = 'atrium':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/atrium.jpg"></center>'
 	'Atrium'
 
-	act 'Go to the Ballroom': gt 'MBallroom', 'ballroom'
+	act 'Go to the Ballroom': gt 'bdsm_ballroom', 'ballroom'
 end
 
---- MBallroom ---------------------------------
+--- bdsm_ballroom ---------------------------------
 

locations/MBasement.qsrc → locations/bdsm_basement.qsrc

@@ -1,99 +1,99 @@
-# MBasement
+# bdsm_basement
 
 if $ARGS[0] = 'start':
 	$location_type = 'private'
-	$loc = 'MBasement'
+	$loc = 'bdsm_basement'
 	$loc_arg = 'start'
-	$menu_loc = 'MBasement'
+	$menu_loc = 'bdsm_basement'
 	$menu_arg = 'start'
 
-	mbasement_rand = rand(0,100)
+	bdsm_basement_rand = rand(0,100)
 
-	if mbasement_rand > 97:
+	if bdsm_basement_rand > 97:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand1.mp4"></video></center>'
 		'You see a Mistress with two submissives, she is fucking one of them.'
 
-		gs 'Mbasement', 'end_sex'
-	elseif mbasement_rand > 94:
+		gs 'bdsm_basement', 'end_sex'
+	elseif bdsm_basement_rand > 94:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand2.jpg"></center>'
 		'You see a submissive, tied up and waiting for someone to play with.'
 
-		gs 'Mbasement', 'end'
-	elseif mbasement_rand > 91:
+		gs 'bdsm_basement', 'end'
+	elseif bdsm_basement_rand > 91:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand3.jpg"></center>'
 		'A submissive woman is tied up and displayed like an art exhibition, the sign tells people to use the whip on her.'
 
-		gs 'Mbasement', 'end'
-	elseif mbasement_rand > 88:
+		gs 'bdsm_basement', 'end'
+	elseif bdsm_basement_rand > 88:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand4.mp4"></video></center>'
 		'You see a Mistress with two submissives, she is fucking one of them.'
 
-		gs 'Mbasement', 'end_sex'
-	elseif mbasement_rand > 85:
+		gs 'bdsm_basement', 'end_sex'
+	elseif bdsm_basement_rand > 85:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand5.jpg"></center>'
 		'You see a submissive, tied up and waiting for someone to play with.'
 
-		gs 'Mbasement', 'end'
-	elseif mbasement_rand > 82:
+		gs 'bdsm_basement', 'end'
+	elseif bdsm_basement_rand > 82:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand6.mp4"></video></center>'
 		'You see a two submissives being used by 2 dommes.'
 
-		gs 'Mbasement', 'end_sex'
-	elseif mbasement_rand > 79:
+		gs 'bdsm_basement', 'end_sex'
+	elseif bdsm_basement_rand > 79:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/baserand7.jpg"></center>'
 		'You see three submissives, tied up and hanging upside down.'
 
-		gs 'Mbasement', 'end'
-	elseif mbasement_rand > 76:
+		gs 'bdsm_basement', 'end'
+	elseif bdsm_basement_rand > 76:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand8.mp4"></video></center>'
 		'You see a submissive woman, tied and gagged and being fucked by a dominant man.'
 
-		gs 'Mbasement', 'end_sex'
-	elseif mbasement_rand > 73:
+		gs 'bdsm_basement', 'end_sex'
+	elseif bdsm_basement_rand > 73:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/baserand9.mp4"></video></center>'
 		'You see a submissive woman, tied and being fucked by a dominant man. Their eyes are locked and they are oblivious to the crowd of people watching them.'
 
-		gs 'Mbasement', 'end_sex'
-	elseif mbasement_rand > 70:
+		gs 'bdsm_basement', 'end_sex'
+	elseif bdsm_basement_rand > 70:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/subbyhubby.jpg"></center>'
 		'A dominate wife wearing a strap-on fucks her husband with another man.'
 
-		gs 'Mbasement', 'end_sex'
-	elseif mbasement_rand > 67:
+		gs 'bdsm_basement', 'end_sex'
+	elseif bdsm_basement_rand > 67:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/3dom.mp4"></video></center>'
 		'Three dommes taking turn fucking their submissive male bent over a padded bench.'
 
-		gs 'Mbasement', 'end_sex'
-	elseif mbasement_rand > 64:
+		gs 'bdsm_basement', 'end_sex'
+	elseif bdsm_basement_rand > 64:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/2domsub.mp4"></video></center>'
 		'Two dommes fuck their subs wearing ball gags roughly, in a contest to see how can make their sub orgasm first.'
 
-		gs 'Mbasement', 'end_sex'
-	elseif mbasement_rand > 61:
+		gs 'bdsm_basement', 'end_sex'
+	elseif bdsm_basement_rand > 61:
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/stacross.mp4"></video></center>'
 		'A woman is shackled to a Saint Andrews Cross while several dom''s take turns whipping her.'
 
-		gs 'Mbasement', 'end'
-	elseif mbasement_rand <= 61:
+		gs 'bdsm_basement', 'end'
+	elseif bdsm_basement_rand <= 61:
 		*clr & cla
 		menu_off = 0
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/basement.jpg"></center>'
 		'Basement, for torture and whatnot'
 
-		act 'Go upstairs to the east wing hallway': killvar 'mbasement_rand' & gt 'MHall', 'east'
+		act 'Go upstairs to the east wing hallway': killvar 'bdsm_basement_rand' & gt 'bdsm_hallway', 'east'
 	end
 end
 
@@ -103,7 +103,7 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Continue': gt 'MBasement', 'start'
+	act 'Continue': gt 'bdsm_basement', 'start'
 end
 
 if $ARGS[0] = 'end_sex':
@@ -112,9 +112,9 @@ if $ARGS[0] = 'end_sex':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Continue': gt 'MBasement', 'start'
+	act 'Continue': gt 'bdsm_basement', 'start'
 end
 
 
---- MBasement ---------------------------------
+--- bdsm_basement ---------------------------------
 

locations/MBathrooms.qsrc → locations/bdsm_bathrooms.qsrc

@@ -1,23 +1,23 @@
-# MBathrooms
+# bdsm_bathrooms
 
 if $ARGS[0] = 'bath':
     $location_type = 'bathroom'
-	$loc = 'MBathrooms'
+	$loc = 'bdsm_bathrooms'
 	$loc_arg = 'bath'
-	$menu_loc = 'MBathrooms'
+	$menu_loc = 'bdsm_bathrooms'
 	$menu_arg = 'bath'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bath1.jpg"></center>'
 	'A luxrious bathroom, designed to indulge and relax.'
 	gs 'din_van', 'private'
-	act 'Return to east wing landing':gt'MLanding', 'east'
+	act 'Return to east wing landing':gt'bdsm_landing', 'east'
 end
 
 if $ARGS[0] = 'ensuite':
     $location_type = 'bathroom'
-	$loc = 'MBathrooms'
+	$loc = 'bdsm_bathrooms'
 	$loc_arg = 'ensuite'
-	$menu_loc = 'MBathrooms'
+	$menu_loc = 'bdsm_bathrooms'
 	$menu_arg = 'ensuite'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/ensuite1.jpg"></center>'
@@ -27,16 +27,16 @@ end
 
 if $ARGS[0] = 'restroom':
     $location_type = 'bathroom'
-	$loc = 'MBathrooms'
+	$loc = 'bdsm_bathrooms'
 	$loc_arg = 'restroom'
-	$menu_loc = 'MBathrooms'
+	$menu_loc = 'bdsm_bathrooms'
 	$menu_arg = 'restroom'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/rest.jpg"></center>'
 	'A beautiful little room for taking care of the essentials and making yourself look good.'
 	gs 'din_van', 'private'
-	act 'Return to foyer':gt'MHall', 'foyer'
+	act 'Return to foyer':gt'bdsm_hallway', 'foyer'
 end
 
---- MBathrooms ---------------------------------
+--- bdsm_bathrooms ---------------------------------
 

locations/MEastbed.qsrc → locations/bdsm_bedeast.qsrc

@@ -1,18 +1,18 @@
-# MEastbed
+# bdsm_bedeast
 
 if $ARGS[0] = 'guestB':
     $location_type = 'private'
 	$locclass = 'bedr'
-	$loc = 'MEastbed'
+	$loc = 'bdsm_bedeast'
 	$loc_arg = 'guestB'
-	$menu_loc = 'MEastbed'
+	$menu_loc = 'bdsm_bedeast'
 	$menu_arg = 'guestB'
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedb.jpg"></center>'
 	'Guest bedroom B'
-	act 'Go to the east wing landing': gt 'MLanding', 'east'
+	act 'Go to the east wing landing': gt 'bdsm_landing', 'east'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -23,7 +23,7 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 	
-		act 'Return':gt 'MEastbed', 'guestB'
+		act 'Return':gt 'bdsm_bedeast', 'guestB'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -34,7 +34,7 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestB'
+		act 'Return':gt 'bdsm_bedeast', 'guestB'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -45,7 +45,7 @@ if $ARGS[0] = 'guestB':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestB'
+		act 'Return':gt 'bdsm_bedeast', 'guestB'
 		if $BDSMrole = 's':
 			act 'Join them':
 				*clr & cla
@@ -61,7 +61,7 @@ if $ARGS[0] = 'guestB':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Return':gt 'MEastbed', 'guestB'
+				act 'Return':gt 'bdsm_bedeast', 'guestB'
 			end
 		end
 	end
@@ -70,16 +70,16 @@ end
 if $ARGS[0] = 'guestC':
     $location_type = 'private'
 	$locclass = 'bedr'
-	$loc = 'MEastbed'
+	$loc = 'bdsm_bedeast'
 	$loc_arg = 'guestC'
-	$menu_loc = 'MEastbed'
+	$menu_loc = 'bdsm_bedeast'
 	$menu_arg = 'guestC'
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedc.jpg"></center>'
 	'Guest bedroom C'
-	act 'Go to the east wing landing':gt 'MLanding', 'east'
+	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -90,7 +90,7 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestC'
+		act 'Return':gt 'bdsm_bedeast', 'guestC'
 		if $BDSMrole = 's':
 			act 'Join them':
 				*clr & cla
@@ -105,7 +105,7 @@ if $ARGS[0] = 'guestC':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Return':gt 'MEastbed', 'guestC'
+				act 'Return':gt 'bdsm_bedeast', 'guestC'
 			end
 		end
 	elseif rand (0,100) < 3:
@@ -119,7 +119,7 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestC'
+		act 'Return':gt 'bdsm_bedeast', 'guestC'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -131,23 +131,23 @@ if $ARGS[0] = 'guestC':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestC'
+		act 'Return':gt 'bdsm_bedeast', 'guestC'
 	end
 end
 
 if $ARGS[0] = 'guestD':
     $location_type = 'private'
 	$locclass = 'bedr'
-	$loc = 'MEastbed'
+	$loc = 'bdsm_bedeast'
 	$loc_arg = 'guestD'
-	$menu_loc = 'MEastbed'
+	$menu_loc = 'bdsm_bedeast'
 	$menu_arg = 'guestD'
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/bedd.jpg"></center>'
 	'Guest bedroom D'
-	act 'Go to the east wing landing':gt 'MLanding', 'east'
+	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -158,7 +158,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'guestD'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -169,7 +169,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'guestD'
 		if $BDSMrole = 's':
 			act 'Watch':
 				*clr & cla
@@ -191,7 +191,7 @@ if $ARGS[0] = 'guestD':
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Return':gt 'MEastbed', 'guestD'
+					act 'Return':gt 'bdsm_bedeast', 'guestD'
 				end
 			end
 		end
@@ -206,7 +206,7 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'guestD'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -218,9 +218,9 @@ if $ARGS[0] = 'guestD':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MEastbed', 'guestD'
+		act 'Return':gt 'bdsm_bedeast', 'guestD'
 	end
 end
 
---- MEastbed ---------------------------------
+--- bdsm_bedeast ---------------------------------
 

locations/MWestbed.qsrc → locations/bdsm_bedwest.qsrc

@@ -1,19 +1,19 @@
-# MWestbed
+# bdsm_bedwest
 $location_type = 'private'
 
 if $ARGS[0] = 'master':
     $location_type = 'private'
 	$locclass = 'bedr'
-	$loc = 'MWestbed'
+	$loc = 'bdsm_bedwest'
 	$loc_arg = 'master'
-	$menu_loc = 'MWestbed'
+	$menu_loc = 'bdsm_bedwest'
 	$menu_arg = 'master'
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/masterbed.jpg"></center>'
 	'Master bedroom'
-	act 'Go to the west wing landing':gt 'MLanding', 'west'
+	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -25,7 +25,7 @@ if $ARGS[0] = 'master':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MWestbed', 'master'
+		act 'Return':gt 'bdsm_bedwest', 'master'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -37,7 +37,7 @@ if $ARGS[0] = 'master':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MWestbed', 'master'
+		act 'Return':gt 'bdsm_bedwest', 'master'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -49,7 +49,7 @@ if $ARGS[0] = 'master':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MWestbed', 'master'
+		act 'Return':gt 'bdsm_bedwest', 'master'
 	elseif rand (0,100) < 3 and $BDSMrole = 's':
 		menu_off = 1
 		*clr & cla
@@ -62,23 +62,23 @@ if $ARGS[0] = 'master':
 	    'You meekly nod your head. "Sorry, I will be more careful in the future."'
 	    '"You don''t sound very sorry, I think I need to teach you a lesson." With that he pulls you into the room and bares your ass, then he pulls off his belt and spanks you until tears are running down your face.'
 		'Once he believes you learned your lesson he leaves, leaving you behind to rub your sore ass.'
-		act 'Return':gt 'MWestbed', 'master'
+		act 'Return':gt 'bdsm_bedwest', 'master'
 	end
 end
 
 if $ARGS[0] = 'guest':
     $location_type = 'private'
 	$locclass = 'bedr'
-	$loc = 'MWestbed'
+	$loc = 'bdsm_bedwest'
 	$loc_arg = 'guest'
-	$menu_loc = 'MWestbed'
+	$menu_loc = 'bdsm_bedwest'
 	$menu_arg = 'guest'
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/beda.jpg"></center>'
 	'Guest bedroom A'
-	act 'Go to the west wing landing':gt 'MLanding', 'west'
+	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
 	if rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -90,7 +90,7 @@ if $ARGS[0] = 'guest':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MWestbed', 'guest'
+		act 'Return':gt 'bdsm_bedwest', 'guest'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -103,9 +103,9 @@ if $ARGS[0] = 'guest':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MWestbed', 'guest'
+		act 'Return':gt 'bdsm_bedwest', 'guest'
 	end
 end
 
---- MWestbed ---------------------------------
+--- bdsm_bedwest ---------------------------------
 

locations/MConservatory.qsrc → locations/bdsm_conservatory.qsrc

@@ -1,9 +1,9 @@
-# MConservatory
+# bdsm_conservatory
 
 $location_type = 'private'
-$loc = 'MConservatory'
+$loc = 'bdsm_conservatory'
 $loc_arg = ''
-$menu_loc = 'MConservatory'
+$menu_loc = 'bdsm_conservatory'
 $menu_arg = ''
 menu_off = 0
 cls
@@ -11,8 +11,8 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/conservatory.jpg"></center>'
 'This huge glass fronted room is kept very warm and houses a number of rare and exotic plants.'
 'It is one of the few places where you can just relax and enjoy the opulence of the mansion.'
-act 'Go to the garden': gt 'MRear', 'garden'
-act 'Go to east wing hall': gt 'MHall', 'east'
+act 'Go to the garden': gt 'bdsm_garden', 'garden'
+act 'Go to east wing hall': gt 'bdsm_hallway', 'east'
 
---- MConservatory ---------------------------------
+--- bdsm_conservatory ---------------------------------
 

locations/MDining.qsrc → locations/bdsm_dining.qsrc

@@ -1,16 +1,16 @@
-# MDining
+# bdsm_dining
 
 $location_type = 'private'
-$loc = 'MDining'
+$loc = 'bdsm_dining'
 $loc_arg = ''
-$menu_loc = 'MDining'
+$menu_loc = 'bdsm_dining'
 $menu_arg = ''
 menu_off = 0
 cls
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/diningroom.jpg"></center>'
-act 'Go to foyer': gt 'MHall', 'foyer'
-act 'Go to the east wing hallway':gt 'MHall', 'east'
+act 'Go to foyer': gt 'bdsm_hallway', 'foyer'
+act 'Go to the east wing hallway':gt 'bdsm_hallway', 'east'
 
 if rand (0,100) < 3:
 	menu_off = 1
@@ -20,7 +20,7 @@ if rand (0,100) < 3:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/maid_a8.jpg"></center>'
 	'You see a maid bending over a table.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -29,7 +29,7 @@ elseif rand (0,100) < 3:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/maid_b2.jpg"></center>'
 	'You see a maid giving a man a blowjob.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -38,7 +38,7 @@ elseif rand (0,100) < 3:
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_b6.mp4"></video></center>'
 	'A submissive women is giving a man a blowjob.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -47,7 +47,7 @@ elseif rand (0,100) < 3:
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_bound_e1.mp4"></video></center>'
 	'Two dominant women are having fun with a bound and gagged submissive women.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -56,7 +56,7 @@ elseif rand (0,100) < 3:
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_bound_e2.mp4"></video></center>'
 	'Two dominant women are having fun with a bound and gagged submissive women.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -65,7 +65,7 @@ elseif rand (0,100) < 3:
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_mis3.mp4"></video></center>'
 	'A dominant woman is trying to read a magazine while her sub pleasures her.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 !!elseif rand (0,100) < 3:
 !!	cls
 !!	pcs_horny += 10
@@ -73,7 +73,7 @@ elseif rand (0,100) < 3:
 !!	gs 'stat'
 !!	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/diningroom.jpg"></center>'
 !!	'A group of women and men are sitting in chairs while they order two young women to strip naked and then change into different fetish clothing and then walk back and forth in them for a bit. Then they repeat the whole process again, a bit of a fetish clothing fashion show.'
-!!	act 'Return':gt 'MDining'
+!!	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -86,7 +86,7 @@ elseif rand (0,100) < 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/tablepussy1.jpg"></center>'
 	end
 	'A naked woman sits on the end of the table with her feet on it and her legs spread wide. A middle aged couple stand in front of her, the woman pointing at varies parts of the naked womans pussy, apparently giving her husband an anatomy lesson on pussies and the proper way to pleasure them.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -95,7 +95,7 @@ elseif rand (0,100) < 3:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/girltable'+rand(1,5)+'.jpg"></center>'
 	'A woman is on all fours between two men sitting in chairs talking. There is a serving tray on her back with drinks and snacks on it.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -104,7 +104,7 @@ elseif rand (0,100) < 3:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/footstool.jpg"></center>'
 	'A dominant woman has her legs propped up on a young mans back who is on all fours, while another young man sits and massages her feet.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 elseif rand (0,100) < 3:
 	menu_off = 1
 	cls
@@ -113,8 +113,8 @@ elseif rand (0,100) < 3:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/sex/spank'+rand(1,8)+'.jpg"></center>'
 	'A well dressed man has a young woman bent over his knees with her bare ass exposed, giving her a spanking. The sound from the flesh on flesh slaps carry some distance.'
-	act 'Return':gt 'MDining'
+	act 'Return':gt 'bdsm_dining'
 end
 
---- MDining ---------------------------------
+--- bdsm_dining ---------------------------------
 

locations/MDressing.qsrc → locations/bdsm_dressing.qsrc

@@ -1,12 +1,12 @@
-# MDressing
+# bdsm_dressing
 $loc_arg = $ARGS[0]
-$loc = 'MDressing'
+$loc = 'bdsm_dressing'
 $locM_arg = $ARGS[0]
-$locM = 'MDressing'
+$locM = 'bdsm_dressing'
 $location_type = 'private'
-$loc = 'MDressing'
+$loc = 'bdsm_dressing'
 $loc_arg = ''
-$menu_loc = 'MDressing'
+$menu_loc = 'bdsm_dressing'
 $menu_arg = ''
 menu_off = 0
 cls
@@ -16,8 +16,8 @@ gs 'stat'
 'It contains several <a href="exec:gt ''wardrobe'', ''start''">wardrobes</a> (where you can choose outfits and organize your clothing).'
 'There are whole cabinets filled with designer clothing belonging to various club members and plenty of <a href="exec:gt ''mirror'',''start''">mirrors</a> you can use.'
 
-act 'Go to foyer': gt 'MHall', 'foyer'
-act 'Go to east wing hall': gt 'MHall', 'east'
+act 'Go to foyer': gt 'bdsm_hallway', 'foyer'
+act 'Go to east wing hall': gt 'bdsm_hallway', 'east'
 
---- MDressing ---------------------------------
+--- bdsm_dressing ---------------------------------
 

locations/MGames.qsrc → locations/bdsm_gameroom.qsrc

@@ -1,14 +1,14 @@
-# MGames
+# bdsm_gameroom
 
 $location_type = 'private'
-$loc = 'MGames'
+$loc = 'bdsm_gameroom'
 $loc_arg = ''
-$menu_loc = 'MGames'
+$menu_loc = 'bdsm_gameroom'
 $menu_arg = ''
 menu_off = 0
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/games.jpg"></center>'
 'Games room'
-act 'Go to the west wing landing':gt 'MLanding', 'west'
+act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
 
 if rand (0,100) < 3:
 	menu_off = 1
@@ -21,8 +21,8 @@ if rand (0,100) < 3:
 	gs 'arousal', 'end'
 	gs 'stat'
 		
-	act 'Return':gt 'MGames'
+	act 'Return':gt 'bdsm_gameroom'
 end
 
---- MGames ---------------------------------
+--- bdsm_gameroom ---------------------------------
 

locations/MRear.qsrc → locations/bdsm_garden.qsrc

@@ -1,10 +1,10 @@
-# MRear
+# bdsm_garden
 $location_type = 'private'
 
 if $ARGS[0] = 'garden':
-	$loc = 'MRear'
+	$loc = 'bdsm_garden'
 	$loc_arg = 'garden'
-	$menu_loc = 'MRear'
+	$menu_loc = 'bdsm_garden'
 	$menu_arg = 'garden'
 	menu_off = 0
 	*clr & cla
@@ -12,11 +12,11 @@ if $ARGS[0] = 'garden':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/garden.jpg"></center>'
 	'Extensive garden, meticulously designed and maintained. Split into different areas each with its own theme and inspiration.'
 
-	act 'Go to the conservatory': gt 'MConservatory'
-	act 'Go to the garage': gt 'MRear', 'garage'
+	act 'Go to the conservatory': gt 'bdsm_conservatory'
+	act 'Go to the garage': gt 'bdsm_garden', 'garage'
 
 	if $BDSMrole = 's' and rand (0, 100) < 5 and stat['think_virgin'] = 0:
-		gt 'MRear', 'gEV1'
+		gt 'bdsm_garden', 'gEV1'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -28,7 +28,7 @@ if $ARGS[0] = 'garden':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MRear', 'garden'
+		act 'Return':gt 'bdsm_garden', 'garden'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -40,7 +40,7 @@ if $ARGS[0] = 'garden':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MRear', 'garden'
+		act 'Return':gt 'bdsm_garden', 'garden'
 	elseif rand (0,100) < 3 and sunWeather = 1:
 		menu_off = 1
 		*clr & cla
@@ -52,7 +52,7 @@ if $ARGS[0] = 'garden':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MRear', 'garden'
+		act 'Return':gt 'bdsm_garden', 'garden'
 	elseif rand (0,100) < 3 and sunWeather = 1:
 		menu_off = 1
 		*clr & cla
@@ -64,7 +64,7 @@ if $ARGS[0] = 'garden':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return':gt 'MRear', 'garden'
+		act 'Return':gt 'bdsm_garden', 'garden'
 	end	
 end
 
@@ -76,13 +76,13 @@ if $ARGS[0] = 'gEV1':
 	if $clothingworntype ! 'nude':
 		'Another submissive women approaches you and says, "If you are looking to earn a nice bonus, there are a group of older men at the outside dining table. If you strip off, go over to them and have sex with them, they will give you a load of cash."'
 		'This isn''t exactly the BDSM you come here for, but it is not breaking any rules and you have the choice.'
-		act 'Strip and go meet the older men':gs 'clothing', 'strip' & gt 'MRear', 'gEV2'
+		act 'Strip and go meet the older men':gs 'clothing', 'strip' & gt 'bdsm_garden', 'gEV2'
 	else
 		'Another submissive women approaches you and says, "If you are looking to earn a nice bonus, there are a group of older men at the outside dining table. If you go over and have sex with them, they will give you a load of cash."'
 		'This isn''t exactly the BDSM you come here for, but it is not breaking any rules and you have the choice.'
-		act 'Go and meet the older men':gt 'MRear', 'gEV2'
+		act 'Go and meet the older men':gt 'bdsm_garden', 'gEV2'
 	end
-	act 'Don''t go and see the older men': gt 'MRear', 'garden'
+	act 'Don''t go and see the older men': gt 'bdsm_garden', 'garden'
 end
 
 if $ARGS[0] = 'gEV2':
@@ -92,7 +92,7 @@ if $ARGS[0] = 'gEV2':
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/grup1.mp4"></video></center>'
 	'You walk over to the older men, they can''t take their eyes of your beautiful naked body.'
-	act 'Continue':gt 'MRear', 'gEV3'
+	act 'Continue':gt 'bdsm_garden', 'gEV3'
 end
 
 if $ARGS[0] = 'gEV3':
@@ -113,7 +113,7 @@ if $ARGS[0] = 'gEV3':
 	gs 'arousal', 'foreplay', 10, 'sub', 'group'
 	gs 'stat'
 
-	act 'Continue':gt 'MRear', 'gEV4'
+	act 'Continue':gt 'bdsm_garden', 'gEV4'
 end
 
 if $ARGS[0] = 'gEV4':
@@ -128,7 +128,7 @@ if $ARGS[0] = 'gEV4':
 	gs 'arousal', 'vaginal_finger', 10, 'sub', 'group'
 	gs 'stat'
 	
-	act 'Continue':gt 'MRear', 'gEV5'
+	act 'Continue':gt 'bdsm_garden', 'gEV5'
 end
 
 if $ARGS[0] = 'gEV5':
@@ -142,7 +142,7 @@ if $ARGS[0] = 'gEV5':
 	gs 'arousal', 'vaginal', 10, 'sub', 'group'
 	gs 'stat'
 	
-	act 'Continue':gt 'MRear', 'gEV6'
+	act 'Continue':gt 'bdsm_garden', 'gEV6'
 end
 
 if $ARGS[0] = 'gEV6':
@@ -155,7 +155,7 @@ if $ARGS[0] = 'gEV6':
 	gs 'arousal', 'bj', 10, 'sub', 'group'
 	gs 'stat'
 	
-	act 'Continue':gt 'MRear', 'gEV7'
+	act 'Continue':gt 'bdsm_garden', 'gEV7'
 end
 
 if $ARGS[0] = 'gEV7':
@@ -167,7 +167,7 @@ if $ARGS[0] = 'gEV7':
 	'Experience tells you that they are close to finishing and you lie back and tell them to finish on your face.'
 	'Almost immediately the right side of your face receives a warm, sticky treat.'
 	
-	act 'Continue':gt 'MRear', 'gEV8'
+	act 'Continue':gt 'bdsm_garden', 'gEV8'
 end
 
 if $ARGS[0] = 'gEV8':
@@ -201,23 +201,23 @@ if $ARGS[0] = 'gEV8':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Continue':gt 'MRear', 'garden'
+	act 'Continue':gt 'bdsm_garden', 'garden'
 end
 
 
 if $ARGS[0] = 'garage':
 	*clr & cla
-	$loc = 'MRear'
+	$loc = 'bdsm_garden'
 	$loc_arg = 'garage'
-	$menu_loc = 'MRear'
+	$menu_loc = 'bdsm_garden'
 	$menu_arg = 'garage'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/garage.jpg"></center>'
 	'The garage has many different expensive cars, the doors are shut and it is surprisingly warm.'
 	act 'Go to reception': gt 'BDSM_Club', 'reception'
-	act 'Go to the garden': gt 'MRear', 'garden'
+	act 'Go to the garden': gt 'bdsm_garden', 'garden'
 end
 
---- MRear ---------------------------------
+--- bdsm_garden ---------------------------------
 

locations/MHall.qsrc → locations/bdsm_hallway.qsrc

@@ -1,11 +1,11 @@
-# MHall
+# bdsm_hallway
 
 CLOSE ALL
 if $ARGS[0] = 'foyer':
     $location_type = 'private'
-	$loc = 'MHall'
+	$loc = 'bdsm_hallway'
 	$loc_arg = 'foyer'
-	$menu_loc = 'MHall'
+	$menu_loc = 'bdsm_hallway'
 	$menu_arg = 'foyer'
 	menu_off = 0
 	*clr & cla
@@ -15,29 +15,29 @@ if $ARGS[0] = 'foyer':
 	'Discreetly to the sides of the staircases are two rest rooms.'
 	act 'Leave the club':
 		if $clothingworntype ! 'nude':
-			gt 'BDSM_Club', 'start'
+			gt 'bdsm_mansion', 'start'
 		else
 			msg'<b><font color = red>You need to get dressed.</font></b>'
-			gt'MHall','foyer'
+			gt'bdsm_hallway','foyer'
 		end
 	end
 	if $BDSMrole = 's':
-		act 'Go to Dressing room': gt 'MDressing'
+		act 'Go to Dressing room': gt 'bdsm_dressing'
 		if ($clothingworntype ! 'gm_maid' or PCloStyle2 ! 1) and  $clothingworntype ! 'nude':exit
 	end
-	act 'Go upstairs to the west wing landing':gt 'MLanding', 'west'
-	act 'Go upstairs to the east wing landing':gt 'MLanding', 'east'
-	act 'Go to the Dining room':gt 'MDining'
-	act 'Go to the west wing hallway':gt 'MHall', 'west'
-	act 'Go to the east wing hallway':gt 'MHall', 'east'
-	act 'Go to the rest room': gt 'MBathrooms', 'restroom'
+	act 'Go upstairs to the west wing landing':gt 'bdsm_landing', 'west'
+	act 'Go upstairs to the east wing landing':gt 'bdsm_landing', 'east'
+	act 'Go to the Dining room':gt 'bdsm_dining'
+	act 'Go to the west wing hallway':gt 'bdsm_hallway', 'west'
+	act 'Go to the east wing hallway':gt 'bdsm_hallway', 'east'
+	act 'Go to the rest room': gt 'bdsm_bathrooms', 'restroom'
 end
 
 if $ARGS[0] = 'west':
     $location_type = 'private'
-	$loc = 'MHall'
+	$loc = 'bdsm_hallway'
 	$loc_arg = 'west'
-	$menu_loc = 'MHall'
+	$menu_loc = 'bdsm_hallway'
 	$menu_arg = 'west'
 	menu_off = 0
 	*clr & cla
@@ -45,17 +45,17 @@ if $ARGS[0] = 'west':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hall.jpg"></center>'
 	'You are standing in the west wing hallway, the reception and office are located here. If you need to speak to management, you need to go to the reception.'
 	'The dressing room is to your right and at the end of the hallway is the ball room leading to the atrium.'
-	act 'Go to the foyer':gt 'MHall', 'foyer'
-	act 'Go to reception':gt 'BDSM_Club', 'reception'
-	act 'Go to the libary':gt 'MLibrary'
-	act 'Go to the Ball room':gt 'MBallroom', 'ballroom'
+	act 'Go to the foyer':gt 'bdsm_hallway', 'foyer'
+	act 'Go to reception':gt 'bdsm_mansion', 'reception'
+	act 'Go to the libary':gt 'bdsm_library'
+	act 'Go to the Ball room':gt 'bdsm_ballroom', 'ballroom'
 end
 
 if $ARGS[0] = 'east':
     $location_type = 'private'
-	$loc = 'MHall'
+	$loc = 'bdsm_hallway'
 	$loc_arg = 'east'
-	$menu_loc = 'MHall'
+	$menu_loc = 'bdsm_hallway'
 	$menu_arg = 'east'
 	menu_off = 0
 	killvar '$locclass'
@@ -64,13 +64,13 @@ if $ARGS[0] = 'east':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/hall.jpg"></center>'
 	'You are standing in the east wing hallway, you can feel the warm air from the conservatory to your right and the dinning room is to your left.'
 	'Further down the hallway are the kitchen, pantry and laundry room. At the end of the hall is are stairs leading up to the guest bedrooms and down to the basement.'
-	act 'Go to the foyer':gt 'MHall', 'foyer'
-	act 'Go to the conservatory': gt 'MConservatory'
-	act 'Go to the dining room':gt 'MDining'
-	act 'Go to the kitchen':gt 'MKitchen', 'kitchen'
-	act 'Go to the laundry':gt 'MKitchen', 'laundry'
-	act 'Go upstairs to the west wing landing':gt 'MLanding', 'west'
-	act 'Go down to the basement':gt 'MBasement', 'start'
+	act 'Go to the foyer':gt 'bdsm_hallway', 'foyer'
+	act 'Go to the conservatory': gt 'bdsm_conservatory'
+	act 'Go to the dining room':gt 'bdsm_dining'
+	act 'Go to the kitchen':gt 'bdsm_kitchen', 'kitchen'
+	act 'Go to the laundry':gt 'bdsm_kitchen', 'laundry'
+	act 'Go upstairs to the west wing landing':gt 'bdsm_landing', 'west'
+	act 'Go down to the basement':gt 'bdsm_basement', 'start'
 
 	if rand (0,100) < 3:
 		menu_off = 1
@@ -83,7 +83,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'MHall', 'east'
+		act 'Return': gt 'bdsm_hallway', 'east'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -102,7 +102,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'MHall', 'east'
+		act 'Return': gt 'bdsm_hallway', 'east'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -124,7 +124,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Return': gt 'MHall', 'east'
+		act 'Return': gt 'bdsm_hallway', 'east'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -135,7 +135,7 @@ if $ARGS[0] = 'east':
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'stat'
 		
-		act 'Return': gt 'MHall', 'east'
+		act 'Return': gt 'bdsm_hallway', 'east'
 	elseif rand (0,100) < 3:
 		menu_off = 1
 		*clr & cla
@@ -156,10 +156,10 @@ if $ARGS[0] = 'east':
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Return': gt 'MHall', 'east'
+			act 'Return': gt 'bdsm_hallway', 'east'
 		end
 	end
 end
 
---- MHall ---------------------------------
+--- bdsm_hallway ---------------------------------
 

locations/MKitchen.qsrc → locations/bdsm_kitchen.qsrc

@@ -1,41 +1,41 @@
-# MKitchen
+# bdsm_kitchen
 $location_type = 'private'
 
 if $ARGS[0] = 'kitchen':
 	$locclass = 'kitr'
-	$loc = 'MKitchen'
+	$loc = 'bdsm_kitchen'
 	$loc_arg = 'kitchen'
-	$menu_loc = 'MKitchen'
+	$menu_loc = 'bdsm_kitchen'
 	$menu_arg = 'kitchen'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/kitchen.jpg"></center>'
-	act 'Go to the east hall': gt 'MHall', 'east'
-	act 'look in the pantry': gt 'MKitchen', 'pantry'
+	act 'Go to the east hall': gt 'bdsm_hallway', 'east'
+	act 'look in the pantry': gt 'bdsm_kitchen', 'pantry'
 end
 
 if $ARGS[0] = 'laundry':
-	$loc = 'MKitchen'
+	$loc = 'bdsm_kitchen'
 	$loc_arg = 'laundry'
-	$menu_loc = 'MKitchen'
+	$menu_loc = 'bdsm_kitchen'
 	$menu_arg = 'laundry'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/laundry.jpg"></center>'
 	'The laundry'
-	act 'Go to the east hall': gt 'MHall', 'east'
+	act 'Go to the east hall': gt 'bdsm_hallway', 'east'
 end
 
 if $ARGS[0] = 'pantry':
-	$loc = 'MKitchen'
+	$loc = 'bdsm_kitchen'
 	$loc_arg = 'pantry'
-	$menu_loc = 'MKitchen'
+	$menu_loc = 'bdsm_kitchen'
 	$menu_arg = 'pantry'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/pantry.jpg"></center>'
-	act 'Return to the kitchen': gt 'MKitchen', 'kitchen'
+	act 'Return to the kitchen': gt 'bdsm_kitchen', 'kitchen'
 end
 
---- MKitchen ---------------------------------
+--- bdsm_kitchen ---------------------------------
 

locations/bdsm_landing.qsrc

@@ -0,0 +1,56 @@
+# bdsm_landing
+$location_type = 'private'
+killvar '$locclass'
+
+if $ARGS[0] = 'west':
+	*clr & cla
+	$loc = 'bdsm_landing'
+	$loc_arg = 'west'
+	$menu_loc = 'bdsm_landing'
+	$menu_arg = 'west'
+	menu_off = 0
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/wlanding.jpg"></center>'
+	act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
+	act 'Go downstairs to the foyer':gt 'bdsm_hallway', 'foyer'
+	act 'Visit the master bedroom':gt 'bdsm_bedwest', 'master'
+	act 'Visit guest bedroom A':gt 'bdsm_bedwest', 'guest'
+	act 'Visit the games room':gt 'bdsm_gameroom'
+
+	if rand (0,100) < 3:
+		menu_off = 1
+		*clr & cla
+		gs 'stat'
+		'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/sex/maid_sex_b1.mp4"></video></center>'
+		'A maid is being helped with the vacuum cleaning by a man in casual clothing, you think about reporting him, but he''s a bit busy right now.'
+		
+		gs 'arousal', 'voyeur_sex', 5
+		gs 'arousal', 'end'
+		gs 'stat'
+		
+		act 'Return': gt 'bdsm_landing', 'west'
+	end
+end
+
+if $ARGS[0] = 'east':
+	*clr & cla
+	killvar '$locclass'
+	$loc = 'bdsm_landing'
+	$loc_arg = 'east'
+	$menu_loc = 'bdsm_landing'
+	$menu_arg = 'east'
+	menu_off = 0
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/elanding.jpg"></center>'
+	act 'Go to the west wing landing':gt 'bdsm_landing', 'west'
+	act 'Go downstairs to the foyer':gt 'bdsm_hallway', 'foyer'
+	act 'Go downstairs to the west wing hallway':gt 'bdsm_hallway', 'west'
+	act 'Visit guest bedroom B':gt 'bdsm_bedeast', 'guestB'
+	act 'Visit guest bedroom C':gt 'bdsm_bedeast', 'guestC'
+	act 'Visit guest bedroom D':gt 'bdsm_bedeast', 'guestD'
+	act 'Go to the bathroom': gt 'bdsm_bathrooms', 'bath'
+	act 'Go to the living room': gt 'bdsm_livingroom'
+end
+
+--- bdsm_landing ---------------------------------
+

locations/MLibrary.qsrc → locations/bdsm_library.qsrc

@@ -1,9 +1,9 @@
-# MLibrary
+# bdsm_library
 
 $location_type = 'private'
-$loc = 'MLibrary'
+$loc = 'bdsm_library'
 $loc_arg = ''
-$menu_loc = 'MLibrary'
+$menu_loc = 'bdsm_library'
 $menu_arg = ''
 menu_off = 0
 *clr & cla
@@ -18,10 +18,10 @@ if hour = 18:
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/suburb/bdsm_club/librand.mp4"></video></center>'
 	'It looks like the librarian has put one of the books back in the wrong place, she really does seem to like the being punished.'
-	act 'Leave her to it': gt 'MHall', 'west'
+	act 'Leave her to it': gt 'bdsm_hallway', 'west'
 end
 
-act 'Go to west wing hall': gt 'MHall', 'west'
+act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
 
---- MLibrary ---------------------------------
+--- bdsm_library ---------------------------------
 

locations/MLiving.qsrc → locations/bdsm_livingroom.qsrc

@@ -1,17 +1,17 @@
-# MLiving
+# bdsm_livingroom
 
 $location_type = 'private'
 $locclass = 'livingr'
-$loc = 'MLiving'
+$loc = 'bdsm_livingroom'
 $loc_arg = ''
-$menu_loc = 'MLiving'
+$menu_loc = 'bdsm_livingroom'
 $menu_arg = ''
 menu_off = 0
 *clr & cla
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/living.jpg"></center>'
 'Living room'
-act 'Go to the east wing landing':gt 'MLanding', 'east'
+act 'Go to the east wing landing':gt 'bdsm_landing', 'east'
 
---- MLiving ---------------------------------
+--- bdsm_livingroom ---------------------------------
 

locations/BDSM_Club.qsrc → locations/bdsm_mansion.qsrc

@@ -1,4 +1,4 @@
-# BDSM_Club
+# bdsm_mansion
 if $ARGS[0] = 'Hos':
 	*clr & cla
 	menu_off = 1
@@ -14,9 +14,9 @@ end
 
 if $ARGS[0] = 'start':
 	$loc_arg = 'start'
-	$loc = 'BDSM_Club'
+	$loc = 'bdsm_mansion'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'BDSM_Club'
+	$menu_loc = 'bdsm_mansion'
 	$menu_arg = 'start'
 	menu_off = 0
 	*clr & cla
@@ -25,14 +25,14 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/club.jpg"></center>'
 	if BDSMtaxi = 1 and BDSMmeet = 0:
 		'The taxi brings you in a gated community outside of town and drops you off at the closed wrought iron gate. From the booth comes a guard, you show him the business card. Without saying anything, he opens the gate and points you in the direction. You walk to a marble tiled walkway past the neatly clipped shrubs and flower beds. An other guard meets you, and leads you into the mansion through an inconspicuous side door.'
-		act 'Enter club':gt 'BDSM_Club', 'in'
+		act 'Enter club':gt 'bdsm_mansion', 'in'
 	elseif BDSMClubIn = 1 and BDSMday ! daystart:
 		if BDSMpayDay < daystart - 30 and $BDSMrole = 's':
-			act 'Enter the club':gt 'BDSM_Club', 's_start'
+			act 'Enter the club':gt 'bdsm_mansion', 's_start'
 		elseif BDSMpayDay < daystart - 30 and $BDSMrole = 'd':
-			act 'Enter the club':gt 'BDSM_Club', 'd_start'
+			act 'Enter the club':gt 'bdsm_mansion', 'd_start'
 		else
-			act 'Enter the club':BDSMday = daystart & gt 'MHall', 'foyer'
+			act 'Enter the club':BDSMday = daystart & gt 'bdsm_hallway', 'foyer'
 		end
 	elseif BDSMmeet = 1 and BDSMday ! daystart:
 		if money < 10000:
@@ -114,7 +114,7 @@ if $ARGS[0] = 'in':
 			'"Find a branch of G & M and buy one, and don''t forget to bring the first installment of 10 thousand <b>₽</b>. We are not a charitable organization, nothing is free. However, if you prove yourself as a sub, you will be able to earn some tips in private sessions. But the main thing – do not talk. We have important clients, and don''t need advertising. Everything clear?"'
 			'"Clear... Mistress..."'
 			'As you are leaving, you think, where will you get the money for the down payment.'
-			act 'Leave':gt 'BDSM_Club', 'start'
+			act 'Leave':gt 'bdsm_mansion', 'start'
 		end
 		gs 'willpower', 'misc', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -134,7 +134,7 @@ if $ARGS[0] = 'in':
 				'"Before you can get started, you will have some orientation under the guidance of an experienced mistress." She points at herself, "The cost of this is covered by your registration fee. If you are satisfied, sign this document."'
 				'You sign the document. The man places the paper in a folder.'
 				'As you are leaving, you think, where will you get the money for the registration fee and if you can persuade someone to come here as a sub.'
-				act 'Leave':gt 'BDSM_Club', 'start'
+				act 'Leave':gt 'bdsm_mansion', 'start'
 			end
 		else
 			act 'Dominant (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -144,7 +144,7 @@ end
 
 if $ARGS[0] = 's_start':
 	*clr & cla
-	$menu_loc = 'BDSM_Club'
+	$menu_loc = 'bdsm_mansion'
 	$menu_arg = 's_start'
 	menu_off = 0
 	gs 'stat'
@@ -155,16 +155,16 @@ if $ARGS[0] = 's_start':
 		BDSMday = daystart
 		money -= 10000
 		'You pay for another 30 days access to the club.'
-		act 'Enter the club':gt 'MHall', 'foyer'
+		act 'Enter the club':gt 'bdsm_hallway', 'foyer'
 	else
 		'You cannot afford the 10,000 rubes required to extend your club membership.'
-		act 'Leave':gt 'BDSM_club', 'start'
+		act 'Leave':gt 'bdsm_mansion', 'start'
 	end
 end
 
 if $ARGS[0] = 'd_start':
 	*clr & cla
-	$menu_loc = 'BDSM_Club'
+	$menu_loc = 'bdsm_mansion'
 	$menu_arg = 'd_start'
 	menu_off = 0
 	gs 'stat'
@@ -175,28 +175,28 @@ if $ARGS[0] = 'd_start':
 		BDSMday = daystart
 		money -= 10000
 		'You pay for another 30 days access to the club'
-		act 'Enter the club':gt 'MHall', 'foyer'
+		act 'Enter the club':gt 'bdsm_hallway', 'foyer'
 	else
 		'You cannot afford the 10,000 rubes required to extend your club membership.'
-		act 'Leave':gt 'BDSM_club', 'start'
+		act 'Leave':gt 'bdsm_mansion', 'start'
 	end
 end
 
 if $ARGS[0] = 'reception':
 	$location_type = 'event'
-	$menu_loc = 'BDSM_Club'
+	$menu_loc = 'bdsm_mansion'
 	$menu_arg = 'reception'
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
 	'You go to the reception, Mistress Elektra is sitting at her desk looking a little bored.'
-	act 'Go to west wing hall': gt 'MHall', 'west'
-	act 'Go to the garage': gt 'MRear', 'garage'
+	act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
+	act 'Go to the garage': gt 'bdsm_garden', 'garage'
 end
 
 if $ARGS[0] = 'office':
 end
 
---- BDSM_Club ---------------------------------
+--- bdsm_mansion ---------------------------------
 

locations/city_suburbs.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0]='start':
 	end
 
 	if BDSMClub = 1 or BDSMmeet > 0:
-		act 'Go to the BDSM club': gt 'BDSM_Club','start'
+		act 'Go to the BDSM club': gt 'bdsm_mansion','start'
 	end
 	
 	if func('homes_properties', 'has_access', 'matryona_mansion') = 0:

locations/katja_city_sex.qsrc

@@ -313,7 +313,7 @@ if $ARGS[0] = 'walking_home_with_a_guy.':
 									'She then sniffs the line like a pro and sits up, waiting for the the drugs to hit her.' 
 									*nl
 									'After a moment, it does and Katja sits there with wide open eyes. She starts giggling, which turns into a laugh that lasts for some time.'
-									act 'Continue talking': gt 'katja_nightclub', 'private_room2', 2
+									act 'Continue talking': gt 'katja_city_sex', 'after_drugs'
 								end
 							end
 						else

locations/Katja_nightclub.qsrc → locations/katja_nightclub.qsrc

@@ -1,4 +1,4 @@
-# Katja_nightclub
+# katja_nightclub
 !2023/03/25
 
 !! katjaQW['disco_loc'] = 1: Katja is dancing alone on the dance floor
@@ -1699,5 +1699,5 @@ if $ARGS[0] = 'private_room2':
 	end
 end
 
---- Katja_nightclub ---------------------------------
+--- katja_nightclub ---------------------------------
 

locations/Katja_nightclub_sex.qsrc → locations/katja_nightclub_sex.qsrc

@@ -1,4 +1,4 @@
-# Katja_nightclub_sex
+# katja_nightclub_sex
 !2023/05/27
 
 if $ARGS[0] = 'private_booth_FFM':
@@ -183,5 +183,5 @@ if $ARGS[0] = 'private_booth_FFM':
 	end
 end
 
---- Katja_nightclub_sex ---------------------------------
+--- katja_nightclub_sex ---------------------------------
 

locations/lesbimistress.qsrc

@@ -1956,7 +1956,7 @@ if $ARGS[0] = 'BDSMEV':
 			gs 'arousal', 'end'
 			gs 'stat'
 				
-			act 'Go to the BDSM club':BDSMtaxi = 1 & gt 'BDSM_Club','start'
+			act 'Go to the BDSM club':BDSMtaxi = 1 & gt 'bdsm_mansion','start'
 		end
 	end
 end

locations/taxi.qsrc

@@ -77,9 +77,9 @@ if $ARGS[0] = 'locations':
 		end
 	end
 
-	if $loc ! 'BDSM_Club' and BDSMtaxi = 1:
+	if $loc ! 'bdsm_mansion' and BDSMtaxi = 1:
 		act 'Go to the BDSM club':
-			$loc = 'BDSM_Club'
+			$loc = 'bdsm_mansion'
 			$loc_arg = 'start'
 			gt 'taxi', 'trip'
 		end