[changed] strip club is open during the day

[changed] strip club is a little more fluid to work at, is not currently balanced for money earnings

locations/Nord.qsrc

@@ -119,7 +119,7 @@ if $ARGS[0] = 'redlight':
 	gs 'stat'
 	'<center><h2>St. Petersburg</h2></center>'
 	'<center><b>Red Light District</b></center>'
-	if hour >= 15 or hour <= 2:'The <a href="exec:gt ''stripclub'', ''start''">Strip Clubs</a> red lights, attracting men from all over the city.'
+	'The <a href="exec:gt ''stripclub'', ''start''">Strip Clubs</a> red lights, attracting men from all over the city.'
 	if pornstudio >= 1 and hour >= 10 and hour < 22:'At the <a href="exec:gt ''pornstudio'', ''start''">Porn Studio</a>, where a variety of naughty movies are created'
 	'A shop for <a href="exec:gt ''sexshop'', ''start''">sex toys</a> is open for perverts from all around the city.'
 	if bordel > 0 and hour >= 20 or bordel > 0 and hour <= 3:'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'

locations/stripclub.qsrc

@@ -19,20 +19,9 @@ if $ARGS[0] = 'start':
 	
 	if hour = 2:
 		'The strip club is closing and security guard ushers everyone out.'
-	elseif hour > 2 and hour < 15:
+	elseif hour > 2 and hour < 11:
 		'The strip club is closed. You notice a sign on the door: The business hours are between 15 - 02.'
 	else
-
-		if rand(1, 100) <= 30 and stripday ! daystart:
-			stripday = daystart
-			cfnm = 1
-		elseif stripday ! daystart:
-			stripday = daystart
-			cfnm = 0
-		end
-
-		if cfnm = 1:'Tonight''s performance will only feature male strippers. The entrance fee is 500 <b>₽</b>.'
-		if cfnm = 0:'Tonight''s performance will only feature female strippers. The entrance fee is 300 <b>₽</b>.'
 		
 		if stripdolg > 0:
 			if money >= 50000:
@@ -144,13 +133,7 @@ if $ARGS[0] = 'start':
 					end
 				end
 			end
-
-			if cfnm = 0 and stripwork > 0:
-				act 'Walk into the dressing room':frost = 0 & gt 'stwork', 'start'
-			
-			elseif cfnm > 0 and stripwork > 0:
-				'The strip club is closed off to female employees today, male strippers only.'
-			end
+			act 'Walk into the dressing room':frost = 0 & gt 'stwork', 'start'
 		end
 	end
 

locations/stwork.qsrc

@@ -38,46 +38,45 @@ if $ARGS[0] = 'start':
 
 	publichot = pcs_dancero/2 + pcs_apprnc/4 + city_stripping/4 + stripKoef + stripKoef2 + stripKoef3 + stripKoef4 + stripKoef5 + stripKoef6 + stripKoef7
 	publichotstart = publichot
-
-	if hour >= 18 or hour <= 2:
-		if cumloc[1] = 0 and cumloc[2] = 0 and cumloc[4] = 0 and cumloc[5] = 0 and cumloc[6] = 0 and cumloc[7] = 0 and cumloc[11] = 0 and cumloc[14] = 0:
-			if pcs_makeup >= 4:
-				if pcs_hairbsh = 1:
-					if pcs_sweat < 20:
-						if pcs_leghair <= 3 and pcs_pubes <= 3:
-							if fingal <= 0:
-								act '<b>Go on stage</b>':stpredmet = 3 & gt 'stwork2', 'strip'
+	act 'Exit the club':gt 'stripclub', 'start'
+	act '<b>Go on stage</b>':
+		if hour >= 11 or hour <= 2:
+			if cumloc[1] = 0 and cumloc[2] = 0 and cumloc[4] = 0 and cumloc[5] = 0 and cumloc[6] = 0 and cumloc[7] = 0 and cumloc[11] = 0 and cumloc[14] = 0:
+				if pcs_makeup >= 4:
+					if pcs_hairbsh = 1:
+						if pcs_sweat < 20:
+							if pcs_leghair <= 3 and pcs_pubes <= 19:
+								if fingal <= 0:
+									stpredmet = 3 & gt 'stwork2', 'strip'
+								else
+									'You aren''t allowed on stage, because of the black eye.'
+								end
 							else
-								'You aren''t allowed on stage, because of the black eye.'
+								'Nobody wants to see a stripper with hairy legs and untrimmed pubes. Have a shave before you go on stage!'
 							end
 						else
-							'Nobody wants to see a stripper with hairy legs and hairy pubes. Have a shave before you go on stage.'
+							'Damn, you stink like a pigsty, take a shower before going on stage.'
 						end
 					else
