summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/etc/rpsroulette.txt376
-rw-r--r--npc/custom/events/disguise.txt2
-rw-r--r--npc/custom/healer.txt2
-rw-r--r--npc/custom/itembind.txt4
-rw-r--r--npc/custom/jobmaster.txt4
-rw-r--r--npc/custom/warper.txt309
-rw-r--r--npc/custom/woe_controller.txt4
7 files changed, 283 insertions, 418 deletions
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index 22123580d..e0f8b8952 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -4,6 +4,8 @@
//= acky
//===== Current Version: =====================================
//= 1.2
+//===== Compatible With: =====================================
+//= Hercules SVN
//===== Description: =========================================
//= Plays a hybrid Russian Roulette Rock Scissors Paper game.
//===== Additional Comments: =================================
@@ -12,273 +14,113 @@
//============================================================
cmd_in02,182,126,2 script Crazy Boris 4_M_03,{
- mes "Crazy Boris";
- set @counter,1;
mes "Hey you! Up for Rock Scissors Roulette?";
next;
- menu "Let me play.",PLAY,"Explain the rules.",L_Rules,"Leave",LEAVE;
- SAME:
- mes "Draw! Again!";
- next;
- goto PLAY;
-
-WIN:
- mes "Damnit, You Win!";
- emotion 19;
- next;
- goto OPPPULL;
-
-LOSE:
- emotion 18;
- mes "Boorah! You Lose!";
- next;
- goto YOUPULL;
-
-PLAY:
- mes "Rock... Paper...";
- set @opp,rand (1,3);
- menu "^0000FFROCK!",L_Rock,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
-
-L_Rock:
- if (@lastchoice == 1) set @opp,rand (1,3);
- if (@opp == 1) emotion 11;
- if (@opp == 2) emotion 10;
- if (@opp == 3) emotion 12;
- set @lastchoice,1;
- if (@opp == 1) goto SAME;
- if (@opp == 2) goto WIN;
- if (@opp == 3) goto LOSE;
-
-SCISSORS:
- if (@lastchoice == 2) set @opp,rand (1,2);
- if (@opp == 1) emotion 11;
- if (@opp == 2) emotion 10;
- if (@opp == 3) emotion 12;
- set @lastchoice,2;
- if (@opp == 1) goto LOSE;
- if (@opp == 2) goto SAME;
- if (@opp == 3) goto WIN;
-
-PAPER:
- if (@lastchoice == 3) set @opp,rand (2,3);
- if (@opp == 1) emotion 11;
- if (@opp == 2) emotion 10;
- if (@opp == 3) emotion 12;
- set @lastchoice,3;
- if (@opp == 1) goto WIN;
- if (@opp == 2) goto LOSE;
- if (@opp == 3) goto SAME;
-
-YOUPULL:
- if (@counter == 1) goto ONE;
- if (@counter == 2) goto TWO;
- if (@counter == 3) goto THREE;
- if (@counter == 4) goto FOUR;
- if (@counter == 5) goto FIVE;
- if (@counter == 6) goto SIX;
-
-OPPPULL:
- if (@counter == 1) goto ONEa;
- if (@counter == 2) goto TWOa;
- if (@counter == 3) goto THREEa;
- if (@counter == 4) goto FOURa;
- if (@counter == 5) goto FIVEa;
- if (@counter == 6) goto SIXa;
-
-ONE:
- set @counter,2;
- mes "1 of 6";
- set @pull,rand (1,6);
- next;
- if (@pull == 1) goto DIE;
- if (@pull != 1) goto SAFE;
-
-TWO:
- set @counter,3;
- mes "2 of 6";
- set @pull,rand (1,5);
- next;
- if (@pull == 1) goto DIE;
- if (@pull != 1) goto SAFE;
-
-THREE:
- set @counter,4;
- mes "3 of 6";
- set @pull,rand (1,4);
- next;
- if (@pull == 1) goto DIE;
- if (@pull != 1) goto SAFE;
-
-FOUR:
- set @counter,5;
- mes "4 of 6";
- set @pull,rand (1,3);
- next;
- if (@pull == 1) goto DIE;
- if (@pull != 1) goto SAFE;
-
-FIVE:
- set @counter,6;
- mes "5 of 6";
- set @pull,rand (1,2);
- if (@pull == 1) set @pull,rand (1,2);
- next;
- if (@pull == 1) goto DIE;
- if (@pull != 1) goto SAFE;
-
-SIX:
- mes "6 of 6";
- mes "Say your prayers";
- set @pull,1;
- next;
- if (@pull == 1) goto DIE;
- if (@pull != 1) goto SAFE;
-
-ONEa:
- set @counter,2;
- mes "1 of 6";
- set @pull,rand (1,6);
- next;
- if (@pull == 1) goto KILL;
- if (@pull != 1) goto SAFE;
-
-TWOa:
- set @counter,3;
- mes "2 of 6";
- set @pull,rand (1,5);
- next;
- if (@pull == 1) goto KILL;
- if (@pull != 1) goto SAFE;
-
-THREEa:
- set @counter,4;
- mes "3 of 6";
- set @pull,rand (1,4);
- next;
- if (@pull == 1) goto KILL;
- if (@pull != 1) goto SAFE;
-
-FOURa:
- set @counter,5;
- mes "4 of 6";
- set @pull,rand (1,3);
- next;
- if (@pull == 1) goto KILL;
- if (@pull != 1) goto SAFE;
-
-FIVEa:
- set @counter,6;
- mes "5 of 6";
- set @pull,rand (1,2);
- next;
- if (@pull == 1) goto KILL;
- if (@pull != 1) goto SAFE;
-
-SIXa:
- mes "6 of 6";
- mes "Say your prayers";
- set @pull,1;
- next;
- if (@pull == 1) goto KILL;
- if (@pull != 1) goto SAFE;
-
-SAFE:
- emotion 32;
- mes "*^0000FFClick^000000* whew...";
- goto PLAY;
-
-DIE:
- specialeffect2 183;
- emotion 29;
- percentheal -100,-100;
- mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
- mes "You're dead!";
- close;
-
-KILL:
- specialeffect 183;
- emotion 23;
- mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
- mes "OWWW @#$%^!! THAT HURT LIKE HELL!!";
- next;
- goto PRIZE;
-
-L_Rules:
- mes "Ok here are the rules:";
- mes "I have with me a ^FF00006^000000 chamber pistol with ^FF00001^000000 round. First we play ^FF0000Scissors ^00FF00Paper ^0000FFRock^000000. The loser pulls the trigger. The winner is whoever comes out best.";
- mes "Beat me to win a prize.";
- menu "Let me play.",CONT,"No thanks.",LEAVE;
-
-CONT:
- mes "Ok here we go...";
- next;
- goto PLAY;
-
-PRIZE:
- mes "Congratulations! You have won...";
- set @prize,rand (1,10);
- if (@prize == 1) goto P1;
- if (@prize == 2) goto P2;
- if (@prize == 3) goto P3;
- if (@prize == 4) goto P4;
- if (@prize == 5) goto P5;
- if (@prize == 6) goto P6;
- if (@prize == 7) goto P7;
- if (@prize == 8) goto P8;
- if (@prize == 9) goto P9;
- if (@prize == 10) goto P10;
-
-P1:
- mes "10x Oridicon!";
- getitem 984,10;
- close;
-
-P2:
- mes "10x Elunium!";
- getitem 985,10;
- close;
-
-P3:
- mes "100x Fly Wings!";
- getitem 601,100;
- close;
-
-P4:
- mes "8x Old Blue Box!";
- getitem 603,8;
- close;
-
-P5:
- mes "4x Old Violet Box!";
- getitem 617,4;
- close;
-
-P6:
- mes "1x Old Card Album!";
- getitem 616,1;
- close;
-
-P7:
- mes "10x Dead Branch!";
- getitem 604,10;
- close;
-
-P8:
- mes "3x Gold!";
- getitem 969,3;
- close;
-
-P9:
- mes "10x Elunium!";
- getitem 985,10;
- close;
-
-P10:
- mes "20x Blue Potion!";
- getitem 505,20;
- close;
-
-LEAVE:
- mes "Pansy.";
- close;
+ switch (select("Let me play.","Explain the rules.","Leave")) {
+ case 1:
+ break;
+ case 2:
+ mes "Ok here are the rules:";
+ mes "I have with me a ^FF00006^000000 chamber pistol with ^FF00001^000000 round. First we play ^FF0000Scissors ^00FF00Paper ^0000FFRock^000000. The loser pulls the trigger. The winner is whoever comes out best.";
+ mes "Beat me to win a prize.";
+ next;
+ if (select("Let me play.","No thanks.") == 1) {
+ mes "Ok here we go...";
+ break;
+ }
+ // else fall through
+ case 3:
+ mes "Pansy.";
+ close;
+ }
+ .@counter = 1;
+ while(true) {
+ mes "Rock... Paper...";
+
+ .@choice = select("^0000FFROCK!","^0000FFSCISSORS!","^0000FFPAPER!");
+ if (.@lastchoice == .@choice) {
+ if (.@lastchoice == 1)
+ .@opponent = rand(1,3);
+ else if (.@lastchoice == 2)
+ .@opponent = rand(1,2);
+ else
+ .@opponent = rand(2,3);
+ } else {
+ .@opponent = rand(1,3);
+ }
+ .@lastchoice = .@choice;
+
+ if (.@opponent == 1)
+ emotion e_rock;
+ else if (.@opponent == 2)
+ emotion e_scissors;
+ else
+ emotion e_paper;
+
+ if (.@opponent == .@choice) {
+ // SAME
+ mes "Draw! Again!";
+ continue;
+ }
+
+ if ((.@choice == 1 && .@opponent == 3)
+ || (.@choice == 2 && .@opponent == 1)
+ || (.@choice == 3 && .@opponent == 2)
+ ) {
+ // LOSE
+ emotion e_heh;
+ mes "Boorah! You Lose!";
+ next;
+ .@win = false;
+ } else {
+ //WIN
+ mes "Damnit, You Win!";
+ emotion e_swt2;
+ next;
+ .@win = true;
+ }
+
+ mes .@counter +" of 6";
+ if (.@counter == 6)
+ mes "Say your prayers";
+ .@pull = rand(1, 7 - .@counter);
+ ++.@counter;
+ next;
+ if (.@pull > 1) {
+ emotion e_pif;
+ mes "*^0000FFClick^000000* whew...";
+ continue;
+ }
+ if (!.@win) {
+ specialeffect EF_SUI_EXPLOSION;
+ mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
+ mes "You're dead!";
+ emotion e_gg;
+ percentheal -100,-100;
+ close;
+ }
+ specialeffect EF_SUI_EXPLOSION;
+ mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
+ mes "OWWW @#$%^!! THAT HURT LIKE HELL!!";
+ emotion e_omg;
+ next;
+ mes "Congratulations! You have won...";
+ switch (rand(1,10)) {
+ case 1: setarray .@reward[0], 10,984; break;
+ case 3: setarray .@reward[0],100,601; break; // 100x Fly Wings
+ case 4: setarray .@reward[0], 8,603; break; // 8x Old Blue Box
+ case 5: setarray .@reward[0], 4,617; break; // 4x Old Violet Box
+ case 6: setarray .@reward[0], 1,616; break; // 1x Old Card Album
+ case 7: setarray .@reward[0], 10,604; break; // 10x Dead Branch
+ case 8: setarray .@reward[0], 3,969; break; // 3x Gold
+ case 10: setarray .@reward[0],20,505; break; // 20x Blue Potion
+ case 2:
+ case 9:
+ setarray .@reward[0], 10,985;
+ }
+ mes .@reward[0] +"x "+ getitemname(.@reward[1]) +"!";
+ getitem .@reward[1], .@reward[0];
+ close;
+ }
+ end;
}
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt
index b3215ccb7..ac218a2c2 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -133,7 +133,7 @@ OnInit:
B_MAGALETA, B_SHECIL, B_KATRINN, B_YGNIZEM, APOCALIPS_H, LADY_TANEE, THANATOS, DETALE, KIEL_, RANDGRIS,
GLOOMUNDERNIGHT, KTULLANUX, ATROCE, G_MAGALETA_, IFRIT, FALLINGBISHOP, BEELZEBUB_, GOPINICH, MOROCC_, KUBLIN,
S_NYDHOG, BOITATA;
- if(checkre(0)){
+ if (RENEWAL){
setarray .MVP[getarraysize(.MVP)], QUEEN_SCARABA, LOST_DRAGON, LEAK, I_QUEEN_SCARABA;
}
set .Blacklist$, "1003,1006,1017,1021,1022,1027,1043,1075,1136,1137,1168," +
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt
index 59d67b083..530f5301f 100644
--- a/npc/custom/healer.txt
+++ b/npc/custom/healer.txt
@@ -31,7 +31,7 @@
specialeffect2 EF_BLESSING; sc_start SC_BLESSING,240000,10;
}
if (.@Delay) @HD = gettimetick(2)+.@Delay;
- close;
+ end;
}
diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt
index 7d2c4ba62..d1f2b59c9 100644
--- a/npc/custom/itembind.txt
+++ b/npc/custom/itembind.txt
@@ -32,8 +32,8 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{
getinventorylist();
for(.@i = 0; .@i < @inventorylist_count; .@i++) {
//We only show the items that you allow to be bound
- //Allows equipment (default)
- if(@inventorylist_bound[.@i])
+ //Allows equipment (default) or non-rental item
+ if( @inventorylist_bound[.@i] || @inventorylist_expire[.@i] )
continue;
if(((.allowbind & 1) && (getiteminfo(@inventorylist_id[.@i],2) == (4|5))) ||
((.allowbind & 2) && (getiteminfo(@inventorylist_id[.@i],2) == (0|2|11|18))) ||
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index ca102ed76..c497ceef3 100644
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -73,7 +73,7 @@ prontera,153,193,6 script Job Master 2_F_MAGICMASTER,{
if ((.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE) {
.@newclass = roclass(.@eac|EAJL_THIRD);
.@required_jlevel = 99;
- } else if (Class == Job_Ninja) {
+ } else if (Class == Job_Ninja || Class == Job_Gunslinger) {
.@newclass = .@job1;
.@required_jlevel = 70;
}
@@ -253,7 +253,7 @@ OnInit:
.rebirth_jlevel = 50; // Minimum base job level to reborn OR change to third class
.jobchange_first = 10; // Minimum job level to turn into 1st class
.jobchange_second = 40; // Minimum job level to turn into 2nd class
- .third_classes = 1; // Enable third classes? (1: yes / 0: no)
+ .third_classes = 1; // Enable third classes/Extended Classes? (1: yes / 0: no)
.supernovice_level = 45; // Minimum base level to turn into Super Novice
.linear_jobchange = 1; // Enforce linear class changes? (1: yes / 0: no)
.skill_point_check = 1; // Force player to use up all skill points? (1: yes / 0: no)
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index 311274997..0f28ef40b 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
-//= 1.4
+//= 1.4b
//===== Description: =========================================
//= A complete - but very condensed - warper script.
//= Some coordinates written by Tekno-Kanix and ToastOfDoom.
@@ -14,6 +14,8 @@
//= 1.3 Added Renewal checks and Instances menu.
//= Aligned coordinates with @go.
//= 1.4 Added new Guild Dungeons.
+//= 1.4a Slight edits.
+//= 1.4b Added Wolfchev's Laboratory warp.
//============================================================
- script Warper -1,{
@@ -24,15 +26,19 @@ function Go; function Disp; function Pick; function Restrict;
// --------------------------------------------------
menu "Last Warp ^777777["+lastwarp$+"]^000000",-,
- " ~ Towns",Towns, " ~ Fields",Fields, " ~ Dungeons",Dungeons,
- " ~ Guild Castles",Castles, " ~ Guild Dungeons",Guild_Dungeons,
- " ~ Instances",Instances, " ~ Special Areas",Special;
+ " ~ Towns",Towns,
+ " ~ Fields",Fields,
+ " ~ Dungeons",Dungeons,
+ " ~ Guild Castles",Castles,
+ " ~ Guild Dungeons",Guild_Dungeons,
+ " ~ Instances",Instances,
+ " ~ Special Areas",Special;
if (lastwarp$ == "")
message strcharinfo(0),"You haven't warped anywhere yet.";
else
warp lastwarp$,lastwarpx,lastwarpy;
- close;
+ end;
// ------------------- Functions -------------------
// * Go("<map>",<x>,<y>);
@@ -58,50 +64,51 @@ menu "Last Warp ^777777["+lastwarp$+"]^000000",-,
// --------------------------------------------------
function Go {
+ lastwarp$ = getarg(0);
+ lastwarpx = getarg(1,0);
+ lastwarpy = getarg(2,0);
warp getarg(0),getarg(1,0),getarg(2,0);
- getmapxy(lastwarp$,lastwarpx,lastwarpy,0);
end;
}
function Disp {
if (getargcount() < 3)
- set @menu$, getarg(0);
+ @menu$ = getarg(0);
else {
- set @menu$,"";
- for(set .@i,getarg(1); .@i<=getarg(2); set .@i,.@i+1)
- set @menu$, @menu$+getarg(0)+" "+.@i+":";
+ @menu$ = "";
+ for (.@i = getarg(1); .@i <= getarg(2); .@i++)
+ @menu$ = @menu$+getarg(0)+" "+.@i+":";
}
return;
}
function Pick {
- set .@warp_block,@warp_block;
- set @warp_block,0;
+ .@warp_block = @warp_block;
+ @warp_block = 0;
+ .@select = select(@menu$);
if (getarg(0) == "") {
- set .@select, select(@menu$);
- set .@i, .@select;
- set .@map$, getarg(.@i);
+ .@i = .@select;
+ .@map$ = getarg(.@i);
} else {
- set .@select, select(@menu$);
- set .@i, .@select-getarg(1,0);
- set .@map$, getarg(0)+((.@i<10)?"0":"")+.@i;
+ .@i = .@select-getarg(1,0);
+ .@map$ = getarg(0)+((.@i<10)?"0":"")+.@i;
}
if (.@warp_block & (1<<.@select)) {
- message strcharinfo(0),"This map is not enabled in "+((checkre(0))?"":"Pre-")+"Renewal.";
- close;
+ message strcharinfo(0),"This map is not enabled in "+(RENEWAL?"":"Pre-")+"Renewal.";
+ end;
}
- warp .@map$,@c[.@i*2],@c[.@i*2+1];
- getmapxy(lastwarp$,lastwarpx,lastwarpy,0);
+ .@x = @c[.@i*2];
+ .@y = @c[.@i*2+1];
deletearray @c[0],getarraysize(@c);
- end;
+ Go(.@map$,.@x,.@y);
}
function Restrict {
- if ((getarg(0) == "RE" && !checkre(0)) || (getarg(0) == "Pre-RE" && checkre(0))) {
+ if ((getarg(0) == "RE" && !RENEWAL) || (getarg(0) == "Pre-RE" && RENEWAL)) {
if (getarg(1,0)) {
- set @warp_block,0;
- for(set .@i,1; .@i<getargcount(); set .@i,.@i+1)
- set @warp_block, @warp_block | (1<<getarg(.@i));
+ @warp_block = 0;
+ for (.@i = 1; .@i < getargcount(); .@i++)
+ @warp_block = @warp_block | (1<<getarg(.@i));
} else {
- message strcharinfo(0),"This map is not enabled in "+((checkre(0))?"":"Pre-")+"Renewal.";
- close;
+ message strcharinfo(0),"This map is not enabled in "+(RENEWAL?"":"Pre-")+"Renewal.";
+ end;
}
}
return;
@@ -111,13 +118,13 @@ function Restrict {
Towns:
// --------------------------------------------------
menu "Prontera",T1, "Alberta",T2, "Aldebaran",T3, "Amatsu",T4, "Ayothaya",T5,
- "Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10,
- "Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Gonryun",T14, "Hugel",T15,
- "Izlude",T16, "Jawaii",T17, "Lighthalzen",T18, "Louyang",T19, "Lutie",T20,
- "Malangdo",T21, "Malaya",T22, "Manuk",T23, "Midgarts Expedition Camp",T24,
- "Mora",T25, "Morroc",T26, "Moscovia",T27, "Nameless Island",T28,
- "Niflheim",T29, "Payon",T30, "Rachel",T31, "Splendide",T32, "Thor Camp",T33,
- "Umbala",T34, "Veins",T35, "Yuno",T36;
+ "Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10,
+ "Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Gonryun",T14, "Hugel",T15,
+ "Izlude",T16, "Jawaii",T17, "Lighthalzen",T18, "Louyang",T19, "Lutie",T20,
+ "Malangdo",T21, "Malaya",T22, "Manuk",T23, "Midgarts Expedition Camp",T24,
+ "Mora",T25, "Morroc",T26, "Moscovia",T27, "Nameless Island",T28,
+ "Niflheim",T29, "Payon",T30, "Rachel",T31, "Splendide",T32, "Thor Camp",T33,
+ "Umbala",T34, "Veins",T35, "Yuno",T36;
T1: Go("prontera",155,183);
T2: Go("alberta",28,234);
@@ -134,23 +141,23 @@ T9: Restrict("RE");
T10: Go("einbech",63,35);
T11: Go("einbroch",64,200);
T12: Restrict("RE");
- Go("dicastes01",198,187);
+ Go("dicastes01",198,187);
T13: Go("geffen",119,59);
T14: Go("gonryun",160,120);
T15: Go("hugel",96,145);
-T16: Go("izlude",128,114);
+T16: Go("izlude",128,(RENEWAL?146:114));
T17: Go("jawaii",251,132);
T18: Go("lighthalzen",158,92);
T19: Go("louyang",217,100);
T20: Go("xmas",147,134);
T21: Restrict("RE");
- Go("malangdo",140,114);
+ Go("malangdo",140,114);
T22: Restrict("RE");
- Go("malaya",212,206);
+ Go("malaya",231,200);
T23: Go("manuk",282,138);
T24: Go("mid_camp",210,288);
T25: Restrict("RE");
- Go("mora",55,146);
+ Go("mora",55,146);
T26: Go("morocc",156,93);
T27: Go("moscovia",223,184);
T28: Go("nameless_n",256,215);
@@ -167,15 +174,15 @@ T36: Go("yuno",157,51);
Fields:
// --------------------------------------------------
menu "Amatsu Fields",F1, "Ayothaya Fields",F2, "Bifrost Fields", F3,
- "Brasilis Fields",F4, "Comodo Fields",F5, "Dewata Fields",F6,
- "Eclage Fields",F7, "Einbroch Fields",F8, "El Dicastes Fields",F9,
- "Geffen Fields",F10, "Gonryun Fields",F11, "Hugel Fields",F12,
- "Lighthalzen Fields",F13, "Louyang Field",F14, "Lutie Field",F15,
- "Malaya Fields",F16, "Manuk Fields",F17, "Mjolnir Fields",F18,
- "Moscovia Fields",F19, "Niflheim Fields",F20, "Payon Forests",F21,
- "Prontera Fields",F22, "Rachel Fields",F23, "Sograt Deserts",F24,
- "Splendide Fields",F25, "Umbala Fields",F26, "Veins Fields",F27,
- "Yuno Fields",F28;
+ "Brasilis Fields",F4, "Comodo Fields",F5, "Dewata Fields",F6,
+ "Eclage Fields",F7, "Einbroch Fields",F8, "El Dicastes Fields",F9,
+ "Geffen Fields",F10, "Gonryun Fields",F11, "Hugel Fields",F12,
+ "Lighthalzen Fields",F13, "Louyang Field",F14, "Lutie Field",F15,
+ "Malaya Fields",F16, "Manuk Fields",F17, "Mjolnir Fields",F18,
+ "Moscovia Fields",F19, "Niflheim Fields",F20, "Payon Forests",F21,
+ "Prontera Fields",F22, "Rachel Fields",F23, "Sograt Deserts",F24,
+ "Splendide Fields",F25, "Umbala Fields",F26, "Veins Fields",F27,
+ "Yuno Fields",F28;
F1: setarray @c[2],190,197;
Disp("Amatsu Field",1,1); Pick("ama_fild");
@@ -203,67 +210,67 @@ F9: Restrict("RE");
setarray @c[2],143,132,143,217;
Disp("El Dicastes Field",1,2); Pick("dic_fild");
F10: Restrict("Pre-RE",13,15);
- setarray @c[0],46,199,213,204,195,212,257,192,188,171,166,263,248,158,195,191,186,183,221,117,178,218,136,328,240,181,235,235,211,185;
- Disp("Geffen Field",0,14); Pick("gef_fild",1);
+ setarray @c[0],46,199,213,204,195,212,257,192,188,171,166,263,248,158,195,191,186,183,221,117,178,218,136,328,240,181,235,235,211,185;
+ Disp("Geffen Field",0,14); Pick("gef_fild",1);
F11: setarray @c[2],220,227;
- Disp("Gonryun Field",1,1); Pick("gon_fild");
+ Disp("Gonryun Field",1,1); Pick("gon_fild");
F12: Restrict("Pre-RE",3,7);
- setarray @c[2],268,101,222,193,232,185,252,189,196,106,216,220,227,197;
- Disp("Hugel Field",1,7); Pick("hu_fild");
+ setarray @c[2],268,101,222,193,232,185,252,189,196,106,216,220,227,197;
+ Disp("Hugel Field",1,7); Pick("hu_fild");
F13: setarray @c[2],240,179,185,235,240,226;
- Disp("Lighthalzen Field",1,3); Pick("lhz_fild");
+ Disp("Lighthalzen Field",1,3); Pick("lhz_fild");
F14: setarray @c[2],229,187;
- Disp("Louyang Field",1,1); Pick("lou_fild");
+ Disp("Louyang Field",1,1); Pick("lou_fild");
F15: setarray @c[2],115,145;
- Disp("Lutie Field",1,1); Pick("xmas_fild");
+ Disp("Lutie Field",1,1); Pick("xmas_fild");
F16: Restrict("RE");
- setarray @c[2],40,272,207,180;
- Disp("Malaya Field",1,2); Pick("ma_fild");
+ setarray @c[2],40,272,207,180;
+ Disp("Malaya Field",1,2); Pick("ma_fild");
F17: setarray @c[2],35,236,35,262,84,365;
- Disp("Manuk Field",1,3); Pick("man_fild");
+ Disp("Manuk Field",1,3); Pick("man_fild");
F18: setarray @c[2],204,120,175,193,208,213,179,180,181,240,195,270,235,202,188,215,205,144,245,223,180,206,196,208;
- Disp("Mjolnir Field",1,12); Pick("mjolnir_");
+ Disp("Mjolnir Field",1,12); Pick("mjolnir_");
F19: setarray @c[2],82,104,131,147;
- Disp("Moscovia Field",1,2); Pick("mosk_fild");
+ Disp("Moscovia Field",1,2); Pick("mosk_fild");
F20: setarray @c[2],215,229,167,234;
- Disp("Niflheim Field",1,2); Pick("nif_fild");
+ Disp("Niflheim Field",1,2); Pick("nif_fild");
F21: Restrict("Pre-RE",5,11);
- setarray @c[2],158,206,151,219,205,148,186,247,134,204,193,235,200,177,137,189,201,224,160,205,194,150;
- Disp("Payon Forest",1,11); Pick("pay_fild");
+ setarray @c[2],158,206,151,219,205,148,186,247,134,204,193,235,200,177,137,189,201,224,160,205,194,150;
+ Disp("Payon Forest",1,11); Pick("pay_fild");
F22: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193,194,187,218,210,183,195,149,198,164;
- Disp("Prontera Field",0,11); Pick("prt_fild",1);
+ Disp("Prontera Field",0,11); Pick("prt_fild",1);
F23: Restrict("Pre-RE",2,7,9,10,11,13);
- setarray @c[2],192,162,235,166,202,206,202,208,225,202,202,214,263,196,217,201,87,121,277,181,221,185,175,200,174,197;
- Disp("Rachel Field",1,13); Pick("ra_fild");
+ setarray @c[2],192,162,235,166,202,206,202,208,225,202,202,214,263,196,217,201,87,121,277,181,221,185,175,200,174,197;
+ Disp("Rachel Field",1,13); Pick("ra_fild");
F24: setarray @c[2],219,205,177,206,194,182,224,170,198,216,156,187,185,263,206,228,208,238,209,223,85,97,207,202,31,195,38,195;
- Disp("Sograt Desert 1:Sograt Desert 2:Sograt Desert 3:Sograt Desert 7:Sograt Desert 11:Sograt Desert 12:Sograt Desert 13:Sograt Desert 16:Sograt Desert 17:Sograt Desert 18:Sograt Desert 19:Sograt Desert 20:Sograt Desert 21:Sograt Desert 22");
- Pick("","moc_fild01","moc_fild02","moc_fild03","moc_fild07","moc_fild11","moc_fild12","moc_fild13","moc_fild16","moc_fild17","moc_fild18","moc_fild19","moc_fild20","moc_fild21","moc_fild22");
+ Disp("Sograt Desert 1:Sograt Desert 2:Sograt Desert 3:Sograt Desert 7:Sograt Desert 11:Sograt Desert 12:Sograt Desert 13:Sograt Desert 16:Sograt Desert 17:Sograt Desert 18:Sograt Desert 19:Sograt Desert 20:Sograt Desert 21:Sograt Desert 22");
+ Pick("","moc_fild01","moc_fild02","moc_fild03","moc_fild07","moc_fild11","moc_fild12","moc_fild13","moc_fild16","moc_fild17","moc_fild18","moc_fild19","moc_fild20","moc_fild21","moc_fild22");
F25: setarray @c[2],175,186,236,184,188,204;
- Disp("Splendide Field",1,3); Pick("spl_fild");
+ Disp("Splendide Field",1,3); Pick("spl_fild");
F26: setarray @c[2],217,206,223,221,237,215,202,197;
- Disp("Umbala Field",1,4); Pick("um_fild");
+ Disp("Umbala Field",1,4); Pick("um_fild");
F27: Restrict("Pre-RE",5);
- setarray @c[2],186,175,196,370,222,45,51,250,202,324,150,223,149,307;
- Disp("Veins Field",1,7); Pick("ve_fild");
+ setarray @c[2],186,175,196,370,222,45,51,250,202,324,150,223,149,307;
+ Disp("Veins Field",1,7); Pick("ve_fild");
F28: Restrict("Pre-RE",5,10);
- setarray @c[2],189,224,192,207,221,157,226,199,223,177,187,232,231,174,196,203,183,214,200,124,195,226,210,304;
- Disp("Yuno Field",1,12); Pick("yuno_fild");
+ setarray @c[2],189,224,192,207,221,157,226,199,223,177,187,232,231,174,196,203,183,214,200,124,195,226,210,304;
+ Disp("Yuno Field",1,12); Pick("yuno_fild");
// --------------------------------------------------
Dungeons:
// --------------------------------------------------
menu "Abyss Lakes",D1, "Amatsu Dungeon",D2, "Anthell",D3,
- "Ayothaya Dungeon",D4, "Beach Dungeon",D5, "Bio Labs",D6,
- "Brasilis Dungeon",D7, "Byalan Dungeon",D8, "Clock Tower",D9,
- "Coal Mines",D10, "Culvert",D11, "Cursed Abbey",D12, "Dewata Dungeon",D13,
- "Einbroch Dungeon",D14, "Gefenia",D15, "Geffen Dungeon",D16,
- "Glast Heim",D17, "Gonryun Dungeon",D18, "Hidden Dungeon",D19,
- "Ice Dungeon",D20, "Juperos",D21, "Kiel Dungeon",D22, "Louyang Dungeon",D23,
- "Magma Dungeon",D24, "Malangdo Dungeon",D25, "Moscovia Dungeon",D26,
- "Nidhogg's Dungeon",D27, "Odin Temple",D28, "Orc Dungeon",D29,
- "Payon Dungeon",D30, "Pyramids",D31, "Rachel Sanctuary",D32,
- "Scaraba Hole",D33, "Sphinx",D34, "Sunken Ship",D35, "Thanatos Tower",D36,
- "Thor Volcano",D37, "Toy Factory",D38, "Turtle Dungeon",D39, "Umbala Dungeon",D40;
+ "Ayothaya Dungeon",D4, "Beach Dungeon",D5, "Bifrost Tower",D41,
+ "Bio Labs",D6, "Brasilis Dungeon",D7, "Byalan Dungeon",D8, "Clock Tower",D9,
+ "Coal Mines",D10, "Culvert",D11, "Cursed Abbey",D12, "Dewata Dungeon",D13,
+ "Einbroch Dungeon",D14, "Gefenia",D15, "Geffen Dungeon",D16,
+ "Glast Heim",D17, "Gonryun Dungeon",D18, "Hidden Dungeon",D19,
+ "Ice Dungeon",D20, "Juperos",D21, "Kiel Dungeon",D22, "Louyang Dungeon",D23,
+ "Magma Dungeon",D24, "Malangdo Dungeon",D25, "Moscovia Dungeon",D26,
+ "Nidhogg's Dungeon",D27, "Odin Temple",D28, "Orc Dungeon",D29,
+ "Payon Dungeon",D30, "Pyramids",D31, "Rachel Sanctuary",D32,
+ "Scaraba Hole",D33, "Sphinx",D34, "Sunken Ship",D35, "Thanatos Tower",D36,
+ "Thor Volcano",D37, "Toy Factory",D38, "Turtle Dungeon",D39, "Umbala Dungeon",D40;
D1: setarray @c[2],261,272,275,270,116,27;
Disp("Abyss Lakes",1,3); Pick("abyss_");
@@ -288,80 +295,85 @@ D9: setarray @c[2],199,159,148,283,65,147,56,155,297,25,127,169,277,178,268,74;
Disp("Clock Tower 1:Clock Tower 2:Clock Tower 3:Clock Tower 4:Basement 1:Basement 2:Basement 3:Basement 4");
Pick("","c_tower1","c_tower2","c_tower3","c_tower4","alde_dun01","alde_dun02","alde_dun03","alde_dun04");
D10: setarray @c[2],52,17,381,343,302,262;
- Disp("Coal Mines",1,3); Pick("mjo_dun");
+ Disp("Coal Mines",1,3); Pick("mjo_dun");
D11: setarray @c[2],131,247,19,19,180,169,100,92;
- Disp("Culvert",1,4); Pick("","prt_sewb1","prt_sewb2","prt_sewb3","prt_sewb4");
+ Disp("Culvert",1,4); Pick("","prt_sewb1","prt_sewb2","prt_sewb3","prt_sewb4");
D12: setarray @c[2],51,14,150,11,120,10;
- Disp("Cursed Abbey",1,3); Pick("abbey");
+ Disp("Cursed Abbey",1,3); Pick("abbey");
D13: Restrict("RE");
- setarray @c[2],285,160,299,29;
- Disp("Dewata Dungeon",1,2); Pick("dew_dun");
+ setarray @c[2],285,160,299,29;
+ Disp("Dewata Dungeon",1,2); Pick("dew_dun");
D14: setarray @c[2],22,14,292,290;
- Disp("Einbroch Dungeon",1,2); Pick("ein_dun");
+ Disp("Einbroch Dungeon",1,2); Pick("ein_dun");
D15: setarray @c[2],40,103,203,34,266,168,130,272;
- Disp("Gefenia",1,4); Pick("gefenia",0);
+ Disp("Gefenia",1,4); Pick("gefenia",0);
D16: setarray @c[0],104,99,115,236,106,132,203,200;
- Disp("Geffen Dungeon",1,4); Pick("gef_dun",1);
+ Disp("Geffen Dungeon",1,4); Pick("gef_dun",1);
D17: setarray @c[2],370,304,199,29,104,25,150,15,157,287,147,15,258,255,108,291,171,283,68,277,156,7,12,7,133,271,224,274,14,70,150,14;
- Disp("Entrance:Castle 1:Castle 2:Chivalry 1:Chivalry 2:Churchyard:Culvert 1:Culvert 2:Culvert 3:Culvert 4:St. Abbey:Staircase Dungeon:Underground Cave 1:Underground Cave 2:Underground Prison 1:Underground Prison 2");
- Pick("","glast_01","gl_cas01","gl_cas02","gl_knt01","gl_knt02","gl_chyard","gl_sew01","gl_sew02","gl_sew03","gl_sew04","gl_church","gl_step","gl_dun01","gl_dun02","gl_prison","gl_prison1");
+ Disp("Entrance:Castle 1:Castle 2:Chivalry 1:Chivalry 2:Churchyard:Culvert 1:Culvert 2:Culvert 3:Culvert 4:St. Abbey:Staircase Dungeon:Underground Cave 1:Underground Cave 2:Underground Prison 1:Underground Prison 2");
+ Pick("","glast_01","gl_cas01","gl_cas02","gl_knt01","gl_knt02","gl_chyard","gl_sew01","gl_sew02","gl_sew03","gl_sew04","gl_church","gl_step","gl_dun01","gl_dun02","gl_prison","gl_prison1");
D18: setarray @c[2],153,53,28,113,68,16;
- Disp("Gonryun Dungeon",1,3); Pick("gon_dun");
+ Disp("Gonryun Dungeon",1,3); Pick("gon_dun");
D19: setarray @c[2],176,7,93,20,23,8;
- Disp("Hidden Dungeon",1,3); Pick("prt_maze");
+ Disp("Hidden Dungeon",1,3); Pick("prt_maze");
D20: setarray @c[2],157,14,151,155,149,22,33,158;
- Disp("Ice Dungeon",1,4); Pick("ice_dun");
+ Disp("Ice Dungeon",1,4); Pick("ice_dun");
D21: setarray @c[2],140,51,53,247,37,63,150,285;
- Disp("Entrance:Juperos 1:Juperos 2:Core");
- Pick("","jupe_cave","juperos_01","juperos_02","jupe_core");
+ Disp("Entrance:Juperos 1:Juperos 2:Core");
+ Pick("","jupe_cave","juperos_01","juperos_02","jupe_core");
D22: setarray @c[2],28,226,41,198;
- Disp("Kiel Dungeon",1,2); Pick("kh_dun");
+ Disp("Kiel Dungeon",1,2); Pick("kh_dun");
D23: setarray @c[2],218,196,282,20,165,38;
- Disp("The Royal Tomb:Inside the Royal Tomb:Suei Long Gon"); Pick("lou_dun");
+ Disp("The Royal Tomb:Inside the Royal Tomb:Suei Long Gon"); Pick("lou_dun");
D24: setarray @c[2],126,68,47,30;
- Disp("Magma Dungeon",1,2); Pick("mag_dun");
+ Disp("Magma Dungeon",1,2); Pick("mag_dun");
D25: Restrict("RE");
- setarray @c[2],33,230;
- Disp("Malangdo Dungeon",1,1); Pick("mal_dun");
+ setarray @c[2],33,230;
+ Disp("Malangdo Dungeon",1,1); Pick("mal_dun");
D26: setarray @c[2],189,48,165,30,32,135;
- Disp("Moscovia Dungeon",1,3); Pick("mosk_dun");
+ Disp("Moscovia Dungeon",1,3); Pick("mosk_dun");
D27: setarray @c[2],61,239,60,271;
- Disp("Nidhogg's Dungeon",1,2); Pick("nyd_dun");
+ Disp("Nidhogg's Dungeon",1,2); Pick("nyd_dun");
D28: setarray @c[2],298,167,224,149,266,280;
- Disp("Odin Temple",1,3); Pick("odin_tem");
+ Disp("Odin Temple",1,3); Pick("odin_tem");
D29: setarray @c[2],32,170,21,185;
- Disp("Orc Dungeon",1,2); Pick("orcsdun");
+ Disp("Orc Dungeon",1,2); Pick("orcsdun");
D30: setarray @c[0],21,183,19,33,19,63,155,159,201,204;
- Disp("Payon Dungeon",1,5); Pick("pay_dun",1);
-D31: setarray @c[2],192,9,10,192,100,92,181,11,94,96,192,8;
- Disp("Pyramids 1:Pyramids 2:Pyramids 3:Pyramids 4:Basement 1:Basement 2"); Pick("moc_pryd");
-D32: setarray @c[2],140,11,32,21,4,149,204,218,150,9;
- Disp("Rachel Sanctuary",1,5); Pick("ra_san");
+ Disp("Payon Dungeon",1,5); Pick("pay_dun",1);
+D31: Restrict("RE",7,8);
+ setarray @c[2],192,9,10,192,100,92,181,11,94,96,192,8,94,96,192,8;
+ Disp("Pyramids 1:Pyramids 2:Pyramids 3:Pyramids 4:Basement 1:Basement 2:Basement 1 - Nightmare Mode:Basement 2 - Nightmare Mode");
+ Pick("","moc_pryd01","moc_pryd02","moc_pryd03","moc_pryd04","moc_pryd05","moc_pryd06","moc_prydn1","moc_prydn2");
+D32: setarray @c[2],140,11,32,21,8,149,204,218,150,9;
+ Disp("Rachel Sanctuary",1,5); Pick("ra_san");
D33: Restrict("RE");
- setarray @c[2],364,44,101,141;
- Disp("Scaraba Hole",1,2); Pick("dic_dun");
+ setarray @c[2],364,44,101,141;
+ Disp("Scaraba Hole",1,2); Pick("dic_dun");
D34: setarray @c[2],288,9,149,81,210,54,10,222,100,99;
- Disp("Sphinx",1,5); Pick("","in_sphinx1","in_sphinx2","in_sphinx3","in_sphinx4","in_sphinx5");
+ Disp("Sphinx",1,5); Pick("","in_sphinx1","in_sphinx2","in_sphinx3","in_sphinx4","in_sphinx5");
D35: setarray @c[2],69,24,102,27;
- Disp("Sunken Ship",1,2); Pick("treasure");
+ Disp("Sunken Ship",1,2); Pick("treasure");
D36: setarray @c[2],150,39,150,136,220,158,59,143,62,11,89,221,35,166,93,148,29,107,159,138,19,20,130,52;
- Disp("Thanatos Tower",1,12); Pick("tha_t");
+ Disp("Thanatos Tower",1,12); Pick("tha_t");
D37: setarray @c[2],21,228,75,205,34,272;
- Disp("Thor Volcano",1,3); Pick("thor_v");
+ Disp("Thor Volcano",1,3); Pick("thor_v");
D38: setarray @c[2],205,15,129,133;
- Disp("Toy Factory",1,2); Pick("xmas_dun");
+ Disp("Toy Factory",1,2); Pick("xmas_dun");
D39: setarray @c[2],154,49,148,261,132,189,100,192;
- Disp("Entrance:Turtle Dungeon 1:Turtle Dungeon 2:Turtle Dungeon 3"); Pick("tur_dun");
+ Disp("Entrance:Turtle Dungeon 1:Turtle Dungeon 2:Turtle Dungeon 3"); Pick("tur_dun");
D40: Restrict("Pre-RE",1,2);
- setarray @c[2],42,31,48,30,204,78;
- Disp("Carpenter's Shop in the Tree:Passage to a Foreign World:Hvergermil's Fountain");
- Pick("","um_dun01","um_dun02","yggdrasil01");
+ setarray @c[2],42,31,48,30,204,78;
+ Disp("Carpenter's Shop in the Tree:Passage to a Foreign World:Hvergermil's Fountain");
+ Pick("","um_dun01","um_dun02","yggdrasil01");
+D41: Restrict("RE");
+ setarray @c[2],57,13,64,88,45,14,26,23;
+ Disp("Bifrost Tower",1,4); Pick("ecl_tdun");
// --------------------------------------------------
Castles:
// --------------------------------------------------
menu "Aldebaran Castles",C1, "Geffen Castles",C2, "Payon Castles",C3,
- "Prontera Castles",C4, "Arunafeltz Castles",C5, "Schwaltzvalt Castles",C6;
+ "Prontera Castles",C4, "Arunafeltz Castles",C5, "Schwaltzvalt Castles",C6;
C1: setarray @c[2],48,83,95,249,142,85,239,242,264,90;
Disp("Neuschwanstein:Hohenschwangau:Nuenberg:Wuerzburg:Rothenburg");
@@ -386,7 +398,7 @@ C6: setarray @c[2],293,100,288,252,97,196,137,90,71,315;
Guild_Dungeons:
// --------------------------------------------------
menu "Baldur",G1, "Luina",G2, "Valkyrie",G3, "Britoniah",G4,
- "Arunafeltz",G5, "Schwaltzvalt",G6;
+ "Arunafeltz",G5, "Schwaltzvalt",G6;
G1: Restrict("RE",2,3);
setarray @c[2],119,93,119,93,120,130;
@@ -410,26 +422,37 @@ G6: Go("schg_dun01",200,124);
// --------------------------------------------------
Instances:
// --------------------------------------------------
+menu "Bakonawa Lake",I1, "Bangungot Hospital 2F",I2, "Buwaya Cave",I3,
+ "Endless Tower",I4, "Hazy Forest",I5, "Malangdo Culvert",I6, "Nidhoggur's Nest",I7,
+ "Octopus Cave",I8, "Old Glast Heim",I9, "Orc's Memory",I10, "Sealed Shrine",I11,
+ "Wolfchev's Laboratory",I12;
-menu "Endless Tower",I1, "Hazy Forest",I2, "Malangdo Culvert",I3,
- "Nidhoggur's Nest",I4, "Octopus Cave",I5, "Orc's Memory",I6, "Sealed Shrine",I7;
-
-I1: Go("e_tower",72,112);
+I1: Restrict("RE");
+ Go("ma_scene01",172,175);
I2: Restrict("RE");
- Go("bif_fild01",161,334);
+ Go("ma_dun01",151,8);
I3: Restrict("RE");
- Go("mal_in01",164,21);
-I4: Go("nyd_dun02",95,193);
+ Go("ma_fild02",316,317);
+I4: Go("e_tower",72,112);
I5: Restrict("RE");
+ Go("bif_fild01",161,334);
+I6: Restrict("RE");
+ Go("mal_in01",164,21);
+I7: Go("nyd_dun02",95,193);
+I8: Restrict("RE");
Go("mal_dun01",152,230);
-I6: Go("gef_fild10",240,198);
-I7: Go("monk_test",306,143);
+I9: Restrict("RE");
+ Go("glast_01",204,268);
+I10: Go("gef_fild10",240,198);
+I11: Go("monk_test",306,143);
+I12: Restrict("RE");
+ Go("lhz_dun04",148,269);
// --------------------------------------------------
Special:
// --------------------------------------------------
menu "Auction Hall",S1, "Battlegrounds",S2, "Casino",S3, "Eden Group Headquarters",S4,
- "Gonryun Arena",S5, "Izlude Arena",S6, "Monster Race Arena",S7, "Turbo Track",S8;
+ "Gonryun Arena",S5, "Izlude Arena",S6, "Monster Race Arena",S7, "Turbo Track",S8;
S1: Go("auction_01",22,68);
S2: Go("bat_room",154,150);
@@ -456,10 +479,10 @@ einbroch,69,202,4 duplicate(Warper) Warper#einbr 4_F_VALKYRIE
gef_fild10,71,339,4 duplicate(Warper) Warper#orc 4_F_VALKYRIE
geffen,124,72,4 duplicate(Warper) Warper#gef 4_F_VALKYRIE
glast_01,372,308,4 duplicate(Warper) Warper#glh 4_F_VALKYRIE
-gonryun,165,126,4 duplicate(Warper) Warper#gon 4_F_VALKYRIE
+gonryun,162,122,4 duplicate(Warper) Warper#gon 4_F_VALKYRIE
hugel,101,151,4 duplicate(Warper) Warper#hug 4_F_VALKYRIE
izlu2dun,110,92,4 duplicate(Warper) Warper#izd 4_F_VALKYRIE
-izlude,132,120,4 duplicate(Warper) Warper#izl 4_F_VALKYRIE
+izlude,134,150,4 duplicate(Warper) Warper#izl 4_F_VALKYRIE //Pre-RE: (132,120)
jawaii,253,138,4 duplicate(Warper) Warper#jaw 4_F_VALKYRIE
lighthalzen,162,102,4 duplicate(Warper) Warper#lhz 4_F_VALKYRIE
louyang,208,103,6 duplicate(Warper) Warper#lou 4_F_VALKYRIE
@@ -491,5 +514,5 @@ dewata,204,186,6 duplicate(Warper) Warper#dew 4_F_VALKYRIE
dicastes01,194,194,6 duplicate(Warper) Warper#dic 4_F_VALKYRIE
ecl_in01,51,60,4 duplicate(Warper) Warper#ecl 4_F_VALKYRIE
malangdo,134,117,6 duplicate(Warper) Warper#mal 4_F_VALKYRIE
-malaya,210,205,4 duplicate(Warper) Warper#ma 4_F_VALKYRIE
+malaya,231,204,4 duplicate(Warper) Warper#ma 4_F_VALKYRIE
mora,57,152,4 duplicate(Warper) Warper#mora 4_F_VALKYRIE
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index 824fa4a4f..ec5bb3d81 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -11,8 +11,8 @@
//= and "rewards" function originally by Goddameit.
//===== Additional Comments: =================================
//= Be sure to disable the default agit controllers!
-//== npc\guild\agit_controller.txt
-//== npc\guild2\agit_start_se.txt
+//== npc\woe-fe\agit_controller.txt
+//== npc\woe-se\agit_start_se.txt
//============================================================
// Information NPC