[changed] entry to BDSM mansion and the staff working as manager updated to new times, shared job and costing.

locations/bdsm_mansion.qsrc

@@ -24,21 +24,31 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<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_mansion', 'in'
-	elseif BDSMClubIn = 1 and BDSMday ! daystart:
-		if BDSMpayDay < daystart - 30 and $BDSMrole = 's':
-			act 'Enter the club':gt 'bdsm_mansion', 's_start'
-		elseif BDSMpayDay < daystart - 30 and $BDSMrole = 'd':
-			act 'Enter the club':gt 'bdsm_mansion', 'd_start'
+		if hour < 16 and hour > 2:
+			'The taxi brings you in a gated community outside of town and drops you off at the closed wrought iron gate. You attempt to enter the secret club but the guard tells you it is closed. You show your card and he tells you to come back after 16:00.'
+			act 'Leave':gt 'city_suburbs', 'start'
 		else
-			act 'Enter the club':BDSMday = daystart & gt 'bdsm_hallway', 'foyer'
+			'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_mansion', 'in'
 		end
-	elseif BDSMmeet = 1 and BDSMday ! daystart:
-		if money < 10000:
-			'You go to the Club entrance but don''t have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.'
-		elseif $clothingworntype ! 'gm_maid' or PCloStyle2 ! 1:
-			'You are not wearing a maid uniform and security refuse you entry.'
+	elseif BDSMday = daystart and hour > 16 or hour < 2:
+		act 'Return to the club':gt 'bdsm_mansion', 'start'
+	elseif BDSMClubIn = 1:
+		if hour < 16 and hour > 2:
+			'You are standing outside the BDSM club but it is closed until 16:00.'
+			act 'Leave':gt 'city_suburbs', 'start'
+		else
+			'You are standing outside the BDSM club which is currently open.'
+			act 'Leave':gt 'city_suburbs', 'start'
+			if $BDSMrole ! '':
+				act 'Enter the club':gt 'bdsm_mansion', 'start'
+			else
+				act 'Enter the club':BDSMday = daystart & gt 'bdsm_hallway', 'foyer'
+			end
+		end
+	elseif BDSMmeet = 1:
+		if $BDSMrole = 's' and ($clothingworntype ! 'gm_maid' or PCloStyle2 ! 1):
+			'You are not wearing a maid uniform or suitable fetish wear and security refuse you entry.'
 		else
 			if $BDSMrole = 's':
 				gt 'BDSM_training', 'start'
@@ -46,12 +56,8 @@ if $ARGS[0] = 'start':
 				gt 'BDSM_training', 'd_start'
 			end
 		end
-	elseif BDSMmeet > 1 and BDSMmeet < 4 and BDSMday ! daystart:
-		if BDSMpayDay >= daystart - 30 or money >= 10000:
-			gt 'BDSM_training', 'start'
-		else
-			'You are in a Club but don''t have enough money, you try to negotiate a deal to pay later, but the staff, realising you are not going to pay, call security. You are walked back to the gate.'
-		end
+	elseif BDSMmeet < 4:
+		gt 'BDSM_training', 'start'
 	end
 
 	gs 'taxi'
@@ -102,18 +108,18 @@ if $ARGS[0] = 'in':
 			'"Yes, Mistress."'
 			'The woman nods. "Undress!"'
 			'"But..."'
-			'"Undress, now! Or I''ll knock you out!" Mistress has her hand on the table.'
+			'"Undress, now! Or I''ll have security do it for you!" Mistress has her hand on the table, her finger hovering over a small red button which you have to assume will summon the security guard.'
 			'You look to the man you were just talking to, but he just stands there, expressionless. You undress.'
 			'"Sign!"'
 			'You sign the document. The man places the paper in a folder.'
 			'"Listen carefully..."'
-			'She explains to you, that the club costs 20,000 <b>₽</b> per 30 days access, with a 10,000 ruble registration fee. For slaves there is a means for discount, if the slave is well behaved and earns enough merits, the membership will be automatically extended.'
+			'She explains to you, that the club costs 30,000 <b>₽</b> registration, a slave has free entry but must comply with any requests made of them. Failure to do so can result in your registration being revoked. If the slave is well behaved there may be additional tasks they can carry out to earn some more money.'
 			'Untrained slaves are not allowed in the Mansion, you will require training. You''ll have to report to me for that, I''m going to enjoy it.'
 			'"Come back when you are ready for training. Be clean, have an enema. You must own a maid outfit, so you will be wearing it. Everything clear?'
 			'"But... what if I don''t have a maid outfit?..." You whisper.'
-			'"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?"'
+			'"Find a branch of G & M and buy one, and don''t forget to bring the 30 thousand <b>₽</b> registration fee. We are not a charitable organization. But the main thing – do not talk. We have important clients and don''t need advertising so do not tell anyone about us. Everything clear?"'
 			'"Clear... Mistress..."'