-						'Damn, you stink like a pigsty, take a shower before going on stage.'
+						'The least you can do is brush your hair.'
 					end
 				else
-					'The least you can do is brush your hair.'
+					'You need to put on very thick makeup if you want people to be impressed by your beauty.'
 				end
 			else
-				'You need to put on very thick makeup if you want people to be impressed by your beauty.'
+				'There is some visible semen on your body. Wash yourself off before going on stage.'
 			end
 		else
-			'There is some visible semen on your body. Wash yourself off before going on stage.'
+			'You''re done for today. Time to head home.'
 		end
-	else
-		'You''re done for today. Time to head home.'
 	end
-	
+	act 'Use staff toilet':gt 'stwork', 'toilet'
+	act 'Look in the mirror': gt 'mirror', 'start'
+	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Have a cup of water (0:05)':gs 'beverage', 'bev_wat'
 	if money >= 100:
 		act 'Have a snack (0:05) (100 <b>₽</b>)': money -= 100 & gs 'food', 'snack'
 	end
-	act 'Look in the mirror': gt 'mirror', 'start'
-	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-	act 'Change your clothes':gt 'wardrobe', 'start'
-	act 'Use staff toilet':gt 'stwork', 'toilet'
-	act 'Exit the club':gt 'stripclub', 'start'
 end
 
 if $ARGS[0] = 'stripgirl':
@@ -122,14 +121,31 @@ if $ARGS[0] = 'toilet':
 	''
 	'You enter a dirty and smelly staff bathroom that''s probably never been cleaned.'
 	'There is no mirror, only a grimy shower, toilet, and basin'
-
+	act 'Leave the toilet':gt 'stwork', 'start'
+	act 'Have a shower and get ready for work':
+		cls
+		dynamic $showerdin
+		minut += 10
+		makupskl_exp += rand(1,3)
+		kosmetica -= 3
+		vidageday -= 1
+		pcs_makeup = 4
+		pcs_hairbsh = 1
+		'<h3>Staf Toilet</h3>'
+		'<h5>Shower</h5>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
+		*nl
+		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly, brush your hair, and put on heavy you makeup for the customers.'
+		dynamic $brit
+		act 'Get out and dry off':gt $locM, $metkaM
+	end
 	act 'Have a shower':
 		cls
 		dynamic $showerdin
 		'<h3>Staf Toilet</h3>'
 		'<h5>Shower</h5>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelShower.jpg"></center>'
-		''
+		*nl
 		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible for potential customers.'
 		dynamic $brit
 		act 'Get out and dry off':gt $locM, $metkaM
@@ -157,8 +173,6 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-
-	act 'Leave the toilet':gt 'stwork', 'start'
 end
 
 --- stwork ---------------------------------

locations/stwork2.qsrc

@@ -6,18 +6,19 @@ if $ARGS[0] = 'strip':
 	'<center><b><font color="maroon">Stage</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclub1.jpg"></center>'
 
-	if publichot < 10:$pubhot = 'booing you, you hear someone shout, "Get this stupid cow off the stage."'
-	if publichot >= 10 and publichot < 20:$pubhot = 'clearly showing discontent with your dancing. They want you off the stage as quickly as possible.'
-	if publichot >= 20 and publichot < 30:$pubhot = 'clearly looking bored, drinking and talking among themselves, ignoring you.'
-	if publichot >= 30 and publichot < 60:$pubhot = 'sometime looking at you, smiling and enjoy the performance.'
-	if publichot >= 60 and publichot < 70:$pubhot = 'watching you with genuine interest while conversing with each other over their beers.'
-	if publichot >= 70 and publichot < 80:$pubhot = 'having their attention focused on you.'
-	if publichot >= 80 and publichot < 90:$pubhot = 'with strained faces, sweat beading on their foreheads, their arousal clearly showing.'
-	if publichot >= 90:$pubhot = 'completely indulged in you. They''re clapping and waving money at you trying to get you attention.'
+	if striptip < 10:$pubhot = 'booing you, you hear someone shout, "Get this stupid cow off the stage."'
+	if striptip >= 10 and striptip < 20:$pubhot = 'clearly showing discontent with your dancing. They want you off the stage as quickly as possible.'
+	if striptip >= 20 and striptip < 30:$pubhot = 'clearly looking bored, drinking and talking among themselves, ignoring you.'
+	if striptip >= 30 and striptip < 60:$pubhot = 'sometime looking at you, smiling and enjoy the performance.'
+	if striptip >= 60 and striptip < 70:$pubhot = 'watching you with genuine interest while conversing with each other over their beers.'
+	if striptip >= 70 and striptip < 80:$pubhot = 'having their attention focused on you.'
+	if striptip >= 80 and striptip < 90:$pubhot = 'with strained faces, sweat beading on their foreheads, their arousal clearly showing.'
+	if striptip >= 90:$pubhot = 'completely indulged in you. They''re clapping and waving money at you trying to get you attention.'
 
 	'There are men sitting in front of the stage <<$pubhot>>.'
 
