Merge remote-tracking branch 'Anjuna/master'

locations/city_experimental_trials_events.qsrc

@@ -62,14 +62,14 @@ elseif $experimentQW['trial_active'] = 'pill_red':
 			stren_mem -= 2 * (stren_xpnxt - stren_xpprv)
 		end
 
-		'You seem to have lost a lot of mussle mass and feel weaker. This must have been that experimental pill you took.'
+		'You seem to have lost a lot of muscle mass and feel weaker. This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 2:
 		if stren_lvl < 99:
 			stren_exp += 2 * (stren_xpnxt - stren_xpprv)
 		end
 
-		'You seem to have gained a lot of mussle mass and feel stronger! This must have been that experimental pill you took.'
+		'You seem to have gained a lot of muscle mass and feel stronger! This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 3:
 		if agil_lvl > 11:

locations/stripclub.qsrc

@@ -9,23 +9,39 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	if sound = 0:
-		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
-			if hour >= 3 and hour <= 17: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-			if hour >= 18 or hour <= 2: PLAY 'sound/street_club.mp3',30
+		if month >= 11 or month <= 3:
+			if hour >= 3 and hour <= 17:
+				PLAY 'sound/street2.mp3', 30
+				PLAY 'sound/street7.mp3', 30
+				PLAY 'sound/zima.mp3', 30
+			else
+				PLAY 'sound/street_club.mp3', 30
+			end
 		else
-			if hour >= 3 and hour <= 17: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-			if hour >= 18 or hour <= 2: PLAY 'sound/street_club.mp3',30
+			if hour >= 3 and hour <= 17:
+				PLAY 'sound/street2.mp3', 30
+				PLAY 'sound/street7.mp3', 30
+				PLAY 'sound/street_leto.mp3', 30
+			else
+				PLAY 'sound/street_club.mp3', 30
+			end
 		end
 	end
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">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>'
+	if month >= 11 or month <= 3:
+		if hour >= 19 or hour <= 5:
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_winter.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_winter.jpg"></center>'
+		end
 	else
-		if hour >= 20 and hour <= 5: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer.jpg"></center>'
-		if hour >= 6 and hour <= 19: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_summer.jpg"></center>'
+		if hour >= 20 and hour <= 5:
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_summer.jpg"></center>'
+		end
 	end
 	*nl
 
@@ -37,7 +53,9 @@ if $ARGS[0] = 'start':
 		'The strip club is closed. You notice a sign on the door stating that business hours are between 18:00 and 03:00.'
 	else
 		gs 'stripclub', 'entry'
-		if strip_club['stripwork'] = 1 or strip_club['stripbarwork'] = 1 or strip_club['stripbarwork1'] = 1: gs 'stripclub', 'employee_entrance'
+		if strip_club['stripwork'] = 1 or strip_club['stripbarwork'] = 1 or strip_club['stripbarwork1'] = 1:
+			gs 'stripclub', 'employee_entrance'
+		end
 	end
 end
 
@@ -115,14 +133,9 @@ if $ARGS[0] = 'entry':
 		end
 	end
 
-	if pcs_dancero > 0 and strip_club['stripwork'] = 0:
-		act 'Ask about working here': gt 'stripclub', 'hire1'
-	elseif strip_club['stripwork'] = 0:
-		if pcs_inhib >= 40:
-			act 'Ask about working here':
-				gs 'willpower', 'pay', 'force'
-				gt 'stripclub', 'hire1'
-			end
+	if strip_club['stripwork'] = 0:
+		if pcs_dancero > 0 or pcs_inhib >= 40:
+			act 'Ask about working here': gt 'stripclub', 'hire1'
 		else
 			gs 'willpower', 'pcs_inhib', 'self', 'medium'
 			if pcs_willpwr < will_cost:

locations/stripclub_schedule.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'display_single_shift':
 
 	$result +=	'<tr><td>'
 	if strip_club[$scs_arg_string] = 0 and strip_club[$scs_arg_string + '_taken'] < 2 and no (week = ARGS[1] and hour >= scs_hour1 and hour < scs_hour2):
-		$result +=		'<a href="exec:strip_club[''<<$scs_arg_string>>''] = 1 & gt ''stripclub_schedule'', ''<<$scs_return_arg>>''"><<$scs_time_string>> shift</a>'
+		$result +=		'<a href="exec:strip_club[''<<$scs_arg_string>>''] = 1 & gs ''stripclub_schedule'', ''<<$scs_return_arg>>''"><<$scs_time_string>> shift</a>'
 	elseif strip_club[$scs_arg_string + '_taken'] = 2 or (week = ARGS[1] and hour >= scs_hour1 and hour < scs_hour2):
 		$result +=		'<<$scs_time_string>> shift'
 		$result +=	'</td></tr><tr><td>'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'display_single_shift':
 	else
 		$result +=		'<<$scs_time_string>> shift'
 		$result +=	'</td></tr><tr><td>'
-		$result +=		'<a href="exec:strip_club[''<<$scs_arg_string>>''] = 0 & gt ''stripclub_schedule'', ''<<$scs_return_arg>>''">Cancel Shift</a>'
+		$result +=		'<a href="exec:strip_club[''<<$scs_arg_string>>''] = 0 & gs ''stripclub_schedule'', ''<<$scs_return_arg>>''">Cancel Shift</a>'
 	end
 	$result +=	'</td></tr>'
 
@@ -321,12 +321,14 @@ end
 
 
 if $ARGS[0] = 'set_schedule':
+	*clr
 	gs 'stripclub_schedule', 'set_schedule_base', 0
 end
 
 
 
 if $ARGS[0] = 'next_week_set_schedule':
+	*clr
 	gs 'stripclub_schedule', 'set_schedule_base', 1
 end
 

locations/stwork3.qsrc

@@ -60,7 +60,10 @@ if $ARGS[0] = 'first_shift':
 
 		act 'Get to work':
 			*clr & cla
-			if hour < 3: hour = 3 and minut = 0
+			temp_time_change = (3 - hour) * 60 - minut
+			if temp_time_change < 0: temp_time_change += 1440
+			minut += temp_time_change
+			killvar 'temp_time_change'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/serve.jpg"></center>'
 			'The patrons are all in good moods and being busy like this makes time go by rather quickly. If every night were like this, then you''d have no complaints.'
@@ -68,6 +71,7 @@ if $ARGS[0] = 'first_shift':
 
 			act 'Speak with Ivanna':
 				*clr & cla
+				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/ivanna.jpg"></center>'
 				'Ivanna beckons you over. "So how was your night?"'
@@ -130,7 +134,10 @@ end
 
 if $ARGS[0] = 'events':
 	!!set time to 22:00
-	if hour < 22: hour = 22 & minut = 0
+	temp_time_change = (22 - hour) * 60 - minut
+	minut += temp_time_change
+	killvar 'temp_time_change'
+	gs 'stat'
 
 	if rand (0,2) = 0:
 		gt 'stwork3', 'manager_chat'