-			'As you are leaving, you think, where will you get the money for the down payment.'
+			'As you are leaving you think, <<$OpenInnerThought>>"Where will I get the money for the down payment."<<$CloseInnerThought>>'
 			act 'Leave':gt 'bdsm_mansion', 'start'
 		end
 		gs 'willpower', 'misc', 'resist', 'hard'
@@ -128,13 +134,18 @@ if $ARGS[0] = 'in':
 				!'<center><img <<$set_imgh>> src="images/bdsm_club/<<$BDSMrole>><<BDSMmeet>>_2.jpg"></center>'
 				'The woman sighs disappointedly.'
 				'"Pity, we are short on subs."'
-				'"There is a registration fee of 10,000 <b>₽</b>. You should wear an expensive or formal clothing."'
+				'"There is a registration fee of 30,000 <b>₽</b>, then there is a monthly fee of 15,000 <b>₽</b> with your first month free. You should wear nice clothing, don''t want to get mistaken for staff or a sub."'
 				'"That seems reasonable" You reply.'
-				'"If you find a submissive and come together, then they can earn you tips."'
-				'"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_mansion', 'start'
+				'"If you find a submissive and come together, then they can earn you tips. Alternatively if you want to change things up then you could visit as a sub, for that there is no need to have your monthly fee paid but you must be dressed as a maid or in submissive fetish wear. You would need to do the sub training with me too." She licks her lips as she says this.'
+				act 'Thanks but not my thing':
+					'"Of course, I am simply presenting the option"'
+					gs 'bdsm_mansion', 'in2'
+				end
+				act 'We''ll see':
+					'She smiles and her hand goes to her thigh, clearly she finds being a Dom arousing.'
+					'"Any time you want sub training you just let me know."'
+					gs 'bdsm_mansion', 'in2'
+				end
 			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>'
@@ -142,43 +153,50 @@ if $ARGS[0] = 'in':
 	end
 end
 
-if $ARGS[0] = 's_start':
-	*clr & cla
-	$menu_loc = 'bdsm_mansion'
-	$menu_arg = 's_start'
-	menu_off = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
-	'You enter the club and Mistress Elektra is sitting at her desk overseeing admissions.'
-	if money > 10000:
-		BDSMpayDay = daystart
-		BDSMday = daystart
-		money -= 10000
-		'You pay for another 30 days access to the club.'
-		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_mansion', 'start'
-	end
+if $ARGS[0] = 'in2':
+	'"Before you can enter the club there are rules and guidelines that even our Doms must follow, so 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, <<$OpenInnerThought>>"Where will I get the money for the registration fee and how can I persuade someone to come here as a sub."<<$CloseInnerThought>>'
+	act 'Leave':gt 'bdsm_mansion', 'start'
 end
 
-if $ARGS[0] = 'd_start':
+if $ARGS[0] = 'start':
 	*clr & cla
 	$menu_loc = 'bdsm_mansion'
-	$menu_arg = 'd_start'
+	$menu_arg = 'start'
 	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
-	'Elektra is sitting at the admissions desk and greets you informally.'
-	if money > 10000:
-		BDSMpayDay = daystart
-		BDSMday = daystart
-		money -= 10000
-		'You pay for another 30 days access to the club'
+	if week = 2 or week = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/anna.jpg"></center>'
+		'You enter the club and Anna is sitting at her desk overseeing admissions.'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/1_1.jpg"></center>'
+		'You enter the club and Mistress Elektra is sitting at her desk overseeing admissions.'
+	end
+	if $BDSMrole = 's' or BDSMpayDay < daystart + 30:
 		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_mansion', 'start'
+		if money < 10000 and karta  > 10000:
+			'You cannot afford the 10,000 rubes required to extend your club membership.'
+		else
+			if money > 10000:
+				act 'Pay 10,000 <b>₽</b> to extend your membership and enter the club':
+					BDSMpayDay = daystart
+					BDSMday = daystart
+					money -= 10000
+					gt 'bdsm_hallway', 'foyer'
+				end
+			end
+			if karta > 10000:
+				act 'Pay 10,000 <b>₽</b> to extend your membership and enter the club':
+					BDSMpayDay = daystart
+					BDSMday = daystart
+					money -= 10000
+					gt 'bdsm_hallway', 'foyer'
+				end
+			end
+		end
 	end
 end
 
@@ -189,8 +207,13 @@ if $ARGS[0] = '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.'
+	if week = 2 or week = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/anna.jpg"></center>'
+		'You go to the reception, Anna is sitting at her desk filling paperwork.'
+	else
+		'<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.'
+	end
 	act 'Go to west wing hall': gt 'bdsm_hallway', 'west'
 	act 'Go to the garage': gt 'bdsm_garden', 'garage'
 end