- Fixed wrong areawarp coordinations in all arena rooms. bugreport:3494

- Added check if the player invoking one of the Izlude Arena NPC's in sec_pri02 is actually a GM. bugreport:3494
- Some other random stuff in arena files. bugreport:3494
- Follow up r15278 , all EF_WIND effects should now work properly. bugreport:5369

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16152 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 17 insertions, 11 deletions

diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index cb29ee807..73d15ef4c 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -1045,7 +1045,7 @@ Onstop:
 prt_are_in,1,1,1	script	arn_warp_50	-1,{
 
 Onout:
-	areawarp "prt_are_in",22,183,20,20,"arena_room",100,75;
+	areawarp "prt_are_in",14,194,29,180,"arena_room",100,75;
 	end;
 }
 
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index fa396e88b..ba7a580e8 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -1040,7 +1040,7 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
- 	donpcevent "cast#60::timeover2";
+ 	donpcevent "cast#60::Ontimeover2";
 	donpcevent "arn_warp_60::Onout";
 	donpcevent "#arn_timer_60::Onstop";
 	donpcevent "alloff#60::Onon";
@@ -1055,7 +1055,7 @@ Onstop:
 prt_are_in,1,1,1	script	arn_warp_60	-1,{
 
 Onout:
-	areawarp "prt_are_in",23,131,20,20,"arena_room",100,75;
+	areawarp "prt_are_in",14,143,29,128,"arena_room",100,75;
 	end;
 }
 
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index 87c89ce4a..66412693d 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -1022,7 +1022,7 @@ Onstop:
 prt_are_in,1,1,1	script	arn_warp_70	-1,{
 
 Onout:
-	areawarp "prt_are_in",22,183,20,20,"arena_room",100,75;
+	areawarp "prt_are_in",14,91,29,76,"arena_room",100,75;
 	end;
 }
 
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index f91dc9eb9..ae7d429be 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -995,7 +995,7 @@ Onstop:
 prt_are_in,1,1,1	script	arn_warp_80	-1,{
 
 Onout:
-	areawarp "prt_are_in",22,183,20,20,"arena_room",100,75;
+	areawarp "prt_are_in",66,195,81,180,"arena_room",100,75;
 	end;
 }
 
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index ec9d12f91..13e56508c 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -1369,7 +1369,7 @@ Onstop:
 prt_are_in,1,1,1	script	arn_warp_pt	-1,{
 
 Onout:
-	areawarp "prt_are_in",73,131,20,20,"arena_room",100,75;
+	areawarp "prt_are_in",66,143,81,128,"arena_room",100,75;
 	end;
 }
 
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index 9653f4912..3cfa7ba64 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -408,6 +408,8 @@ arena_room,158,82,1	script	Helper Lonik	828,{
 
 sec_in02,72,180,3	script	Arena Manager#arena	802,{
 
+	if (!getgmlevel()) end;
+
 	input .@arena;
 	if(!.@arena)
 	{
@@ -497,7 +499,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 1:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please write within 400 letters.";
+								mes "If not, please enter a value for minutes first and then seconds..";
 								next;
 								input .@arenamin;
 								set $top_50min,.@arenamin;
@@ -509,7 +511,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 2:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please write within 400 letters.";
+								mes "If not, please enter a value for minutes first and then seconds..";
 								next;
 								input .@arenamin;
 								set $top_60min,.@arenamin;
@@ -521,7 +523,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 3:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please write within 400 letters.";
+								mes "If not, please enter a value for minutes first and then seconds..";
 								next;
 								input .@arenamin;
 								set $top_70min,.@arenamin;
@@ -533,7 +535,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 4:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please write within 400 letters.";
+								mes "If not, please enter a value for minutes first and then seconds..";
 								next;
 								input .@arenamin;
 								set $top_80min,.@arenamin;
@@ -545,7 +547,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 							case 5:
 								mes "[Arena Manager]";
 								mes "Please enter 0 to cancel.";
-								mes "If not, please write within 400 letters.";
+								mes "If not, please enter a value for minutes first and then seconds..";
 								next;
 								input .@arenamin;
 								set $top_ptmin,.@arenamin;
@@ -564,6 +566,8 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 
 sec_in02,79,171,3	script	Reward Manager#arena	802,{
 
+	if (!getgmlevel()) end;
+
 	input .@arena;
 	if(!.@arena)
 	{
@@ -1027,6 +1031,8 @@ OnTimer62000:
 
 sec_in02,72,171,3	script	Picture Manager#arena	802,{
 
+	if (!getgmlevel()) end;
+
 	input .@arena;
 	if(!.@arena)
 	{