Merge remote-tracking branch 'Anjuna/master'

locations/lover_call.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'scheduler':
 			$temp_npcid = $lover[ts_temp_i]
 			if $npc_rel_type[$temp_npcid] = 'boyfriend' or $npc_rel_type[$temp_npcid] = 'girlfriend':
 				if rand(0, 1) = 1:
-					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "gs 'lover_call', 'lover', '<<$temp_npcid>>'", "hour >= 6 and hour <= 19"
+					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "gs 'lover_call', 'lover', '<<$temp_npcid>>'", "totminut > <<totminut + (9 - hour) * 24 + rand(0, 600) - minut>>"
 				else
 					gs 'telefon', 'SetCallSchedule', $temp_npcid, "gt 'lover_call', 'callingTheLover', '<<$temp_npcid>>'", "npc_meetday['<<$temp_npcid>>'] < <<daystart>> and hour >= 7 and hour <= 19", "", "0"
 				end

locations/npcStat.qsrc

@@ -52,37 +52,37 @@ else
 	npclastcalledn = val(mid($npcStatVars['tempID'], 2))
 	npcStatVars['gender'] = 0
 	if npclastcalledn = 1:
-		$npcStatVars['name'] = 'a small sized man'
+		$npcStatVars['name'] = 'a small sized'
 		npcStatVars['dick_length'] = 10
 		npcStatVars['dick_girth'] = 9
 		npcStatVars['sexskill'] = rand(0, 50)
 	elseif npclastcalledn = 2:
-		$npcStatVars['name'] = 'a medium sized man'
+		$npcStatVars['name'] = 'a medium sized'
 		npcStatVars['dick_length'] = 15
 		npcStatVars['dick_girth'] = 10
 		npcStatVars['sexskill'] = rand(30, 60)
 	elseif npclastcalledn = 3:
-		$npcStatVars['name'] = 'a large sized man'
+		$npcStatVars['name'] = 'a large sized'
 		npcStatVars['dick_length'] = 20
 		npcStatVars['dick_girth'] = 11
 		npcStatVars['sexskill'] = rand(40, 60)
 	elseif npclastcalledn = 4:
-		$npcStatVars['name'] = 'a huge sized man'
+		$npcStatVars['name'] = 'a huge sized'
 		npcStatVars['dick_length'] = 25
 		npcStatVars['dick_girth'] = 12
 		npcStatVars['sexskill'] = rand(35, 70)
 	elseif npclastcalledn = 5:
-		$npcStatVars['name'] = 'a giant sized man'
+		$npcStatVars['name'] = 'a giant sized'
 		npcStatVars['dick_length'] = 30
 		npcStatVars['dick_girth'] = 13
 		npcStatVars['sexskill'] = rand(30, 80)
 	elseif npclastcalledn = 6:
-		$npcStatVars['name'] = 'a humongous sized man'
+		$npcStatVars['name'] = 'a humongous sized'
 		npcStatVars['dick_length'] = 35
 		npcStatVars['dick_girth'] = 14
 		npcStatVars['sexskill'] = rand(20, 90)
 	else
-		$npcStatVars['name'] = 'a horse sized man'
+		$npcStatVars['name'] = 'a horse sized'
 		npcStatVars['dick_length'] = 40
 		npcStatVars['dick_girth'] = 15
 		npcStatVars['sexskill'] = rand(0, 100)

locations/stat.qsrc

@@ -394,13 +394,6 @@ if totminut >= heelsminut + 30:
 end
 !!!!!!!!!!!!!!! End heels
 
-
-! Determine Incoming Telephone Calls and SMS
-if prevtotmin ! totminut:
-	gs 'telefon', 'IncomingCheck', prevtotmin, totminut
-	gs 'telefon', 'IncomingSMSCheck'
-end
-
 if minut < 10:
 	$nilmin = '0'
 else
@@ -946,4 +939,11 @@ if hypnoSchedule = 1:
 end
 
 
+! Determine Incoming Telephone Calls and SMS
+if prevtotmin ! totminut:
+	gs 'telefon', 'IncomingCheck', prevtotmin, totminut
+	gs 'telefon', 'IncomingSMSCheck'
+end
+
+
 --- stat ---------------------------------

locations/stripclub.qsrc

@@ -189,7 +189,7 @@ if $ARGS[0] = 'main_floor':
 	minut += 5
 	$menu_loc = 'stripclub'
 	$menu_arg = 'main_floor'
-	!!gs 'schedule', 'A23'
+	gs 'schedule', 'A23'
 	gs 'stat'
 	'<center><b><font color="maroon">Strip Club</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub_interior.jpg"></center>'
@@ -335,7 +335,7 @@ if $ARGS[0] = 'striptease':
 	'The stage is lit up and music booms as a girl walks out before a strenuous male audience.'
 
 	act 'Watch the show':
-		!!gs 'schedule', 'A23'
+		gs 'schedule', 'A23'
 		if rand(0,3) = 0 and AlbinaQW['seen_strip'] = 0 and locat['A23'] = 21:
 			gs 'stripclub', 'albina_first_dance1'
 		elseif rand(0,3) = 0 and AlbinaQW['seen_strip'] = 1 and locat['A23'] = 21:

locations/stwork.qsrc

