Browse Source

[fixed] Phone can only ring if the menu is on so it can't interupt events

Kevin_Smarts 2 years ago
parent
commit
384fea00d1
2 changed files with 68 additions and 65 deletions
  1. 1 0
      locations/city_nightclub.qsrc
  2. 67 65
      locations/din_bad.qsrc

+ 1 - 0
locations/city_nightclub.qsrc

@@ -172,6 +172,7 @@ if $ARGS[0] = 'inside':
 
 	if (hour < 1 or hour >= 18) and clubwork = 1:
 		act 'Find Erik for work':
+			menu_off = 1
 			*clr & cla
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/club11.jpg"></center>'

+ 67 - 65
locations/din_bad.qsrc

@@ -1,81 +1,83 @@
 # din_bad
 !2021/05/02
 $mobile_check = {
-	gs 'stat'
-	if vladimirday ! daystart and hour >= 15 and hour <= 17:
-		if vladimirQW = 20:
-			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
-			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-		elseif vladimirQW = 25 and week = 6:
+	if menu_off = 0:
+		gs 'stat'
+		if vladimirday ! daystart and hour >= 15 and hour <= 17:
+			if vladimirQW = 20:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''2''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			elseif vladimirQW = 25 and week = 6:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			elseif vladimirQW = 35 and week = 6:
+				'<b><font color="red">Your phone is ringing</font></b>'
+				$caller = 'Vladimir'
+				$callerid = 'images/characters/city/vladimir/001.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			end
+		end
+
+		if leonidSlaveDay = daystart and hour >= 6 and hour <= 10 and leonidVisit = 0:
 			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
+			$caller = 'Leonid Vostov'
+			$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''3''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-		elseif vladimirQW = 35 and week = 6:
+			pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+		end
+
+		if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
 			'<b><font color="red">Your phone is ringing</font></b>'
-			$caller = 'Vladimir'
-			$callerid = 'images/characters/city/vladimir/001.jpg'
+			$caller = 'Margaret'
+			$callerid = ''
 			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''qwloc'',''4''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:vladimirday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			pl''
+			'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:qwdogiventday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 		end
-	end
 
-	if leonidSlaveDay = daystart and hour >= 6 and hour <= 10 and leonidVisit = 0:
-		'<b><font color="red">Your phone is ringing</font></b>'
-		$caller = 'Leonid Vostov'
-		$callerid = 'images/characters/pavlovsk/resident/leonid/leonidphone.jpg'
-		gs 'telefon','phone_ring'
-		pl'<center><a href="exec:gt ''leonid'', ''call''"><img src="images/system/phone/call_accept.png"></a>		<a href="exec:leonidSlaveDay = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-	end
-
-	if QWdogreiqTimer = 0 and QWdogReiq = 2 and week = 7 and qwdogiventday ! daystart and hour >= 12:
-		'<b><font color="red">Your phone is ringing</font></b>'
-		$caller = 'Margaret'
-		$callerid = ''
-		gs 'telefon','phone_ring'
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		pl''
-		'<center><a href="exec:gt ''qwlocdog''"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:qwdogiventday = daystart & gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
-	end
-
-	!! iterating all lovers
-	lover_number = 0
-	:loverloop
-	if pcs_lovers[lover_number] = 1 and loverday[lover_number] ! daystart and hour > 5 and hour < 20 and ringA = 0 and rand(1,7) > 5:
-		if pcs_apprnc < vneshlover[lover_number]:
-			loverrelation[lover_number] -= 1
-			if loverrelation[lover_number] = 0:
-				'<b><font color="red">Your lover hasn''t been calling you lately, they''ve probably grown tired of you.</font></b>'
+		!! iterating all lovers
+		lover_number = 0
+		:loverloop
+		if pcs_lovers[lover_number] = 1 and loverday[lover_number] ! daystart and hour > 5 and hour < 20 and ringA = 0 and rand(1,7) > 5:
+			if pcs_apprnc < vneshlover[lover_number]:
+				loverrelation[lover_number] -= 1
+				if loverrelation[lover_number] = 0:
+					'<b><font color="red">Your lover hasn''t been calling you lately, they''ve probably grown tired of you.</font></b>'
+				else
+					'Your lover <<$loverdesc[lover_number]>> has not called you.'
+				end
 			else
-				'Your lover <<$loverdesc[lover_number]>> has not called you.'
+				ring = 1
+				ringA = 1
+				'<b><font color="red">Your phone is ringing</font></b>'
+				PLAY 'sound/old_phone.mp3',30
+				$caller = '<<$loverdesc[lover_number]>>'
+				$callerid = 'images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg'
+				gs 'telefon','phone_ring'
+				pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 			end
-		else
-			ring = 1
-			ringA = 1
-			'<b><font color="red">Your phone is ringing</font></b>'
-			PLAY 'sound/old_phone.mp3',30
-			$caller = '<<$loverdesc[lover_number]>>'
-			$callerid = 'images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg'
-			gs 'telefon','phone_ring'
-			pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 		end
-	end
-	lover_number += 1
-	if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
+		lover_number += 1
+		if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
 
-	killvar 'lover_number'
+		killvar 'lover_number'
+	end
 }
 
 $d_salf = {