Ver código fonte

Updated instance_warpall script side

Follow-up https://github.com/rathena/rathena/commit/21a5854c167399afe2c0d0c93fae474db88b3f88 (#4298)

Thanks to @Indigo000
Atemo 5 anos atrás
pai
commit
b7f38cf85e

+ 16 - 16
npc/custom/official/GeffenMagicTournament.txt

@@ -2531,7 +2531,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "Yahoo!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -2588,7 +2588,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "Time to get ready for my next match.";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -2643,7 +2643,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "Hu hu hu hu hu...";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 }
 
@@ -2695,7 +2695,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "Never show your face in Geffen again!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -2750,7 +2750,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "You should go home~ Bye~!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 }
 
@@ -2807,7 +2807,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "No matter, I'll just prepare for the next match.";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 }
 
@@ -2866,7 +2866,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "I'm ready for the next match!!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 }
 
@@ -2926,7 +2926,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "Ha ha ha ha ha~!!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 }
 
@@ -2980,7 +2980,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "Now, I shall prepare for my next match~!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -3033,7 +3033,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "Wahahaha~!!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -3089,7 +3089,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "I'm so giddy to find out who I'm up against next!~";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -3146,7 +3146,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "I need to get ready for my next match now~";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -3202,7 +3202,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "The real game is battle!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -3270,7 +3270,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "I have just one more match to win!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -3337,7 +3337,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "I will defeat her and win this tournament!";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }
@@ -3437,7 +3437,7 @@ OnVictory:
 	sleep 3000;
 	npctalk "I have to go... My friends are waiting for me.";
 	sleep 5000;
-	instance_warpall instance_mapname("1@gef"),120,61;
+	instance_warpall instance_mapname("1@gef"),120,61, instance_id();
 	end;
 	
 }

+ 5 - 5
npc/instances/NydhoggsNest.txt

@@ -1750,7 +1750,7 @@ OnTimer1830000:
 OnTimer1850000:
 	donpcevent instance_npcname("ins_nyd_1f_timer")+"::OnDisable";
 	donpcevent instance_npcname("nyd_call_mon_1")+"::OnDisable";
-	instance_warpall "mid_camp",310,150;
+	instance_warpall "mid_camp",310,150, instance_id();
 	stopnpctimer;
 	end;
 }
@@ -1888,7 +1888,7 @@ OnWarpColor:
 		donpcevent instance_npcname("nyd_2f_yellow")+"::OnDisable";
 		donpcevent instance_npcname("nyd_2f_green")+"::OnDisable";
 		donpcevent instance_npcname("nyd_2f_red")+"::OnEnable";
-		instance_warpall .@map$,115,278;
+		instance_warpall .@map$,115,278, instance_id();
 		end;
 	case 2:
 		mapannounce .@map$, "Nidhoggur's Shadow : I will freeze every last drop of your blood.",bc_map,"0xFFFF00";
@@ -1896,7 +1896,7 @@ OnWarpColor:
 		donpcevent instance_npcname("nyd_2f_yellow")+"::OnDisable";
 		donpcevent instance_npcname("nyd_2f_green")+"::OnDisable";
 		donpcevent instance_npcname("nyd_2f_white")+"::OnEnable";
-		instance_warpall .@map$,115,373;
+		instance_warpall .@map$,115,373, instance_id();
 		end;
 	case 3:
 		mapannounce .@map$, "Nidhoggur's Shadow : Sleep for eternity in an empty illusion.",bc_map,"0xFFFF00";
@@ -1904,7 +1904,7 @@ OnWarpColor:
 		donpcevent instance_npcname("nyd_2f_white")+"::OnDisable";
 		donpcevent instance_npcname("nyd_2f_green")+"::OnDisable";
 		donpcevent instance_npcname("nyd_2f_yellow")+"::OnEnable";
-		instance_warpall .@map$,284,278;
+		instance_warpall .@map$,284,278, instance_id();
 		end;
 	case 4:
 		mapannounce .@map$, "Nidhoggur's Shadow : I'll let you enjoy the pain of dying slowly.",bc_map,"0xFFFF00";
@@ -1912,7 +1912,7 @@ OnWarpColor:
 		donpcevent instance_npcname("nyd_2f_white")+"::OnDisable";
 		donpcevent instance_npcname("nyd_2f_yellow")+"::OnDisable";
 		donpcevent instance_npcname("nyd_2f_green")+"::OnEnable";
-		instance_warpall .@map$,284,374;
+		instance_warpall .@map$,284,374, instance_id();
 		end;
 	}
 	end;

+ 1 - 1
npc/instances/SealedShrine.txt

@@ -965,7 +965,7 @@ OnTimer3100000:
 	end;
 
 OnTimer3500000:
-	instance_warpall "monk_test",310,150;
+	instance_warpall "monk_test",310,150, instance_id();
 	stopnpctimer;
 	end;
 }

+ 1 - 1
npc/re/instances/OctopusCave.txt

@@ -226,7 +226,7 @@ OnMyMobDead:
 		donpcevent instance_npcname("oct_boss_con")+"::OnEnable";
 		mapannounce .@map$,"Hey you!! I'll personally take care of you all! Let's bring it on!",bc_map,"0x00ff99";
 		enablenpc instance_npcname("oct_boss_warp");
-		instance_warpall .@map$,199,99;
+		instance_warpall .@map$,199,99, instance_id();
 		end;
 	}
 	mapannounce .@map$,"Arrgg!! That hurts!!! I need another strategy...",bc_map,"0x00ff99";