@@ -26,13 +26,13 @@ if $ARGS[0] = 'start':
 	'A wooden door leads to the <a href="exec:gt ''stwork'', ''toilet''">staff bathroom</a>.'
 
 	!! Tattoos increase your desireability as a stripper
-	if tatlech > 0: stripKoef1 = rand(1,3)
-	if tatback > 0: stripKoef2 = rand(1,3)
-	if tatblly > 0: stripKoef3 = rand(1,3)
-	if tatupb > 0: stripKoef4 = rand(3,6)
-	if tatleg > 0: stripKoef5 = rand(1,3)
-	if tatarm > 0: stripKoef6 = rand(1,3)
-	if tatside > 0: stripKoef7 = rand(1,3)
+	if pcs_tattoos['shoulder'] > 0: stripKoef1 = rand(1,3)
+	if pcs_tattoos['back'] > 0: stripKoef2 = rand(1,3)
+	if pcs_tattoos['belly'] > 0: stripKoef3 = rand(1,3)
+	if pcs_tattoos['tramp'] > 0: stripKoef4 = rand(3,6)
+	if pcs_tattoos['leg'] > 0: stripKoef5 = rand(1,3)
+	if pcs_tattoos['arm'] > 0: stripKoef6 = rand(1,3)
+	if pcs_tattoos['side'] > 0: stripKoef7 = rand(1,3)
 	stripKoef = stripKoef1 + stripKoef2 + stripKoef3 + stripKoef4 + stripKoef5 + stripKoef6 + stripKoef7
 	if countmoney = 1:
 		countmoney = 0

locations/stwork3.qsrc

@@ -554,8 +554,12 @@ if $ARGS[0] = 'manager_bonus':
 end
 
 if $ARGS[0] = 'shift_end':
-	!! set time to 03:00
-	if hour < 3: hour = 3 and minut = 0
+	if hour < 3 or hour > 20:
+		temp_time_change = (3 - hour) * 60 - minut
+		if temp_time_change < 0: temp_time_change += 1440
+		minut += temp_time_change
+		killvar 'temp_time_change'
+	end
 	gs 'stat'
 	'As the night crawls into the early hours of the morning, the patrons slowly trickle out until the place is empty and the bar finally closes. Now is a good time to count your tips.'
 	act 'Count your tips': gt 'stwork3', 'tips'
@@ -661,10 +665,14 @@ if $ARGS[0] = 'manager_speak':
 
 					act 'Cum':
 						cla
-						!! magic/cum stuff
-						gs 'stat'
 						'You suddenly feel your orgasm building as you continue riding Ivanna. "That''s it, <<$pcs_nickname>>, cum for me. Let''s cum together!"'
+
 						$orgasmtext = 'You suddenly feel a wave of pleasure overwhelm you and cry out in orgasm as Ivanna keeps thrusting. Your pussy tightens around her cock and you soon feel it twitching and throbbing inside you as spurt upon spurt of thick, warm cum is unloaded deep inside you. Ivanna moans loudly in pleasure as she pumps what feels like an endless stream of cum into your pussy.'
+						$orgasm_or = 'yes'
+						gs 'arousal', 'vaginal', 5
+						gs 'arousal', 'end'
+						gs 'stat'
+
 						'When she finally finishes, she pulls out and flops back on the sofa, panting loudly as a trickle of cum dribbles out the tip of her cock. Your pussy suddenly feels very empty as a stream of thick cum oozes out of you.'
 						'When you catch your breath, you both get dressed before heading back out to the bar, where Ivanna slaps you on the ass. "You were a good fuck <<$pcs_nickname>>, but this is the one and only time. Fucking the same person more than once is boring."'
 						'You just nod and head out as she finishes closing the bar down for the night.'

locations/telefon.qsrc

@@ -331,7 +331,7 @@ if $ARGS[0] = 'IncomingCheck':
 	!! right now allow every 60 minutes
 	if telefIncCheck['NewTotalMinutes'] - telefon['LastIncCallCheck'] > 60 and (menu_off = 0 and phone_off = 0 or phone_on = 1):
 		telefon['LastIncCallCheck'] = telefIncCheck['NewTotalMinutes']
-		gs 'telefon','IncomingCallChooser'
+		gs 'telefon', 'IncomingCallChooser'
 	end
 
 	killvar 'telefIncCheck'
@@ -345,7 +345,7 @@ if $ARGS[0] = 'IncomingCallChooser':
 	:telefonIncLoop1
 	if telefon_i < arrsize('$contact'):
 		if $contactICode[telefon_i] ! "":
-			if dyneval('result = iif(<<$contactISche[telefon_i]>>, 1, 0)') = 1:
+			if dyneval('result = (<<$contactISche[telefon_i]>>)'):
 				telefon_j = arrsize('$telefIncCall')
 				if contactAnon[telefon_i] = 1:
 					$telefIncIcon[telefon_j] = "images/system/phone/decline.png"
@@ -390,7 +390,7 @@ if $ARGS[0] = 'IncomingCall':
 	$telefonIncC['Name'] = $ARGS[2]
 	$telefonIncC['Code'] = $ARGS[3]
 
-	PLAY 'sound/old_phone.mp3',30
+	PLAY 'sound/old_phone.mp3', 30
 	$telefon['body'] = '
 	<font size=6><<$telefonIncC["Name"]>> calling</font><br>
 	<img width="200" src="<<$telefonIncC["Icon"]>>"><br>