summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2
diff options
context:
space:
mode:
authorajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-22 07:33:09 +0000
committerajarn <ajarn@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-22 07:33:09 +0000
commit89a6fd37915266094dcc4cfb7cefac2b0ff34f38 (patch)
treece809f6bcf641bb75ff81d6124472d46b21c683d /npc/jobs/2-2
parent98c2c3c621f32fdf36f23cfd09565f8af7753e7d (diff)
downloadhercules-89a6fd37915266094dcc4cfb7cefac2b0ff34f38.tar.gz
hercules-89a6fd37915266094dcc4cfb7cefac2b0ff34f38.tar.bz2
hercules-89a6fd37915266094dcc4cfb7cefac2b0ff34f38.tar.xz
hercules-89a6fd37915266094dcc4cfb7cefac2b0ff34f38.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@715 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs/2-2')
-rw-r--r--npc/jobs/2-2/alchemist.txt18
-rw-r--r--npc/jobs/2-2/rogue.txt54
2 files changed, 24 insertions, 48 deletions
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 6b274d56f..e1480d0f3 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -22,8 +22,7 @@
//==================================================================================================//
// Registration and First Test
//==================================================================================================//
-alde_alche.gat,27,185,4 script Parmry Gianino 744,
-{
+alde_alche.gat,27,185,4 script Parmry Gianino 744,{
mes "[Parmry Gianino]";
if(Class == 5) goto L_Merc;
if(Class == Job_Alchem) goto L_Alch;
@@ -196,8 +195,7 @@ L_GoChange:
//==================================================================================================//
// 2nd Test: Math test :(
//==================================================================================================//
-alde_alche.gat,175,107,4 script Raspuchin Gregory 749,
-{
+alde_alche.gat,175,107,4 script Raspuchin Gregory 749,{
mes "[Raspuchin Gregory]";
if(class == 5) goto L_Merc;
L_Other:
@@ -461,8 +459,7 @@ L_Skip:
//==================================================================================================//
// 3rd Test: Mix some medicine
//==================================================================================================//
-alde_alche.gat,13,15,8 script Darwin 750,
-{
+alde_alche.gat,13,15,8 script Darwin 750,{
mes "[Darwin]";
if(class == 5) goto L_Merc;
L_Other:
@@ -686,8 +683,7 @@ L_NotEnuf:
//==================================================================================================//
// 4th Test: Learn from Morgenstein
//==================================================================================================//
-alde_alche.gat,79,19,4 script Van Helmont 748,
-{
+alde_alche.gat,79,19,4 script Van Helmont 748,{
mes "[Van Helmont]";
if(class == 5) goto L_Merc;
L_Other:
@@ -853,8 +849,7 @@ L_Done:
//==================================================================================================//
// Test 5 & 6: Word Scramble, Help the Baijin Bros.
//==================================================================================================//
-alde_alche.gat,145,19,4 script Nicholas Flamel 57,
-{
+alde_alche.gat,145,19,4 script Nicholas Flamel 57,{
mes "[Nicholas Flamel]";
if(class == 5) goto L_Merc;
L_Other:
@@ -1015,8 +1010,7 @@ L_Done:
//==================================================================================================//
// Job Changer
//==================================================================================================//
-alde_alche.gat,101,184,4 script Vincent Carsciallo 122,
-{
+alde_alche.gat,101,184,4 script Vincent Carsciallo 122,{
mes "[Vincent Carsciallo]";
if(Class == 5) goto L_Merc;
if(Class == Job_Alchem) goto L_Alch;
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 7c7dd099e..06695a53e 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -596,8 +596,7 @@ L_Done:
//===========================================================
//------------------------------------------------------------------------------
-in_rogue.gat,272,136,3 script Hermanthorn Jr. 85,
-{
+in_rogue.gat,272,136,3 script Hermanthorn Jr. 85,{
mes "[Hermanthorn Jr.]";
mes "Huh? Wha.... who are you?! You're not from the Rogue guild!! Get out of here!";
emotion 1;
@@ -739,18 +738,15 @@ sF_Password:
// Guildsman
//===============================================
//---------------------------------------------------------------------------
-in_rogue.gat,244,39,4 script Aragham Junior 99,
-{
+in_rogue.gat,244,39,4 script Aragham Junior 99,{
callfunc "F_RogueTest4", "Aragham Junior", 245, 27;
}
//---------------------------------------------------------------------------
-in_rogue.gat,152,27,6 script Hollgrehen Junior 85,
-{
+in_rogue.gat,152,27,6 script Hollgrehen Junior 85,{
callfunc "F_RogueTest4", "Hollgrehen Junior", 160, 32;
}
//---------------------------------------------------------------------------
-in_rogue.gat,183,105,4 script Antonio Junior 88,
-{
+in_rogue.gat,183,105,4 script Antonio Junior 88,{
callfunc "F_RogueTest4", "Antonio Junior", 175, 107;
}
@@ -814,8 +810,7 @@ L_Restart:
//================================================
// Monster Spawns
//================================================
-in_rogue.gat,15,185,0 script rogue_mob1 139,8,0,
-{
+in_rogue.gat,15,185,0 script rogue_mob1 139,8,0,{
monster "in_rogue.gat",14,188,"Zombie",1015,1;
monster "in_rogue.gat",15,188,"Zombie",1015,1;
monster "in_rogue.gat",16,188,"Zombie",1015,1;
@@ -824,8 +819,7 @@ in_rogue.gat,15,185,0 script rogue_mob1 139,8,0,
monster "in_rogue.gat",16,189,"Zombie",1015,1;
end;
}
-in_rogue.gat,15,245,0 script rogue_mob2 139,8,0,
-{
+in_rogue.gat,15,245,0 script rogue_mob2 139,8,0,{
monster "in_rogue.gat",14,247,"Mummy",1041,1;
monster "in_rogue.gat",15,247,"Mummy",1041,1;
monster "in_rogue.gat",16,247,"Mummy",1041,1;
@@ -834,8 +828,7 @@ in_rogue.gat,15,245,0 script rogue_mob2 139,8,0,
monster "in_rogue.gat",16,248,"Mummy",1041,1;
end;
}
-in_rogue.gat,15,328,0 script rogue_mob3 139,8,0,
-{
+in_rogue.gat,15,328,0 script rogue_mob3 139,8,0,{
monster "in_rogue.gat",14,331,"Zombie",1015,1;
monster "in_rogue.gat",15,331,"Zombie",1015,1;
monster "in_rogue.gat",16,331,"Zombie",1015,1;
@@ -844,65 +837,55 @@ in_rogue.gat,15,328,0 script rogue_mob3 139,8,0,
monster "in_rogue.gat",16,332,"Zombie",1015,1;
end;
}
-in_rogue.gat,35,342,0 script rogue_mob4 139,0,8,
-{
+in_rogue.gat,35,342,0 script rogue_mob4 139,0,8,{
monster "in_rogue.gat",38,340,"Mummy",1041,1;
monster "in_rogue.gat",37,342,"Abyss Knight",1219,1;
monster "in_rogue.gat",39,342,"Ghoul",1036,1;
monster "in_rogue.gat",38,344,"Mummy",1041,1;
end;
}
-in_rogue.gat,57,306,0 script rogue_mob5 139,4,0,
-{
+in_rogue.gat,57,306,0 script rogue_mob5 139,4,0,{
monster "in_rogue.gat",59,301,"Khalitzburg",1132,1;
end;
}
-in_rogue.gat,96,333,0 script rogue_mob6 139,0,4,
-{
+in_rogue.gat,96,333,0 script rogue_mob6 139,0,4,{
monster "in_rogue.gat",92,325,"Khalitzburg",1132,1;
end;
}
-in_rogue.gat,139,313,0 script rogue_mob7 139,4,0,
-{
+in_rogue.gat,139,313,0 script rogue_mob7 139,4,0,{
monster "in_rogue.gat",139,309,"Abyss Knight",1219,1;
end;
}
-in_rogue.gat,135,246,0 script rogue_mob8 139,0,4,
-{
+in_rogue.gat,135,246,0 script rogue_mob8 139,0,4,{
monster "in_rogue.gat",139,245,"Zombie",1015,2;
monster "in_rogue.gat",139,246,"Zombie",1015,2;
monster "in_rogue.gat",139,247,"Zombie",1015,2;
end;
}
-in_rogue.gat,62,302,0 script rogue_mob9 139,0,4,
-{
+in_rogue.gat,62,302,0 script rogue_mob9 139,0,4,{
monster "in_rogue.gat",57,305,"Khalitzburg",1132,1;
end;
}
-in_rogue.gat,199,218,0 script rogue_mob10 139,0,8,
-{
+in_rogue.gat,199,218,0 script rogue_mob10 139,0,8,{
monster "in_rogue.gat",157,218,"Zombie",1015,10;
monster "in_rogue.gat",157,218,"Abyss Knight",1219,1;
monster "in_rogue.gat",157,218,"Ghoul",1036,1;
monster "in_rogue.gat",157,218,"Archer Skeleton",1016,1;
end;
}
-in_rogue.gat,86,187,0 script rogue_mob11 139,0,8,
-{
+in_rogue.gat,86,187,0 script rogue_mob11 139,0,8,{
monster "in_rogue.gat",88,186,"Mummy",1041,1;
monster "in_rogue.gat",88,187,"Mummy",1041,1;
monster "in_rogue.gat",88,188,"Mummy",1041,1;
end;
}
-in_rogue.gat,225,187,0 script rogue_mob12 139,0,8,
-{
+in_rogue.gat,225,187,0 script rogue_mob12 139,0,8,{
monster "in_rogue.gat",232,191,"Abyss Knight",1219,1;
monster "in_rogue.gat",233,190,"Abyss Knight",1219,1;
monster "in_rogue.gat",234,189,"Abyss Knight",1219,1;
end;
}
-in_rogue.gat,252,320,0 script rogue_mob13 139,0,8,
-{
+in_rogue.gat,252,320,0 script rogue_mob13 139,0,8,{
monster "in_rogue.gat",252,319,"Mummy",1041,1;
monster "in_rogue.gat",252,321,"Mummy",1041,1;
monster "in_rogue.gat",252,319,"Ghoul",1036,1;
@@ -926,8 +909,7 @@ in_rogue.gat,370,320,0 script rogue04 45,1,1,
//================================================
// Timer: Keeps monsters from overspawning
//================================================
-- script RogueTest3 -1,
-{
+- script RogueTest3 -1,{
end;
OnMinute10: