summaryrefslogtreecommitdiff
path: root/npc/other/arena/arena_lvl70.txt
diff options
context:
space:
mode:
authorshennetsind <shennetsind@users.noreply.github.com>2013-10-30 14:48:26 -0700
committershennetsind <shennetsind@users.noreply.github.com>2013-10-30 14:48:26 -0700
commit566529c819bcf9aeb1bd3a4a691c443c2b88d076 (patch)
tree5d3448afe67329cc9d650732425f0152ef242e7b /npc/other/arena/arena_lvl70.txt
parent8039bd169886a4b0583cd1a794fcf61c79626e86 (diff)
parente9b4aec5eae2bc3454636a71953dcb1e1abb5ee7 (diff)
downloadhercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.gz
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.bz2
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.xz
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.zip
Merge pull request #210 from kisuka/npc-constants
NPC Constants
Diffstat (limited to 'npc/other/arena/arena_lvl70.txt')
-rw-r--r--npc/other/arena/arena_lvl70.txt28
1 files changed, 14 insertions, 14 deletions
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index cef72fc62..e50113e74 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -13,7 +13,7 @@
//= 1.3 Script updates. [Euphy]
//============================================================
-arena_room,52,42,7 script Lv70 Waiting Room 124,{
+arena_room,52,42,7 script Lv70 Waiting Room 4_F_TELEPORTER,{
end;
OnInit:
@@ -32,7 +32,7 @@ OnStart:
end;
}
-force_3-1,99,20,4 script Cadillac#arena 124,{
+force_3-1,99,20,4 script Cadillac#arena 4_F_TELEPORTER,{
end;
OnStart:
@@ -307,56 +307,56 @@ OnReset_All:
end;
}
-force_3-1,62,26,1 script force_08_01#70 45,1,1,{
+force_3-1,62,26,1 script force_08_01#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On01_Start";
warp "force_3-1",40,26;
end;
}
-force_3-1,25,44,1 script force_01_02#70 45,1,1,{
+force_3-1,25,44,1 script force_01_02#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On02_Start";
warp "force_3-1",25,69;
end;
}
-force_3-1,25,134,1 script force_02_03#70 45,1,1,{
+force_3-1,25,134,1 script force_02_03#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On03_Start";
warp "force_3-1",25,159;
end;
}
-force_3-1,44,174,1 script force_03_04#70 45,1,1,{
+force_3-1,44,174,1 script force_03_04#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On04_Start";
warp "force_3-1",69,174;
end;
}
-force_3-1,134,174,1 script force_04_05#70 45,1,1,{
+force_3-1,134,174,1 script force_04_05#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On05_Start";
warp "force_3-1",159,174;
end;
}
-force_3-1,174,155,1 script force_05_06#70 45,1,1,{
+force_3-1,174,155,1 script force_05_06#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On06_Start";
warp "force_3-1",174,130;
end;
}
-force_3-1,174,65,1 script force_06_07#70 45,1,1,{
+force_3-1,174,65,1 script force_06_07#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On07_Start";
warp "force_3-1",174,40;
end;
}
-force_3-1,155,26,1 script force_07_08#70 45,1,1,{
+force_3-1,155,26,1 script force_07_08#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On08_Start";
warp "force_3-1",132,26;
@@ -364,14 +364,14 @@ OnTouch:
end;
}
-force_3-1,99,54,1 script force_08_09#70 45,1,1,{
+force_3-1,99,54,1 script force_08_09#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On09_Start";
warp "force_3-1",99,82;
end;
}
-force_3-1,99,124,1 script force_exit#70 45,1,1,{
+force_3-1,99,124,1 script force_exit#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::OnTimerOff";
donpcevent "#arn_timer_70::OnEnable";
@@ -755,7 +755,7 @@ OnMyMobDead:
end;
}
-prt_are_in,129,83,3 script Staff#70-1 67,{
+prt_are_in,129,83,3 script Staff#70-1 1_F_02,{
mes "[Staff]";
mes "You did a good job.";
mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -776,7 +776,7 @@ prt_are_in,129,83,3 script Staff#70-1 67,{
end;
}
-prt_are_in,25,84,3 script Staff#70-2 67,{
+prt_are_in,25,84,3 script Staff#70-2 1_F_02,{
if($arena_min70end < $arena_min70st) {
if($arena_sec70end < $arena_sec70st) {
set @record_min70,60 - $arena_min70st + $arena_min70end -1;