Skip to content

Commit

Permalink
* Izlude Arena updates.
Browse files Browse the repository at this point in the history 
- Added new Izlude coordinates and warps. (follow-up 400d0f0)
- Replaced many permanent global variables with mobcount() command.
- Removed some unnecessary global variables and OnInit labels.
- Commented all invalid label executions.
- Brought scripts up to standard with scripting conventions (label naming, spacing, etc.).
- Moved all warps from scripts into warps/ folder.

Signed-off-by: Euphy <euphy@rathena.org>
  • Loading branch information
@euphyy
euphyy committed Aug 8, 2013
1 parent 32b8d2e commit 13b281b
Show file tree
Hide file tree
Showing 12 changed files with 1,545 additions and 2,056 deletions.
46 changes: 18 additions & 28 deletions npc/other/arena/arena_aco.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.3
//= 1.4
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
Expand All @@ -13,11 +13,12 @@
//= 1.1 Corrected variable typos. (bugreport:4374) [L0ne_w0lf]
//= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
//= 1.3 Label standardization. [Euphy]
//= 1.4 Script updates, and removed two level restrictions. [Euphy]
//============================================================

arena_room,114,102,0 script onlyaco#arena 45,1,1,{
OnTouch:
if (BaseClass == Job_Acolyte && BaseLevel > 9) {
if (BaseClass == Job_Acolyte) {
warp "arena_room",135,129;
end;
}
Expand All @@ -27,13 +28,11 @@ OnTouch:
}
}

arena_room,135,126,0 warp byeaco#arena 1,1,arena_room,111,99

