Merge branch 'master' of foxcon145/glife into master

[added] few new random events in street_events and a little more atmosphere to the strip club. Also changed opening hours which might change back.

locations/city_redlight.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/redlight.jpg"></center>'
 	
 	'This small area inside the Industrial District has lots of strip clubs and sex shops. The Porn studio also operates out of this district.'
-	if hour >= 18 or hour < 2:
+	if hour >= 18 or hour < 4:
 		'The <a href="exec:gt ''stripclub'', ''start''">Strip Clubs</a> red lights, attracting men from all over the city.'
 	else
 		'The <a href="exec:msg ''The Strip Club is closed for the day and will reopen at 18:00''">Strip Clubs</a> red lights, attracting men from all over the city.'

locations/street_event.qsrc

@@ -821,7 +821,7 @@ if $ARGS[1] = 'main':
 					*clr & cla
 					minut += 5
 					'<<$streetev_title>>'
-					'<center><video autoplay loop src="images/locations/shared/street/sharkdress.mp4"></video></center>'
+					'<center><video autoplay loop src="images/locations/shared/street/sharkdress'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you, grabs the top of your dress and yanks it down around your ankles, which leaves you standing stark naked. You quickly squat down and grab your dress, pulling it back up and into place. By that time, who ever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
 					if exhibitionist_lvl = 1:
@@ -886,7 +886,8 @@ if $ARGS[1] = 'main':
 				gt $loc
 			end
 		elseif streetrand > 82:
-			if PCloSkirt > 0 and $pantyworntype ! 'none':
+		!! when sunny and wearing panties
+			if PCloSkirt > 0 and sunWeather = 1 and $pantyworntype ! 'none':
 				*clr & cla
 				menu_off = 1
 				minut += 5
@@ -908,6 +909,55 @@ if $ARGS[1] = 'main':
 				end
 				gs 'stat'
 				act 'Continue':gt $loc
+		!! when rainy and not wearing panties
+			elseif sunWeather = 0 and $pantyworntype = 'none':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/breeze_rainy.mp4"></video></center>'
+				'A strong windy breeze blows down the street which causes your skirt to blow up entirely, exposing all of your crotch to the people around. You struggle pushing it back down where it belongs, as the breeze continues to expose you.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You look around and notice several people staring at you. You are sure they''ve seen everything. You can''t help but smile, loving the attention even if it wasn''t your idea. You casually continue on your way, but with an extra bit of sway in your hips.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You look around and notice several people staring at you. <i>They have probably seen that I don''t wear underwear.</i> you think to yourself and continue on your way.'
+				else
+					pcs_mood -= 10
+					'You look around and notice several people staring at you. You are sure they''ve seen everything. You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			else
+				gt $loc
+			end
+		elseif streetrand > 81:
+			cla
+			if PCloSkirt > 0 and PCloOnePiece = 1 and hour >= 10 or hour < 2:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/street_groped'+ rand(1,2) +'.jpg"></center>'
+				'As you walk down the street, someone comes up behind you and grabs your ass, sqeezing it tightly. You flinch while quickly turning around angrily but only seeing your perpetrator running away.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the ''extra'' attention even if it wasn''t your idea. You casually continue on your way, but with an extra bit of sway in your hips.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You swear loudly in his direction, checking your purse to see if he stole something. You continue on your way, albeit a little more annoyed than you were before.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
 			else
 				gt $loc
 			end
@@ -927,6 +977,74 @@ if $ARGS[1] = 'main':
 			else
 				gt $loc
 			end
+		elseif streetrand > 79:
+			cla
+			if $braworntype = 'none' and PCloThinness = 4:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra'+ rand(5,6) +'.mp4"></video></center>'
+				'As you walk down the street you feel wobbling your breasts freely under your outfit, which can probably be seen by people walking by too.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the attention. You casually continue on your way, but with an extra bit of sway in your tits.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You feel ashamed and blush bright red and hurry on your way, thinking it was a bad idea not wearing a bra today and such a thin outfit.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			elseif $braworntype = 'none' and PCloThinness = 5:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra'+ rand(2,4) +'.mp4"></video></center>'
+				'As you walk down the street you feel wobbling your breasts freely under your thin outfit, stretching it, emphasizing the outline of your tits, which can definitely be seen by people walking by too. As you look closely both men and women are staring at your jiggling tits.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the attention. You casually continue on your way, but with an extra bit of sway in your tits.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You feel ashamed and blush bright red and hurry on your way, thinking it was a bad idea not wearing a bra today and such a thin outfit.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			elseif $braworntype = 'none' and PCloThinness = 6:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra1.mp4"></video></center>'
+				'Your transparent top leaves no space for imagination as you walk down the street, feeling your breasts wobbling freely under your thin outfit. Eyes of people walking by are glued to your tits as you cross them, giving them a clear view. It''s as if you were naked.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the attention. You casually continue on your way, but with an extra bit of sway in your tits.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You feel ashamed and blush bright red and hurry on your way, thinking it was a bad idea not wearing a bra today and such a transparent outfit. People must be thinking you are such a whore.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			else
+				gt $loc
+			end
 		elseif streetrand > 78:
 			cla
 			if hour >= 9 or hour < 2:

locations/stripclub.qsrc

@@ -8,18 +8,36 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'stripclub'
 	$menu_arg = 'start'
 	menu_off = 0
+	if sound = 0:
+		if month >=11 and month <= 12 or month >=1 and month <=3:
+			if hour >= 4 and hour <= 17: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
+			if hour >= 18 or hour <= 3: PLAY 'sound/street_club.mp3',30
+		else
+			if hour >= 4 and hour <= 17: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
+			if hour >= 18 or hour <= 3: PLAY 'sound/street_club.mp3',30
+		end
+	end
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">Strip Club</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub.jpg"></center>'
+	'<center><b><font color="maroon">Golden Girls Strip Club</font></b></center>'
+	if month >=11 and month <= 12 or month >=1 and month <=3:
+		if hour >= 19 or hour <= 5: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_winter.jpg"></center>'
+		if hour >= 6 and hour <= 18: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_winter.jpg"></center>'
+	else
+		if hour >= 20 and hour <= 23: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer_1.jpg"></center>'
+		if hour >= 0 and hour <= 5: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer_2.jpg"></center>'
+		if hour >= 6 and hour <= 19: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_summer.jpg"></center>'
+	end
 	*nl
 
 	act 'Leave': gt 'city_redlight', 'start'
 
-	if hour = 2:
+	'There are other strip clubs in this area, the <a href="exec:view''images/locations/city/redlight/stripclub/macho.jpg''">Macho</a>, the <a href="exec:view''images/locations/city/redlight/stripclub/maximus_night.jpg''">Maximus</a>, or the <a href="exec:view''images/locations/city/redlight/stripclub/penthouse_night.jpg''">Penthouse</a>, but they are not as prestigious and popular as the Golden Girls Club.'
+
+	if hour = 4:
 		'The strip club is closing, and a security guard ushers everyone out.'
-	elseif hour > 2 and hour < 11:
-		'The strip club is closed. You notice a sign on the door: The business hours are between 18:00 - 02:00.'
+	elseif hour > 4 and hour < 11:
+		'The strip club is closed. You notice a sign on the door: The business hours are between 18:00 - 04:00.'
 	else
 		if stripdolg > 0:
 			if money >= 50000:
@@ -94,7 +112,7 @@ if $ARGS[0] = 'manager':
 		end
 		'He leads you to one of the private booths and points to the pole. "Show me what you can do."'
 		if pcs_dancero >= 40 and pcs_dancpol >= 30:
-			'You dance sensually, clearly he''s smitten by you. He asks you to sit down. "Our business hours are between 18:00 to 02:00. Some days there are only male strippers performing. We don''t pay strippers, but the customers tip generously. Think of it as an incentive, perform well and you''ll earn a tip."'
+			'You dance sensually, clearly he''s smitten by you. He asks you to sit down. "Our business hours are between 18:00 to 04:00. Some days there are only male strippers performing. We don''t pay strippers, but the customers tip generously. Think of it as an incentive, perform well and you''ll earn a tip."'
 			'"Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per lap dance. The stripper gets 400 <b>₽</b>, and the rest belongs to the club. They may want further entertainment. As the club doesn''t operate as a brothel, we don''t really accept that kind of business, but we usually turn a blind eye to it."'
 			'"One last thing that I nearly forgot, dancing on stage involves a lot of work on the pole. Unless you do that, it is unlikely you will earn anything. There is no set schedule, the employees choose when they want to come to work. So what do you say, are you interested?"'
 			act 'Accept his offer':
@@ -485,4 +503,3 @@ if $ARGS[0] = 'stpr2':
 end
 
 --- stripclub ---------------------------------
-

locations/stwork.qsrc

@@ -16,6 +16,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	killvar '$sexloc'
+	CLOSE 'sound/street_club.mp3'
 	'<center><b><font color="maroon">Dressing room for strippers</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/backstage' + rand(1,7) + '.jpg"></center>'
 	''