浏览代码

[fixed] incoming calls not showing up on the additional desc window

anjuna krokus 2 月之前
父节点
当前提交
6c13437543
共有 3 个文件被更改,包括 13 次插入11 次删除
  1. 1 1
      locations/lover_call.qsrc
  2. 9 7
      locations/stat.qsrc
  3. 3 3
      locations/telefon.qsrc

+ 1 - 1
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

+ 9 - 7
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,13 @@ if hypnoSchedule = 1:
 end
 
 
+! Determine Incoming Telephone Calls and SMS
+if prevtotmin ! totminut:
+	gs 'telefon', 'IncomingCheck', prevtotmin, totminut
+	gs 'telefon', 'IncomingSMSCheck'
+end
+
+
+
+
 --- stat ---------------------------------

+ 3 - 3
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>