arena_room,136,138,3 script Acolyte Waiting Room 124,{
end;

OnInit:
waitingroom "Personal Force, Acolyte Class",50,"Acolyte Waiting Room::OnStartArena",1,1000,10,99;
waitingroom "Personal Force, Acolyte Class",50,"Acolyte Waiting Room::OnStartArena",1,1000,10;
enablewaitingroomevent;
end;

Expand All @@ -51,7 +50,7 @@ OnStart:
force_5-1,100,12,0 script arena#aco -1,5,5,{
OnTouch:
donpcevent "allkill#aco::OnEnable";
if (basejob == job_acolyte) {
if (BaseJob == Job_Acolyte) {
donpcevent "arena_aco1::OnStart";
}
else {
Expand Down Expand Up @@ -208,7 +207,7 @@ OnTimerOff:
OnFailClearStage:
mapwarp "force_5-1","prt_are_in",177,86;
donpcevent "Trocco#aco1::OnTimerOff";
donpcevent "arena_aco1::OnReset";
//donpcevent "arena_aco1::OnReset";
donpcevent "Acolyte Waiting Room::OnStart";
end;

Expand Down Expand Up @@ -636,7 +635,7 @@ OnTimerOff:
OnFailClearStage:
mapwarp "force_5-1","prt_are_in",177,86;
donpcevent "Trocco#aco2::OnTimerOff";
donpcevent "arena_aco2::OnReset";
//donpcevent "arena_aco2::OnReset";
donpcevent "Acolyte Waiting Room::OnStart";
end;

Expand Down Expand Up @@ -1029,7 +1028,7 @@ OnMyMobDead:
force_5-1,62,26,0 script force_08_01#aco 45,1,1,{
OnTouch:
warp "force_5-1",40,26;
if (basejob == job_acolyte) {
if (BaseJob == Job_Acolyte) {
enablenpc "force_01start#aco";
}
else {
Expand All @@ -1038,15 +1037,6 @@ OnTouch:
end;
}

force_5-1,25,44,0 warp force_01_02#aco 1,1,force_5-1,25,69
force_5-1,25,134,0 warp force_02_03#aco 1,1,force_5-1,25,159
force_5-1,44,174,0 warp force_03_04#aco 1,1,force_5-1,69,174
force_5-1,134,174,0 warp force_04_05#aco 1,1,force_5-1,159,174
force_5-1,174,155,0 warp force_05_06#aco 1,1,force_5-1,174,130
force_5-1,174,65,0 warp force_06_07#aco 1,1,force_5-1,174,40
force_5-1,155,26,0 warp force_07_08#aco 1,1,force_5-1,132,26
force_5-1,99,54,0 warp force_08_09#aco 1,1,force_5-1,99,82

force_5-1,99,124,0 script force_exit#aco 45,1,1,{
OnTouch:
donpcevent "Trocco#aco1::OnTimerOff";
Expand Down Expand Up @@ -1150,7 +1140,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
end;
}
else {
if (basejob == job_acolyte) {
if (BaseJob == Job_Acolyte) {
set .@acotop_t,$arn_acotop;
set .@acotop_n$,$arn_acotopn$;
}
Expand Down Expand Up @@ -1206,7 +1196,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
mes "name will now be listed";
mes "under the Time Force Battle";
mes "Arena - Acolyte Class Record!";
if (basejob == job_acolyte) {
if (BaseJob == Job_Acolyte) {
set $arn_acotop,.@record_timeaco;
set $arn_acotopn$, strcharinfo(0);
donpcevent "Vendigos::OnLineRec_aco";
Expand Down Expand Up @@ -1365,7 +1355,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
mes "the Time Force Battle Arena";
mes "Acolyte Class Records.";
mes "Congratulations~";
if (basejob == job_acolyte) {
if (BaseJob == Job_Acolyte) {
set $arn_acotop,.@record_timeaco;
set $arn_acotopn$, strcharinfo(0);
donpcevent "#Vendigos::OnLineRec_aco";
Expand Down Expand Up @@ -1449,7 +1439,7 @@ prt_are_in,25,31,3 script Staff#aco-2 67,{
donpcevent "allkill#aco::OnEnable";
donpcevent "Acolyte Waiting Room::OnStart";
}
close;
end;
}
}

Expand Down Expand Up @@ -1557,8 +1547,8 @@ OnEnable:
disablenpc "force_08_09#aco";
disablenpc "force_exit#aco";
disablenpc "arn_warp_aco"; //050630
donpcevent "Trocco#aco1::OnStop";
donpcevent "Trocco#aco2::OnStop";
donpcevent "Trocco#aco1::OnTimerOff";
donpcevent "Trocco#aco2::OnTimerOff";
donpcevent "#arn_timer_aco::OnStop";
end;
}
Expand All @@ -1579,7 +1569,7 @@ arena_room,94,82,7 script Arena Record Staff#aco 79,{
mes "Class Arena Challenges?";
mes "Please choose from the menu.";
next;
switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ 99")) {
switch(select("Acolyte Mode:Priest - Level 70 or lower:Priest - Level 80 or lower:Priest - Level 90 or lower:Priest - Level 91 ~ "+(checkre(0)?"160":"99"))) {
case 1:
set .@acotop_t,$arn_acotop;
set .@acotop_n$,$arn_acotopn$;
Expand Down Expand Up @@ -1655,7 +1645,7 @@ OnLineRec_pri80:
end;

OnLineRec_pri90:
mapannounce "arena_room","Vendigos: "+$arn_pritopn90$+" has made a new record in the Arena Time Force Battle - Priest: Level 91~99. Congratulations!",bc_map,"0xFFFF00";
mapannounce "arena_room","Vendigos: "+$arn_pritopn90$+" has made a new record in the Arena Time Force Battle - Priest: Level 91~"+(checkre(0)?"160":"99")+". Congratulations!",bc_map,"0xFFFF00";
end;
}

Expand Down Expand Up @@ -1702,7 +1692,7 @@ arena_room,140,136,3 script Guide Alias 729,{
mes "entire stage, you will be";
mes "warped to the ^3131DDFinale Waiting";
mes "Room^000000 where you'll be rewarded";
mes "with Arena Points. But you must^FFFFFFaaaa^000000 get your points within 1 minute.";
mes "with Arena Points. But you must get your points within 1 minute.";
next;
mes "[Alias]";
mes "Once you're automatically";
Expand Down Expand Up @@ -1733,7 +1723,7 @@ arena_room,195,5,3 script log-on-aco#arena 802,{
mes "particular mode in the";
mes "Arena Acolyte Class Mode.^000000";
next;
switch(select("Cancel:Acolyte:~level 70:~level 80:~level 90:~level 99")) {
switch(select("Cancel:Acolyte:~level 70:~level 80:~level 90:~level "+(checkre(0)?"160":"99"))) {
case 1:
mes "^3355FFCommand has";
mes "been canceled.^000000";
Expand Down
Loading

0 comments on commit 13b281b

Please sign in to comment.