Răsfoiți Sursa

[fixed] $npcID and $telsob not properly set when going to a date through a phonecall. Reported by Jeep91

anjuna krokus 1 lună în urmă
părinte
comite
a768a05e40
2 a modificat fișierele cu 29 adăugiri și 6 ștergeri
  1. 23 0
      locations/lover_call.qsrc
  2. 6 6
      locations/lover_meet.qsrc

+ 23 - 0
locations/lover_call.qsrc

@@ -201,6 +201,9 @@ if $ARGS[0] = 'callingTheLover_f':
 						gs 'clothing', 'wear_last_worn'
 						gs 'underwear', 'wear'
 					end
+					gs 'npcStat', $Call4Date["NPC"]
+					$telsob = $npcdesc
+					killvar '$Call4Date'
 					gt 'parksvid'
 				end
 			else
@@ -220,6 +223,9 @@ if $ARGS[0] = 'callingTheLover_f':
 					gs 'clothing', 'wear_last_worn'
 					gs 'underwear', 'wear'
 				end
+				gs 'npcStat', $Call4Date["NPC"]
+				$telsob = $npcdesc
+				killvar '$Call4Date'
 				gt 'kinosvid'
 			end
 		else
@@ -240,6 +246,9 @@ if $ARGS[0] = 'callingTheLover_f':
 						gs 'clothing', 'wear_last_worn'
 						gs 'underwear', 'wear'
 					end
+					gs 'npcStat', $Call4Date["NPC"]
+					$telsob = $npcdesc
+					killvar '$Call4Date'
 					gt 'billsvid'
 				end
 			else
@@ -260,6 +269,9 @@ if $ARGS[0] = 'callingTheLover_f':
 					gs 'clothing', 'wear_last_worn'
 					gs 'underwear', 'wear'
 				end
+				gs 'npcStat', $Call4Date["NPC"]
+				$telsob = $npcdesc
+				killvar '$Call4Date'
 				gt 'kafesvid'
 			end
 		else
@@ -279,6 +291,9 @@ if $ARGS[0] = 'callingTheLover_f':
 					gs 'clothing','wear_last_worn'
 					gs 'underwear','wear'
 				end
+				gs 'npcStat', $Call4Date["NPC"]
+				$telsob = $npcdesc
+				killvar '$Call4Date'
 				gt 'kazinosvid'
 			end
 		else
@@ -316,6 +331,8 @@ if $ARGS[0] = 'callingTheLover_m':
 						gs 'underwear','wear'
 					end
 					gs 'npcStat', $Call4Date["NPC"]
+					$telsob = $npcdesc
+					killvar '$Call4Date'
 					gt 'svidboy', 'parksvid'
 				end
 			else
@@ -337,6 +354,8 @@ if $ARGS[0] = 'callingTheLover_m':
 					gs 'underwear','wear'
 				end
 				gs 'npcStat', $Call4Date["NPC"]
+				$telsob = $npcdesc
+				killvar '$Call4Date'
 				gt 'svidboy', 'kinosvid'
 			end
 		else
@@ -358,6 +377,8 @@ if $ARGS[0] = 'callingTheLover_m':
 						gs 'underwear','wear'
 					end
 					gs 'npcStat', $Call4Date["NPC"]
+					$telsob = $npcdesc
+					killvar '$Call4Date'
 					gt 'svidboy', 'billsvid'
 				end
 
@@ -380,6 +401,8 @@ if $ARGS[0] = 'callingTheLover_m':
 					gs 'underwear','wear'
 				end
 				gs 'npcStat', $Call4Date["NPC"]
+				$telsob = $npcdesc
+				killvar '$Call4Date'
 				gt 'svidboy', 'kafesvid'
 			end
 		else

+ 6 - 6
locations/lover_meet.qsrc

@@ -1004,7 +1004,7 @@ if $ARGS[0] = 'go_park_date':
 	if npc_gender[$npcID] = 0:
 		gt 'parkM', 'start'
 	else
-		$telsob = '<<$npcdesc>>'
+		$telsob = $npcdesc
 		gt 'parksvid'
 	end
 end
@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'go_movie_date':
 	if npc_gender[$npcID] = 0:
 		gt 'kinoM', 'start'
 	else
-		$telsob = '<<$npcdesc>>'
+		$telsob = $npcdesc
 		gt 'kinosvid'
 	end
 end
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'go_cafe_date':
 	if npc_gender[$npcID] = 0:
 		gt 'kafeM', 'start'
 	else
-		$telsob = '<<$npcdesc>>'
+		$telsob = $npcdesc
 		gt 'kafesvid'
 	end
 end
@@ -1034,20 +1034,20 @@ if $ARGS[0] = 'go_restaurant_date':
 	if npc_gender[$npcID] = 0:
 		gt 'restoranM', 'start'
 	else
-		$telsob = '<<$npcdesc>>'
+		$telsob = $npcdesc
 		gt 'kafesvid'
 	end
 end
 
 if $ARGS[0] = 'go_casino_date':
 	gs 'lover_meet', 'cleanup'
-	$telsob = '<<$npcdesc>>'
+	$telsob = $npcdesc
 	gt 'kazinosvid'
 end
 
 if $ARGS[0] = 'go_pool_hall_date':
 	gs 'lover_meet', 'cleanup'
-	$telsob = '<<$npcdesc>>'
+	$telsob = $npcdesc
 	gt 'billsvid'
 end