-	if hour >= 18 or hour <= 2:
+	if hour >= 11 or hour <= 2:
+		if stpredmet = 3:lapdance = 0
 		if stpredmet > 0:
 			act 'Striptease 5 minutes (<<stpredmet>> items of clothing)':
 				cls
@@ -25,7 +26,6 @@ if $ARGS[0] = 'strip':
 				stpredmet -= 1
 				pcs_sweat += 5
 				fat -= 3
-				pcs_mood -= rand(2, 6)
 				dancero_exp += rand(2, 4)
 				inhib_exp += rand(2,5)
 				city_stripping += rand(1,2)
@@ -33,9 +33,8 @@ if $ARGS[0] = 'strip':
 				if stpredmet = 1:pcs_sweat += 5
 				if stpredmet = 0:pcs_hairbsh = 0 & stripdancesum += 1
 
-				publichot += rand(pcs_dancero/5, pcs_dancero/3)
-
-				if publichotstart = publichot: publichot -= rand(5, 10) & publichotstart = publichot
+				striptip = rand(pcs_dancero,100)
+				lapdance += striptip
 
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclub2.jpg"></center>'
@@ -45,7 +44,7 @@ if $ARGS[0] = 'strip':
 					vesrand = rand(0, 100)
 
 					if vesrand >= 75:
-						publichot -= rand(5, 10)
+						striptip -= rand(5, 10)
 						'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass shaking like jelly."'
 					end
 				end
@@ -70,10 +69,9 @@ if $ARGS[0] = 'strip':
 				if stpredmet = 0:pcs_makeup = 0 & stripdancesum += 1
 
 				!pcs_hairbsh = 0
-				publichot += rand(pcs_dancero / 10, pcs_dancero / 5)+ rand(pcs_dancpol / 5, pcs_dancpol / 2)
-
-				if publichotstart = publichot:publichot -= rand(5, 10) & publichotstart = publichot
-
+				striptip = rand(pcs_dancpol,100)
+				lapdance += striptip
+				
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/strippole.jpg"></center>'
 				'You step up on the stage and the music starts. You grab hold of the pole and acrobatically slide around it while you teasingly undress.'
@@ -83,7 +81,7 @@ if $ARGS[0] = 'strip':
 
 					if vesrand >= 75:
 						'Performing another trick on the pole you can not support your weight and fall flat to the floor. The crowd laughs, "Hey, hippopotamus, stomp back to the swamp where you came from."'
-						publichot -= 15
+						striptip -= 15
 						fingalrand = rand(0, 100)
 						if fingalrand >= 75:
 							fingal += rand(2, 5)
@@ -93,7 +91,7 @@ if $ARGS[0] = 'strip':
 						end
 					end
 					if vesrand >= 50:
-						publichot -= rand(5, 10)
+						striptip -= rand(5, 10)
 						'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass shaking like jelly."'
 					end
 				end
@@ -105,9 +103,9 @@ if $ARGS[0] = 'strip':
 		end
 
 		if stpredmet = 0:
-			if publichot >= 70:
+			if lapdance >= 150:
 				privatrand = rand(0, 100)
-				if privatrand >= 70:
+				if privatrand >= 50:
 					'After you finish dance, the security guard approaches you and tells you that you have a customer wanting a private show.'
 					gs 'stwork2', 'privatdance'
 					exit
@@ -126,19 +124,19 @@ if $ARGS[0] = 'tipcalculator':
 	paymin = 0
 	paymax = 0
 	
-	if publichot < 30:
+	if striptip < 30:
 		'Nobody even noticed you or your efforts on the stage.'
-	elseif publichot < 60:
+	elseif striptip < 60:
 		'A couple of people looked at you but nothing more than that, you didn''t receive a tip.'
-	elseif publichot < 70:
+	elseif striptip < 70:
 		paymax = 1
 		if payrand = 0: 'A couple of people looked at you but nothing more than that, you didn''t receive a tip.'
-	elseif publichot < 80:
+	elseif striptip < 80:
 		chance = 5
 		paymin = 3
 		paymax = 10
 		'The customers are pleased with your performance. They give you a small tip.'
-	elseif publichot < 90:
+	elseif striptip < 90:
 		chance = 10
 		paymin = 10
 		paymax = 50