From 89a6fd37915266094dcc4cfb7cefac2b0ff34f38 Mon Sep 17 00:00:00 2001 From: ajarn Date: Wed, 22 Dec 2004 07:33:09 +0000 Subject: git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@715 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 ++ npc/cities/alberta.txt | 21 +++++--------- npc/cities/aldebaran.txt | 6 ++-- npc/cities/comodo.txt | 27 ++++++------------ npc/cities/geffen.txt | 21 +++++--------- npc/cities/morocc.txt | 3 +- npc/cities/prontera.txt | 3 +- npc/cities/yuno.txt | 30 +++++++------------ npc/guides/guides_yun.txt | 21 +++++--------- npc/guild/gefg/gefg_flags.txt | 15 ++++------ npc/guild/gefg/gefg_kafras.txt | 15 ++++------ npc/guild/payg/payg_flags.txt | 15 ++++------ npc/guild/prtg/prtg_flags.txt | 15 ++++------ npc/guild/prtg/prtg_kafras.txt | 2 +- npc/jobs/1-1/acolyte.txt | 3 +- npc/jobs/1-1/archer.txt | 3 +- npc/jobs/1-1/mage.txt | 9 ++---- npc/jobs/1-1/merchant.txt | 15 ++++------ npc/jobs/1-1/swordsman.txt | 6 ++-- npc/jobs/1-1/thief.txt | 9 ++---- npc/jobs/2-1/assassin.txt | 48 +++++++++++-------------------- npc/jobs/2-1/hunter.txt | 12 +++----- npc/jobs/2-1/knight.txt | 36 ++++++++--------------- npc/jobs/2-1/priest.txt | 6 ++-- npc/jobs/2-1/wizard.txt | 24 ++++++---------- npc/jobs/2-2/alchemist.txt | 18 ++++-------- npc/jobs/2-2/rogue.txt | 54 ++++++++++++----------------------- npc/merchants/alchemist.txt | 3 +- npc/merchants/dye_maker.txt | 3 +- npc/merchants/grandpa_pharmacist.txt | 3 +- npc/merchants/refine.txt | 3 +- npc/other/msg_boards.txt | 45 ++++++++++------------------- npc/other/pvp.txt | 18 ++++-------- npc/quests/bunnyband.txt | 3 +- npc/quests/juice_maker.txt | 9 ++---- npc/quests/monstertamers.txt | 9 ++---- npc/quests/mrsmile.txt | 3 +- npc/quests/quests_alberta.txt | 9 ++---- npc/quests/quests_comodo.txt | 3 +- npc/quests/quests_payon.txt | 3 +- npc/quests/quests_prontera.txt | 3 +- npc/quests/quests_yuno.txt | 3 +- npc/quests/skills/acolyte_skills.txt | 3 +- npc/quests/skills/archer_skills.txt | 6 ++-- npc/quests/skills/mage_skills.txt | 3 +- npc/quests/skills/merchant_skills.txt | 12 +++----- npc/quests/skills/novice_skills.txt | 9 ++---- npc/quests/skills/thief_skills.txt | 6 ++-- 48 files changed, 202 insertions(+), 397 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 33ff11369..c2a060bd6 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -37,6 +37,9 @@ Other Ppl Date Added ====== 12/21 + * Corrected position of start { in a crap load of scripts. [Ajarn] + - jA decided that it had to be on the definition line + - So, if it wasn't, hte next script wouldn't load * Corrected script errors in devnpc.txt [celest] 12/20 diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index bc1ac9be5..4d2be5730 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -202,8 +202,7 @@ alberta.gat,131,139,4 script Drunken old man 709,{ } // Soda Man ---------------------------------------------------- -alberta.gat,90,71,3 script Soda Man 89, -{ +alberta.gat,90,71,3 script Soda Man 89,{ mes "[Soda Man]"; mes "Ummm.... delicious...."; emotion 33; @@ -362,8 +361,7 @@ alb2trea.gat,39,50,5 script Sailor 100,{ //<====================================================== Turtle Island ========================================================>\\ // Gotanblue -------------------------------------------------------------------------- -alberta.gat,247,123,5 script Gotanblue 709, -{ +alberta.gat,247,123,5 script Gotanblue 709,{ if(TURTLE == 1) goto L_Turtle; mes "[Gotanblue]"; mes "Ha ha! The sea seems endless!! We cannot begin to grasp it's size merely by gazing at it from land...."; @@ -533,8 +531,7 @@ M_Menu: } // Turtle Grandpa ------------------------------------------------------------------- -alberta_in.gat,23,104,2 script Turtle Grandpa 120, -{ +alberta_in.gat,23,104,2 script Turtle Grandpa 120,{ mes "[Turtle Grandpa]"; mes "~Buuurrrpp!!!~ Oops..."; emotion 4; @@ -646,8 +643,7 @@ alberta_in.gat,23,104,2 script Turtle Grandpa 120, } // Letter of an explorer (on Turtle Grandpa's desk)------------------------------------------------------------------ -alberta_in.gat,17,101,1 script Letter of an explorer 111, -{ +alberta_in.gat,17,101,1 script Letter of an explorer 111,{ mes "~ The letter reads... ~"; mes "- O/X/XOVX -"; mes "If you find this letter, it means that our expidition to Turtle Island has failed. Please inform the others..."; @@ -670,8 +666,7 @@ alberta_in.gat,17,101,1 script Letter of an explorer 111, } // Jornadan Niliria ------------------------------------------------------------------------ -alberta.gat,248,90,1 script Jornadan Niliria 121, -{ +alberta.gat,248,90,1 script Jornadan Niliria 121,{ mes "[Jornadan Niliria]"; mes "Sometimes I think that the world around me is ever changing."; mes "When I view the land it seems different, when I look up at the sky it too seems different...."; @@ -729,8 +724,7 @@ alberta.gat,248,90,1 script Jornadan Niliria 121, } // Jornadan's Voyage Log ------------------------------------------------- -alberta.gat,247,93,1 script A Voyage Log 111, -{ +alberta.gat,247,93,1 script A Voyage Log 111,{ if(JORNADAN == 1) goto L_Treasure; mes "[A Voyage Log]"; mes "= 03:20 am ="; @@ -852,8 +846,7 @@ L_Treasure: } // Burried treasure -------------------------------------------------------------------- -turn_dun01,160,80,1 script Skull Stone 111, -{ +turn_dun01,160,80,1 script Skull Stone 111,{ if(SKULLKEY == 1) goto L_OpenBox; mes "^5555FF(It's a frightening stone tomb with horrible skull on it.)^000000"; close; diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 450e99ed3..b5975e4f3 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -834,8 +834,7 @@ aldeba_in.gat,24,245,4 script Kafra Jasmine 115,{ } // Special Reserve ---------------------------------------------- -aldeba_in.gat,79,161,6 script Kafra 115, -{ +aldeba_in.gat,79,161,6 script Kafra 115,{ cutin "kafra_03",2; mes "[Kafra]"; mes "Welcome, ^6666FF" + strcharinfo(0) + "^000000. This is where you can trade in your special reserve points for usefull items and cool prizes."; @@ -1022,8 +1021,7 @@ M_Menu: } // Special Reserve 2 ---------------------------------------------- -aldeba_in.gat,88,161,3 script Kafra 115, -{ +aldeba_in.gat,88,161,3 script Kafra 115,{ cutin "kafra_03",2; mes "[Kafra]"; mes "Hello and welcome to the Kafra Corp. Main office."; diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index ed7dd3700..2c14e3e48 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -255,8 +255,7 @@ cmd_in02.gat,48,55,4 script Scoursege 51,{ // Chief Quest (Doomed Swords Part 1) //============================================================================// //======================================================= -comodo.gat,206,310,4 script Rochito 48, -{ +comodo.gat,206,310,4 script Rochito 48,{ if(dmdswrd_Q == 1) goto L_1; if(dmdswrd_Q == 2) goto L_2; if(dmdswrd_Q == 3) goto sL_2; @@ -385,8 +384,7 @@ L_3: } //======================================================= -comodo.gat,204,310,4 script Rockha 98, -{ +comodo.gat,204,310,4 script Rockha 98,{ if(dmdswrd_Q == 3) goto L_1; if(dmdswrd_Q == 4 || dmdswrd_Q==5) goto L_2; L_0: @@ -439,8 +437,7 @@ L_2: } //======================================================= -comodo.gat,209,314,4 script Rotute 82, -{ +comodo.gat,209,314,4 script Rotute 82,{ if(dmdswrd_Q==2 || dmdswrd_Q==3) goto L_1; if(dmdswrd_Q == 4 || dmdswrd_Q==5) goto L_2; @@ -556,8 +553,7 @@ comodo.gat,209,305,4 script Emralhandas 70,{ // Chief's House =========================================================// -cmd_in02.gat,32,140,4 script Chief Tausupa 49, -{ +cmd_in02.gat,32,140,4 script Chief Tausupa 49,{ if(dmdswrd_Q == 1) goto L_1; if(dmdswrd_Q == 2) goto sL_1; if(dmdswrd_Q == 3) goto L_2; @@ -671,8 +667,7 @@ L_2: //============================================================================// //======================================================= -comodo.gat,88,97,4 script Cheese Expert TORUNA 109, -{ +comodo.gat,88,97,4 script Cheese Expert TORUNA 109,{ if(dmdswrd_Q == 7) goto sL_2; mes "[TORUNA]"; mes "I hear that the cheese here is delicious. Everytime I come here to visit, I ask for some of that popular cheese."; @@ -761,8 +756,7 @@ M_Menu: } //======================================================= -comodo.gat,164,291,2 script Rakusa 73, -{ +comodo.gat,164,291,2 script Rakusa 73,{ if(dmdswrd_Q == 7) goto L_1; if(dmdswrd_Q == 8) goto L_2; @@ -794,8 +788,7 @@ L_2: } //======================================================= -comodo.gat,169,284,4 script Kichiri 99, -{ +comodo.gat,169,284,4 script Kichiri 99,{ mes "[Kichiri]"; if(dmdswrd_Q == 8) goto L_1; if(dmdswrd_Q == 9) goto L_2; @@ -823,8 +816,7 @@ L_2: } //======================================================= -comodo.gat,163,280,4 script Magatu 55, -{ +comodo.gat,163,280,4 script Magatu 55,{ mes "[Magatu]"; if(dmdswrd_Q == 9) goto L_1; if(dmdswrd_Q == 10) goto L_2; @@ -918,8 +910,7 @@ L_2: } //======================================================= -comodo.gat,187,153,4 script Hullaris 701, -{ +comodo.gat,187,153,4 script Hullaris 701,{ mes "[Hullaris]"; if(dmdswrd_Q == 11) goto L_1; if(dmdswrd_Q == 12) goto L_2; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 4f8c32f3b..615f6a806 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -109,8 +109,7 @@ geffen_in.gat,34,170,0 script "Young man" 47,{ //<============================================ Inn =====================================================>\\ // Waitress --------------------------------------------------------------------------- -geffen_in.gat,70,67,5 script Waitress 80, -{ +geffen_in.gat,70,67,5 script Waitress 80,{ mes "[Waitress]"; mes "Ugh!! SO annoying! Why would you drink here when you could drink at the pub!? This is an Inn, not a pub!!"; mes "That man!... everytime he drinks... he gets like that! Ugh!!"; @@ -160,8 +159,7 @@ M_Menu: } // Merhcant Daven ------------------------------------------------------------------- -geffen_in.gat,79,75,2 script Merchant Daven 61, -{ +geffen_in.gat,79,75,2 script Merchant Daven 61,{ mes "[Merchant Daven]"; mes "Back in the day when I frist came to Geffen, the town was a very boring place to live in."; next; @@ -223,8 +221,7 @@ M_Menu: } // Drunkard ------------------------------------------------------------------- -geffen_in.gat,59,62,2 script Drunkard 120, -{ +geffen_in.gat,59,62,2 script Drunkard 120,{ mes "[Drunkard]"; mes "Hmm... You're Joshua's friend too??"; next; @@ -258,8 +255,7 @@ geffen_in.gat,59,62,2 script Drunkard 120, } // Schubaltzwald Merchant ---------------------------------------------------------------------- -geffen_in.gat,113,73,4 script Schubaltzwald Merchant 709, -{ +geffen_in.gat,113,73,4 script Schubaltzwald Merchant 709,{ mes "[Schubaltzwald Merchant]"; mes "How are you, Rune-Midgard young'un? I am Schubaltzwald's one and only Hans Hadenhiem."; next; @@ -286,8 +282,7 @@ geffen_in.gat,113,73,4 script Schubaltzwald Merchant 709, //<============================================== Pub ==================================================>\\ // Waitress ----------------------------------------------------------------- -geffen_in.gat,28,134,4 script Waitress 69, -{ +geffen_in.gat,28,134,4 script Waitress 69,{ mes "[Waitress]"; mes "Meh! ALWAYS drinking and ALWAYS fighting..... HEY Mister! This is a place of BUSINESS!!"; emotion 6; @@ -327,8 +322,7 @@ M_Menu: } // Drunkard ---------------------------------------------------------------------------- -geffen_in.gat,21,125,5 script Drunkard 52, -{ +geffen_in.gat,21,125,5 script Drunkard 52,{ mes "[Drunkard]"; mes "You want to be an idiotic magician? Is that why you came here??"; emotion 1; @@ -336,8 +330,7 @@ geffen_in.gat,21,125,5 script Drunkard 52, } // Friend of Youth ----------------------------------------------------------------- -geffen_in.gat,37,124,5 script Friend of Youth 704, -{ +geffen_in.gat,37,124,5 script Friend of Youth 704,{ set @temp,0; mes "[Friend of Youth]"; mes "Welcome young one! Are you worrying about something? Tell me all your troubles and I will tell you your fortune with my silver ball of mystery!"; diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index 409ed7330..33f3eca14 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -388,8 +388,7 @@ moc_fild16.gat,199,212,4 script Hashisid 48,{ // Assassin Guild Guards //=================================================== -moc_fild16.gat,195,281,4 script Assassin Guardian#1::SinGuard 707, -{ +moc_fild16.gat,195,281,4 script Assassin Guardian#1::SinGuard 707,{ mes "[Assassin Guardian]"; if(Class == Job_Assassin) mes "Welcome."; if(Class == Job_Assassin) close; diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index 8dc1227eb..cf1122e0a 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -388,8 +388,7 @@ prt_church.gat,103,76,2 script Garnet 67,{ // ----------------------------------------------------------------------------------------------- PUB -----------------------------------------------------------------------------------------------------\\ // Sir Michael (West End Pub) -prt_in.gat,26,30,1 script Sir Michael 54, -{ +prt_in.gat,26,30,1 script Sir Michael 54,{ mes "[Sir Michael]"; mes "I dunno if you'll ever believe me, but I saw the WEIRDEST thing down in the ^5555FFCulvert Sewers^000000."; mes "I've been training in the 3rd level of the sewers for a long time now, so there's nothing about that area that I don't know."; diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index e6199a54d..b44ce4a43 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -100,8 +100,7 @@ yuno.gat,158,205,4 script Artisan 54,{ } //====================================================================================== -yuno.gat,336,227,4 script Yuno Granny 103, -{ +yuno.gat,336,227,4 script Yuno Granny 103,{ mes "[Granny]"; mes "Here you are......... I am an elderly Sage who can forsee everything before it happens."; next; @@ -119,8 +118,7 @@ yuno.gat,336,227,4 script Yuno Granny 103, } //======================================================================================== -yuno.gat,329,239,4 script Yuno Fighter 732, -{ +yuno.gat,329,239,4 script Yuno Fighter 732,{ mes "[Sergiof]"; mes "My name is Sergiof and I am Granny's protector."; next; @@ -137,8 +135,7 @@ yuno.gat,329,239,4 script Yuno Fighter 732, } //======================================================================================== -yuno.gat,344,68,4 script Yuno Tyrant 730, -{ +yuno.gat,344,68,4 script Yuno Tyrant 730,{ mes "[Ninno]"; mes "Have you ever heard of an Egyptian king who was once believed to be the son of a god?"; mes "His name was ^5533FF'Pharaoh'^000000"; @@ -173,8 +170,7 @@ yuno.gat,261,98,4 script Ykla 735,{ } //========================================================================================= -yuno.gat,306,207,6 script Sage Sykla 735, -{ +yuno.gat,306,207,6 script Sage Sykla 735,{ mes "[Sykla]"; mes "There is talk about a suspicious man living somewhere here in Yuno."; mes "Apparently he is a dangerous person who is immersed in some kind of wicked research."; @@ -196,8 +192,7 @@ yuno.gat,306,207,6 script Sage Sykla 735, } //========================================================================================== -yuno.gat,162,328,4 script Sage Eskla 735, -{ +yuno.gat,162,328,4 script Sage Eskla 735,{ mes "[Eskla]"; mes "I remember seeing it once........ Yeah... I remember now....... "; mes "There was this piece of paper floating in the air. I asked myself, 'Hmm... who lost a piece of paper out here?'."; @@ -288,8 +283,7 @@ yuno.gat,80,150,4 script Young Woman 746,{ //===================================================================================================// //======================================================================== -yuno_in03.gat,25,39,3 script Metto 709, -{ +yuno_in03.gat,25,39,3 script Metto 709,{ mes "[Metto]"; if(metto_q == 2 || metto_q == 4 || metto_q == 6) goto L_Check; if(metto_q == 1) goto L_Stang; @@ -387,8 +381,7 @@ L_Done: } //===================================================================== -yuno_in01.gat,18,95,5 script Stangckle 99, -{ +yuno_in01.gat,18,95,5 script Stangckle 99,{ mes "[Stangckle]"; if(metto_q > 2) goto L_Done; if(metto_q == 2) goto L_Start; @@ -439,8 +432,7 @@ L_Done: } //=================================================================== -yuno_in01.gat,19,182,3 script Kato 55, -{ +yuno_in01.gat,19,182,3 script Kato 55,{ mes "[Kato]"; if(metto_q > 4) goto L_Done; if(metto_q == 4) goto L_Start; @@ -482,8 +474,7 @@ L_Done: } //=================================================================== -yuno_in03.gat,179,43,5 script CiCi 121, -{ +yuno_in03.gat,179,43,5 script CiCi 121,{ mes "[CiCi]"; if(metto_q > 6) goto L_Done; mes "My name is ^5533FFCiCi^000000. I am one of the ^5533FF3 great scientists^000000 that live in this city."; @@ -529,8 +520,7 @@ L_Done: } //=================================================================== -yuno_in01.gat,18,30,3 script Wagan 85, -{ +yuno_in01.gat,18,30,3 script Wagan 85,{ mes "[Wagan]"; if(metto_q > 0) goto L_Check; mes "I'm sure you know that our village has been able to prosper for many years because of the brilliant research done here."; diff --git a/npc/guides/guides_yun.txt b/npc/guides/guides_yun.txt index 0a73f9457..f8fe74082 100644 --- a/npc/guides/guides_yun.txt +++ b/npc/guides/guides_yun.txt @@ -26,8 +26,7 @@ yuno.gat,153,47,4 script Yuno Guide 700,{ } //===================================================================== -yuno.gat,333,182,2 script Yuno Soldier 105, -{ +yuno.gat,333,182,2 script Yuno Soldier 105,{ cutin "prt_soldier",2; set @name$, "[Yuno Soldier]"; set @menu1$, "^5533FF'Dagger of Counter'^000000....."; @@ -42,8 +41,7 @@ yuno.gat,333,182,2 script Yuno Soldier 105, } //===================================================================== -yuno.gat,264,320,2 script Yuno Soldier 105, -{ +yuno.gat,264,320,2 script Yuno Soldier 105,{ cutin "prt_soldier",2; set @name$, "[Yuno Soldier]"; set @menu1$, "Holy shield, ^5533FF'Sacred Mission'^000000....."; @@ -58,8 +56,7 @@ yuno.gat,264,320,2 script Yuno Soldier 105, } //===================================================================== -yuno.gat,228,292,2 script Yuno Soldier 105, -{ +yuno.gat,228,292,2 script Yuno Soldier 105,{ cutin "prt_soldier",2; set @name$, "[Yuno Soldier]"; set @menu1$, "^FF3355'False Angel'^000000....."; @@ -74,8 +71,7 @@ yuno.gat,228,292,2 script Yuno Soldier 105, } //===================================================================== -yuno.gat,164,283,4 script Yuno Soldier 105, -{ +yuno.gat,164,283,4 script Yuno Soldier 105,{ cutin "prt_soldier",2; set @name$, "[Yuno Soldier]"; set @menu1$, "^FF3355'Geographer'^000000....."; @@ -91,8 +87,7 @@ yuno.gat,164,283,4 script Yuno Soldier 105, } //===================================================================== -yuno.gat,151,283,4 script Yuno Soldier 105, -{ +yuno.gat,151,283,4 script Yuno Soldier 105,{ cutin "prt_soldier",2; set @name$, "[Yuno Soldier]"; set @menu1$, "^FF3355'Lava Golem'^000000....."; @@ -111,8 +106,7 @@ yuno.gat,151,283,4 script Yuno Soldier 105, } //===================================================================== -yuno.gat,164,228,4 script Yuno Soldier 105, -{ +yuno.gat,164,228,4 script Yuno Soldier 105,{ cutin "prt_soldier",2; set @name$, "[Yuno Soldier]"; set @menu1$, "Killer ^FF3355'Goats'^000000....."; @@ -127,8 +121,7 @@ yuno.gat,164,228,4 script Yuno Soldier 105, } //===================================================================== -yuno.gat,151,228,4 script Yuno Soldier 105, -{ +yuno.gat,151,228,4 script Yuno Soldier 105,{ cutin "prt_soldier",2; set @name$, "[Yuno Soldier]"; set @menu1$, "Large Jellopy....."; diff --git a/npc/guild/gefg/gefg_flags.txt b/npc/guild/gefg/gefg_flags.txt index 8f1e30d0c..bad3a95a8 100644 --- a/npc/guild/gefg/gefg_flags.txt +++ b/npc/guild/gefg/gefg_flags.txt @@ -17,8 +17,7 @@ //================================================================================// // Castle 1 //================================================================================// -geffen.gat,109,123,2 script Reprion#g1-1::Reprion 722, -{ +geffen.gat,109,123,2 script Reprion#g1-1::Reprion 722,{ callfunc "F_Flags","Geffen","gefg_cas01",83,47; close; @@ -45,8 +44,7 @@ gefg_cas01.gat,64,16,4 duplicate(Reprion) Reprion#g1-12 722 //===================================================================================// // Castle 2 //===================================================================================// -geffen.gat,112,129,1 script Yolbriger#g2-1::Yolbriger 722, -{ +geffen.gat,112,129,1 script Yolbriger#g2-1::Yolbriger 722,{ callfunc "F_Flags","Geffen","gefg_cas02",23,66; close; @@ -73,8 +71,7 @@ gefg_cas02.gat,68,36,2 duplicate(Yolbriger) Yolbriger#g2-12 722 //================================================================================// // Castle 3 //================================================================================// -geffen.gat,120,132,8 script Isinlife#g3-1::Isinlife 722, -{ +geffen.gat,120,132,8 script Isinlife#g3-1::Isinlife 722,{ callfunc "F_Flags","Geffen","gefg_cas03",116,89; close; @@ -104,8 +101,7 @@ gefg_cas03.gat,34,208,1 duplicate(Isinlife) Isinlife#g3-15 722 //================================================================================// // Castle 4 //================================================================================// -geffen.gat,127,130,7 script Berigel#g4-1::Berigel 722, -{ +geffen.gat,127,130,7 script Berigel#g4-1::Berigel 722,{ callfunc "F_Flags","Geffen","gefg_cas04",59,70; close; @@ -131,8 +127,7 @@ gefg_cas04.gat,35,73,4 duplicate(Berigel) Berigel#g4-11 722 //================================================================================// // Castle 5 //================================================================================// -geffen.gat,131,123,6 script Melsedetsu#g5-1::Melsedetsu 722, -{ +geffen.gat,131,123,6 script Melsedetsu#g5-1::Melsedetsu 722,{ callfunc "F_Flags","Geffen","gefg_cas05",61,52; close; diff --git a/npc/guild/gefg/gefg_kafras.txt b/npc/guild/gefg/gefg_kafras.txt index 94eaa093a..82daa84cb 100644 --- a/npc/guild/gefg/gefg_kafras.txt +++ b/npc/guild/gefg/gefg_kafras.txt @@ -17,8 +17,7 @@ // Castle 1 =============================================== //gefg_cas01.gat,96,173,0 script Kafra Service#G01 117,{ -gefg_cas01.gat,35,37,0 script Kafra Service#G01 117, -{ +gefg_cas01.gat,35,37,0 script Kafra Service#G01 117,{ callfunc "F_GKafra", "gefg_cas01", "Geffen"; end; OnRecvCastleG01: @@ -28,8 +27,7 @@ OnRecvCastleG01: // Castle 2 =============================================== -gefg_cas02.gat,23,66,3 script Kafra Service#G02 117, -{ +gefg_cas02.gat,23,66,3 script Kafra Service#G02 117,{ callfunc "F_GKafra", "gefg_cas02", "Geffen"; end; OnRecvCastleG02: @@ -39,8 +37,7 @@ OnRecvCastleG02: // Castle 3 =============================================== -gefg_cas03.gat,116,89,5 script Kafra Service#G03 117, -{ +gefg_cas03.gat,116,89,5 script Kafra Service#G03 117,{ callfunc "F_GKafra", "gefg_cas03", "Geffen"; end; OnRecvCastleG03: @@ -50,8 +47,7 @@ OnRecvCastleG03: // Castle 4 =============================================== -gefg_cas04.gat,59,70,3 script Kafra Service#G04 117, -{ +gefg_cas04.gat,59,70,3 script Kafra Service#G04 117,{ callfunc "F_GKafra", "gefg_cas04", "Geffen"; end; OnRecvCastleG04: @@ -61,8 +57,7 @@ OnRecvCastleG04: // Castle 5 =============================================== -gefg_cas05.gat,61,52,5 script Kafra Service#G05 117, -{ +gefg_cas05.gat,61,52,5 script Kafra Service#G05 117,{ callfunc "F_GKafra", "gefg_cas05", "Geffen"; end; OnRecvCastleG05: diff --git a/npc/guild/payg/payg_flags.txt b/npc/guild/payg/payg_flags.txt index 619cddaf7..2d553a45b 100644 --- a/npc/guild/payg/payg_flags.txt +++ b/npc/guild/payg/payg_flags.txt @@ -17,8 +17,7 @@ //============================================================================// // Castle 1 //============================================================================// -payon.gat,165,177,3 script Mingting#f1-1::Mingting 722, -{ +payon.gat,165,177,3 script Mingting#f1-1::Mingting 722,{ callfunc "F_Flags","Payon","payg_cas01",87,29; close; @@ -44,8 +43,7 @@ payg_cas01.gat,212,108,4 duplicate(Mingting) Mingting#f1-11 722 //===========================================================================// // Castle 2 //============================================================================// -payon.gat,165,173,3 script Tiantan#f2-1::Tiantan 722, -{ +payon.gat,165,173,3 script Tiantan#f2-1::Tiantan 722,{ callfunc "F_Flags","Payon","payg_cas02",25,266; close; @@ -71,8 +69,7 @@ payg_cas02.gat,70,282,4 duplicate(Tiantan) Tiantan#f2-11 722 //============================================================================// // Castle 3 //============================================================================// -payon.gat,165,169,3 script Fuying#f3-1::Fuying 722, -{ +payon.gat,165,169,3 script Fuying#f3-1::Fuying 722,{ callfunc "F_Flags","Payon","payg_cas03",9,263; close; @@ -98,8 +95,7 @@ payg_cas03.gat,43,31,4 duplicate(Fuying) Fuying#f3-11 722 //============================================================================// // Castle 4 //============================================================================// -payon.gat,165,165,3 script Honglou#f4-1::Honglou 722, -{ +payon.gat,165,165,3 script Honglou#f4-1::Honglou 722,{ callfunc "F_Flags","Payon","payg_cas04",40,235; close; @@ -125,8 +121,7 @@ payg_cas04.gat,239,181,4 duplicate(Honglou) Honglou#f4-11 722 //============================================================================// // Castle 5 //============================================================================// -payon.gat,165,161,3 script Zhulinxian#f5-1::Zhulinxian 722, -{ +payon.gat,165,161,3 script Zhulinxian#f5-1::Zhulinxian 722,{ callfunc "F_Flags","Payon","payg_cas05",276,227; close; diff --git a/npc/guild/prtg/prtg_flags.txt b/npc/guild/prtg/prtg_flags.txt index c43d2b2ec..c277d1907 100644 --- a/npc/guild/prtg/prtg_flags.txt +++ b/npc/guild/prtg/prtg_flags.txt @@ -17,8 +17,7 @@ //================================================================================// // Castle 1 //================================================================================// -prontera.gat,155,190,4 script Creamhilt#p1-1::Creamhilt 722, -{ +prontera.gat,155,190,4 script Creamhilt#p1-1::Creamhilt 722,{ callfunc "F_Flags","Prontera","prtg_cas01",97,174; close; @@ -49,8 +48,7 @@ prtg_cas01.gat,45,46,4 duplicate(Creamhilt) Creamhilt#p1-16 722 //================================================================================// // Castle 2 //================================================================================// -prontera.gat,146,194,3 script Sbanhealt#p2-1::Sbanhealt 722, -{ +prontera.gat,146,194,3 script Sbanhealt#p2-1::Sbanhealt 722,{ callfunc "F_Flags","Prontera","prtg_cas02",71,36; close; @@ -84,8 +82,7 @@ prtg_cas02.gat,162,161,4 duplicate(Sbanhealt) Sbanhealt#p2-18 722 //================================================================================// // Castle 3 //================================================================================// -prontera.gat,143,203,2 script Lazrigees#p3-1::Lazrigees 722, -{ +prontera.gat,143,203,2 script Lazrigees#p3-1::Lazrigees 722,{ callfunc "F_Flags","Prontera","prtg_cas03",45,99; close; @@ -116,8 +113,7 @@ prtg_cas03.gat,165,201,4 duplicate(Lazrigees) Lazrigees#p3-16 722 //================================================================================// // Castle 4 //================================================================================// -prontera.gat,167,203,6 script Squagul#p4-1::Squagul 722, -{ +prontera.gat,167,203,6 script Squagul#p4-1::Squagul 722,{ callfunc "F_Flags","Prontera","prtg_cas04",259,265; close; @@ -149,8 +145,7 @@ prtg_cas04.gat,263,27,4 duplicate(Squagul) Squagul#p4-16 722 //================================================================================// // Castle 5 //================================================================================// -prontera.gat,165,194,5 script Guindull#p5-1::Guindull 722, -{ +prontera.gat,165,194,5 script Guindull#p5-1::Guindull 722,{ callfunc "F_Flags","Prontera","prtg_cas05",34,30; close; diff --git a/npc/guild/prtg/prtg_kafras.txt b/npc/guild/prtg/prtg_kafras.txt index b14db6b9e..ace8cb1c3 100644 --- a/npc/guild/prtg/prtg_kafras.txt +++ b/npc/guild/prtg/prtg_kafras.txt @@ -36,7 +36,7 @@ OnRecvCastlePt02: // Castle 3 ======================== -//prtg_cas03.gat,181,215,4 script Kafra Service#Pt03 117, +//prtg_cas03.gat,181,215,4 script Kafra Service#Pt03 117,{ prtg_cas03.gat,39,99,4 script Kafra Service#Pt03 117,{ callfunc "F_GKafra", "prtg_cas03", "Prontera"; end; diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt index df02e4310..142fa635b 100644 --- a/npc/jobs/1-1/acolyte.txt +++ b/npc/jobs/1-1/acolyte.txt @@ -16,8 +16,7 @@ // -- Father Mareusis -- -prt_church.gat,184,41,4 script "Father Mareusis" 60, -{ +prt_church.gat,184,41,4 script "Father Mareusis" 60,{ mes "[Father Mareusis]"; if(Class==Job_Novice && job_acolyte_q > 0) goto L_Check; mes "What is it you are looking for?"; diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt index 0d2d0c6e2..32518a9b3 100644 --- a/npc/jobs/1-1/archer.txt +++ b/npc/jobs/1-1/archer.txt @@ -14,8 +14,7 @@ // -- Archer Guildsman -- -payon_in02.gat,64,71,4 script Archer Guildsman 59, -{ +payon_in02.gat,64,71,4 script Archer Guildsman 59,{ mes "[Archer Guildsman]"; if(Class==Job_Novice && job_archer_q == 1) goto L_Check; mes "Good Day. How may I help you?"; diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt index 05e74513a..0b234fb99 100644 --- a/npc/jobs/1-1/mage.txt +++ b/npc/jobs/1-1/mage.txt @@ -15,8 +15,7 @@ // -- Expert Mage -- -geffen_in.gat,164,124,4 script Expert Mage 123, -{ +geffen_in.gat,164,124,4 script Expert Mage 123,{ if(Class==Job_Novice && job_magician_q >= 1) goto L_BeMage; mes "[Expert Mage]"; @@ -148,8 +147,7 @@ L_BeMage: } // -- Solutions Guide Book -- -geffen_in.gat,177,112,1 script Solutions Guide Book 111, -{ +geffen_in.gat,177,112,1 script Solutions Guide Book 111,{ mes "[Solutions Guide Book]"; mes "I belong to Geffen Magic Academy. Please handle with care."; next; @@ -249,8 +247,7 @@ geffen_in.gat,177,112,1 script Solutions Guide Book 111, } // -- Mixing Machine -- -geffen_in.gat,164,112,1 script Mixing Machine 111, -{ +geffen_in.gat,164,112,1 script Mixing Machine 111,{ mes "[Mixing Machine]"; mes "This is the unique Mixing Machine designed only for making magic solutions. It is the property of the Geffen Magic Academy."; next; diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt index 8204df6a9..49ca27475 100644 --- a/npc/jobs/1-1/merchant.txt +++ b/npc/jobs/1-1/merchant.txt @@ -15,8 +15,7 @@ // == Guild NPCs == // -- Mahnsoo -- -alberta_in.gat,53,43,6 script Chief Mahnsoo 86, -{ +alberta_in.gat,53,43,6 script Chief Mahnsoo 86,{ mes "[Chief Mahnsoo]"; if(Class==Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc; if(Class==Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt; @@ -396,8 +395,7 @@ L_Failed: // -- Wharehouse Manager Kay -- -alberta_in.gat,28,29,2 script Merchant Guildsman 83, -{ +alberta_in.gat,28,29,2 script Merchant Guildsman 83,{ if(Class==Job_Novice && job_merchant_q3 > 0) goto L_Check; mes "[Wharehouse Manager Kay]"; @@ -716,8 +714,7 @@ L_WrongDest: } // -- Kafra(Prontera) -- -prontera.gat,248,42,8 script Kafra 115, -{ +prontera.gat,248,42,8 script Kafra 115,{ cutin "kafra_03",2; if(Class==Job_Novice && job_merchant_q3>0) goto L_Start; L_Other: @@ -824,8 +821,7 @@ L_WrongDest: // == Other Npcs == // -- Guild Staff -- -geffen_in.gat,155,122,4 script Guild Staff 47, -{ +geffen_in.gat,155,122,4 script Guild Staff 47,{ if(Class==Job_Novice && job_merchant_q3>0) goto L_Start; L_Other: @@ -896,8 +892,7 @@ L_WrongProd: // -- Dyer's Student -- -morocc_in.gat,140,102,4 script Dyer's Student 86, -{ +morocc_in.gat,140,102,4 script Dyer's Student 86,{ if(Class==Job_Novice && job_merchant_q3>0) goto L_Start; L_Other: diff --git a/npc/jobs/1-1/swordsman.txt b/npc/jobs/1-1/swordsman.txt index 68447a583..cf6b62c7b 100644 --- a/npc/jobs/1-1/swordsman.txt +++ b/npc/jobs/1-1/swordsman.txt @@ -39,8 +39,7 @@ sword_1-1.gat,200,63,0,0 monster Fabre 1184,2,0,0,0 // == Warp == // -- Warp to test room -- -izlude_in.gat,62,170,0 script w1039 45,1,1, -{ +izlude_in.gat,62,170,0 script w1039 45,1,1,{ if(Class==Job_Novice && job_sword_q > 0) warp "izlude_in.gat",40,170; if(job_sword_q == 0) doevent "Swordsman::OnStart"; end; @@ -49,8 +48,7 @@ izlude_in.gat,62,170,0 script w1039 45,1,1, // == Npcs == // -- Master Swordsman -- -izlude_in.gat,74,172,5 script Master Swordsman 119, -{ +izlude_in.gat,74,172,5 script Master Swordsman 119,{ mes "[Master Swordsman]"; if(Class==Job_Novice && job_sword_q == 2) goto L_Done; mes "Welcome to the Swordsman Association! So.. What business brings you to us?"; diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt index 1acc28314..e73054ee9 100644 --- a/npc/jobs/1-1/thief.txt +++ b/npc/jobs/1-1/thief.txt @@ -23,8 +23,7 @@ job_thief1.gat,0,0,0,0 monster Spore 1014,30,0,0,0 // == NPCs == // -- Interviewer -- -moc_prydb1.gat,39,129,5 script Thief Guide 69, -{ +moc_prydb1.gat,39,129,5 script Thief Guide 69,{ if(Class== Job_Thief) goto L_JobThief; if(Class == Job_Novice) goto L_Start; @@ -232,8 +231,7 @@ M_Menu: // -- Test Grader -- -moc_prydb1.gat,42,133,2 script Comrade Brad 118, -{ +moc_prydb1.gat,42,133,2 script Comrade Brad 118,{ if(Class == 0) goto L_Novice; if(Class == 6) goto L_Thief; @@ -326,8 +324,7 @@ L_4: // -- Irrelevant Man -- -moc_ruins.gat,141,125,3 script Irrelevant Man 118, -{ +moc_ruins.gat,141,125,3 script Irrelevant Man 118,{ if(Class == 6) goto L_Thief; if(Class == 0) goto L_Novice; diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 7986cd91e..659da0c3d 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -1169,16 +1169,14 @@ OnFailed: } // Observer ===========================>\\ -in_moc_16.gat,62,153,1 script Observer 55, -{ +in_moc_16.gat,62,153,1 script Observer 55,{ mes "[Observer]"; mes "Don't mind me, I'm just here to see how well you do on your test....."; close; } // Warp ==============================>\\ -in_moc_16.gat,87,137,0 script sinWarp1 45,2,1, -{ +in_moc_16.gat,87,137,0 script sinWarp1 45,2,1,{ OnTimer30000: killmonsterall "in_moc_16.gat"; enablenpc "Thomas"; @@ -1187,8 +1185,7 @@ OnTimer30000: } // Booby Traps ========================>\\ -in_moc_16.gat,68,158,0 script 01_1::SinTrap 139,0,0, -{ +in_moc_16.gat,68,158,0 script 01_1::SinTrap 139,0,0,{ stopnpctimer "TimerSin"; warp "in_moc_16.gat", 19, 161; killmonsterall "in_moc_16.gat"; @@ -1434,8 +1431,7 @@ OnTimer188000: //=============================================// // Warp //=============================================// -in_moc_16.gat,182,169,1 script sinWarp3 45,1,1, -{ +in_moc_16.gat,182,169,1 script sinWarp3 45,1,1,{ if(getareausers(("in_moc_16.gat"),148,74,187,117) > 0) goto L_Wait; disablenpc "Huey#End"; disablenpc "Kai#End"; @@ -1457,8 +1453,7 @@ in_moc_16.gat,182,169,1 script sinWarp3 45,1,1, //==============================================// // Start Trigger ------------------------------------------------------------------ -in_moc_16.gat,167,114,3 script guildmaster_Trig#0 139,4,0, -{ +in_moc_16.gat,167,114,3 script guildmaster_Trig#0 139,4,0,{ mes "[Guild Master]"; mes "Welcome ^5533FF" + strcharinfo(0) + "^000000. This is my private room."; next; @@ -1476,8 +1471,7 @@ in_moc_16.gat,167,114,3 script guildmaster_Trig#0 139,4,0, } // Guild Master ----------------------------------------------------------------------------- -in_moc_16.gat,149,80,4 script Guild Master 106,1,1, -{ +in_moc_16.gat,149,80,4 script Guild Master 106,1,1,{ end; OnTouch: @@ -1834,20 +1828,17 @@ sF_Questions2: //=============================================// // Maze Triggers //=============================================// -in_moc_16.gat,170,90,0 script maze_trig#1 139,0,0, -{ +in_moc_16.gat,170,90,0 script maze_trig#1 139,0,0,{ mes "[Guild Master]"; mes "There's no way to walk there, try another way."; close; } -in_moc_16.gat,150,85,0 script maze_trig#2 139,0,0, -{ +in_moc_16.gat,150,85,0 script maze_trig#2 139,0,0,{ mes "[Guild Master]"; mes ".... Getting warmer.... you're almost there....."; close; } -in_moc_16.gat,153,85,0 script maze_trig#3 139,0,0, -{ +in_moc_16.gat,153,85,0 script maze_trig#3 139,0,0,{ mes "[Guild Master]"; mes "You can't walk there.."; mes "Good, your almost there, keep walking."; @@ -1855,39 +1846,33 @@ in_moc_16.gat,153,85,0 script maze_trig#3 139,0,0, mes "you got to turn a round in order to get in."; close; } -in_moc_16.gat,160,85,0 script maze_trig#4 139,0,0, -{ +in_moc_16.gat,160,85,0 script maze_trig#4 139,0,0,{ mes "[Guild Master]"; mes "There's no way to walk there, try another way."; close; } -in_moc_16.gat,175,89,0 script maze_trig#5 139,0,0, -{ +in_moc_16.gat,175,89,0 script maze_trig#5 139,0,0,{ mes "[Guild Master]"; mes "That way leads to Botogun.."; mes "What are going to do there?"; close; } -in_moc_16.gat,164,88,0 script maze_trig#6 139,0,0, -{ +in_moc_16.gat,164,88,0 script maze_trig#6 139,0,0,{ mes "[Guild Master]"; mes "Good.... you're on the right track."; close; } -in_moc_16.gat,149,95,0 script maze_trig#7 139,0,0, -{ +in_moc_16.gat,149,95,0 script maze_trig#7 139,0,0,{ mes "[Guild Master]"; mes "Good, you found the path."; close; } -in_moc_16.gat,180,101,0 script maze_trig#8 139,0,0, -{ +in_moc_16.gat,180,101,0 script maze_trig#8 139,0,0,{ mes "[Guild Master]"; mes "... It looks like that's not that way..."; close; } -in_moc_16.gat,186,107,0 script maze_trig#9 139,0,0, -{ +in_moc_16.gat,186,107,0 script maze_trig#9 139,0,0,{ mes "[Guild Master]"; mes "...Not that way either..."; close; @@ -1897,8 +1882,7 @@ in_moc_16.gat,186,107,0 script maze_trig#9 139,0,0, //================================================// // Decoy Chief //================================================// -in_moc_16.gat,186,81,0 script Guild Master#2 55, -{ +in_moc_16.gat,186,81,0 script Guild Master#2 55,{ mes "[Guild Master Botogun]"; mes "I'm sorry but I am not the person in charge here."; mes "The real Guild Chief is on the other side."; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index b49b98d3f..b65b78720 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -35,8 +35,7 @@ pay_fild10.gat,148,251,4 script Hunter Guildsman 98,{ //<====================================== Job Changer ========================================>\\ -in_hunter.gat,99,99,4 script Hunter Sharon 727, -{ +in_hunter.gat,99,99,4 script Hunter Sharon 727,{ if(Class==Job_Archer) goto L_Start; if(Class==Job_Hunter) goto L_Hunt; if(callfunc("Is_Bow_Class")) goto L_Other; @@ -373,8 +372,7 @@ L_Change: //<=========================== Demon Hunter: Second Test ===============================>\\ -in_hunter.gat,55,99,7 script Demon Hunter 732, -{ +in_hunter.gat,55,99,7 script Demon Hunter 732,{ if(Class == Job_Archer) goto L_Arc; if(Class == Job_Hunter) goto L_Hnt; @@ -538,8 +536,7 @@ L_Done: //<=============================== Guild Master: Last Test =================================>\\ -payon_in02.gat,21,31,1 script Guild Master 59, -{ +payon_in02.gat,21,31,1 script Guild Master 59,{ if(Class == Job_Archer) goto L_Archer; if(Class == Job_Hunter) goto L_Hnt; @@ -835,8 +832,7 @@ OnTimer196000: } // SwitchHnt ------------------------------------------------------ -job_hunte.gat,93,101,1 script SwitchHnt 723, -{ +job_hunte.gat,93,101,1 script SwitchHnt 723,{ areaannounce "job_hunte.gat", 50, 64, 123, 143, "[Test Guide]: *** The exit has been activated! You have 30 sec. to find the exit!! *** ",8; enablenpc "ExitHnt"; addtimer 30000, "TimerHnt::OnTimer196000"; diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 70391767b..3171535b1 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -25,8 +25,7 @@ //<------------------------------------------------------------------------------------ Chivalry Captain Herman------------------------------------------------------------------------------------------>\\ -prt_in.gat,88,101,3 script Chivalry Captain Herman 56, -{ +prt_in.gat,88,101,3 script Chivalry Captain Herman 56,{ if (Class == Job_Swordman && KNIGHT_Q > 0) goto L_Check; mes "[Chivalry Captain Herman]"; @@ -225,8 +224,7 @@ L_Check: //<--------------------------------------------------------------------------------- Sir Andrew Syloc (1st test) ------------------------------------------------------------------------------------------>\\ -prt_in.gat,75,107,4 script SIr Andrew Syloc 65, -{ +prt_in.gat,75,107,4 script Sir Andrew Syloc 65,{ mes "[Sir Andrew Syloc]"; if (Class == Job_Knight) goto L_Knight; if (Class == Job_Novice) goto L_Novice; @@ -384,8 +382,7 @@ L_Check: //<------------------------------------------------------------------------------ Sir James Syracuse (2nd Test) ----------------------------------------------------------------------------------------->\\ -prt_in.gat,71,91,6 script Sir James Syracuse 65, -{ +prt_in.gat,71,91,6 script Sir James Syracuse 65,{ mes "[Sir James Syracuse]"; if (class == Job_Knight) goto L_Knight; if (class == Job_Novice) goto L_Novice; @@ -724,8 +721,7 @@ L_Test: //<--------------------------------------------------------------------------------- Sir Windsor (3rd Test) -------------------------------------------------------------------------------------------------->\\ // Sir Windsor --------------------------------------------------------- -prt_in.gat,79,94,3 script Sir Windsor#1 733, -{ +prt_in.gat,79,94,3 script Sir Windsor#1 733,{ mes "[Sir Windsor]"; if(Class == Job_Knight) goto L_Knight; if(Class == Job_Novice) goto L_Novice; @@ -793,8 +789,7 @@ L_Done: // Waiting Room --------------------------------------------------------------------------- -job_knt.gat,89,110,4, script Sir Windsor#2::SW2 733, -{ +job_knt.gat,89,110,4, script Sir Windsor#2::SW2 733,{ mes "[Sir Windsor]"; mes ".........."; next; @@ -885,8 +880,7 @@ OnStart: } // First Level --------------------------------------------------------- -job_knt.gat,1,1,1 script KntLvl1 -1, -{ +job_knt.gat,1,1,1 script KntLvl1 -1,{ set $@KntRm, 1; set $@KntMob,12; monster "job_knt.gat",39,150,"Dustiness",1114,1,"KntLvl1::OnMyMobDead"; @@ -917,8 +911,7 @@ OnMyMobDead: // Second Level --------------------------------------------------------- -job_knt.gat,1,1,1 script KntLvl2 -1, -{ +job_knt.gat,1,1,1 script KntLvl2 -1,{ set $@KntRm, 2; set $@KntMob,12; monster "job_knt.gat",53,52,"Frilldora",1119,1,"KntLvl2::OnMyMobDead"; @@ -950,8 +943,7 @@ OnMyMobDead: } // Third Level --------------------------------------------------------------- -job_knt.gat,1,1,1 script KntLvl3 -1, -{ +job_knt.gat,1,1,1 script KntLvl3 -1,{ set $@KntRm, 3; set $@KntMob,7; monster "job_knt.gat",136,152,"Knife Goblin Bro",1122,1,"KntLvl3::OnMyMobDead"; @@ -979,8 +971,7 @@ OnMyMobDead: } // Timer -------------------------------------------------------------------------------- -job_knt.gat,1,1,1 script TimerKnt -1, -{ +job_knt.gat,1,1,1 script TimerKnt -1,{ OnTimer2000: set $@KntTime$, "You have 3 minutes..."; @@ -1032,8 +1023,7 @@ AnnounceKnt: //<------------------------------------------------------------------------------------ Lady Amy Beatris (4th Test) ---------------------------------------------------------------------------------------------->\\ -prt_in.gat,69,107,5 script Lady Amy Beatris 728, -{ +prt_in.gat,69,107,5 script Lady Amy Beatris 728,{ mes "[Lady Amy Beatris]"; if (class == Job_Knight) goto L_Knight; if (class == Job_Novice) goto L_Novice; @@ -1348,8 +1338,7 @@ M_Menu: //<------------------------------------------------------------------------------------------- Sir Edmund (5th Test) --------------------------------------------------------------------------------------------->\\ -prt_in.gat,70,99,5 script Sir Edmund 734, -{ +prt_in.gat,70,99,5 script Sir Edmund 734,{ mes "[Sir Edmund]"; if (class == Job_Knight) goto L_Knight; if (class == Job_Swordman) goto L_Sword; @@ -1456,8 +1445,7 @@ L_Test: } // Test ----------------------------- -job_knt.gat,1,1,1 script ev_Test -1, -{ +job_knt.gat,1,1,1 script ev_Test -1,{ killmonster "job_knt.gat","ev_Test::OnMyMobDead"; monster "job_knt.gat",141,57,"Poring",1002,1,"ev_Test::OnMyMobDead"; monster "job_knt.gat",145,57,"Poring",1002,1,"ev_Test::OnMyMobDead"; diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index cb9bbe68b..6a852ffd8 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -23,8 +23,7 @@ //*********************************************************************************************************************************************************************************\\ //============================================ Father Thomas: Job changer, Test 1 =============================================\\ //*********************************************************************************************************************************************************************************\\ -prt_church.gat,16,41,4 script Father Thomas 60, -{ +prt_church.gat,16,41,4 script Father Thomas 60,{ mes "[Father Thomas]"; if (class == Job_Novice) goto L_Novice; if (class == Job_Priest) goto L_Priest; @@ -1134,8 +1133,7 @@ AnnouncePrst: //**********************************************************************************************************************************************************************************\\ //================================================= Sister Cecile: Test 3 =====================================================\\ //**********************************************************************************************************************************************************************************\\ -prt_church.gat,27,24,4 script Sister Cecile 79, -{ +prt_church.gat,27,24,4 script Sister Cecile 79,{ mes "[Sister Cecile]"; if(Class == Job_Priest) goto L_Prst; if(Class == Job_Acolyte) goto L_Aco; diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index d899a8ba4..f9f18d860 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -23,8 +23,7 @@ //<=================== Some dog =========================> -gef_tower.gat,107,35,5 script Some Dog 81, -{ +gef_tower.gat,107,35,5 script Some Dog 81,{ if(Class == Job_Mage) goto L_JobMage; if(callfunc("Is_Magic_Class")) goto L_Magic; if(callfunc("Is_Holy_Class")) goto L_Holy; @@ -153,8 +152,7 @@ L_JobMage: //<=========================================== Registrar and Examiner Catherine Medichi ==============================================>\\ -gef_tower.gat,111,37,4 script Catherine Medichi 68, -{ +gef_tower.gat,111,37,4 script Catherine Medichi 68,{ mes "[Catherine Medichi]"; if(Class == Job_Wizard) goto L_Wizard; if(Class == Job_Novice) goto L_Novice; @@ -495,8 +493,7 @@ L_Mage: //<================================================ Examiner: Raul Expagarus ==================================================>\\ -gef_tower.gat,102,24,3 script Raul Expagarus 735, -{ +gef_tower.gat,102,24,3 script Raul Expagarus 735,{ mes "[Raul Expagarus]"; if(Class == Job_Mage) goto L_Mage; if(Class == Job_Wizard) goto L_Wizard; @@ -1130,8 +1127,7 @@ L_Mage: <====================================================== Test Arena ========================================================>\\ // Test Guide --------------------------------------------------------------------------------- -job_wiz.gat,50,165,4 script Wizard Test Guide::WzTG 123, -{ +job_wiz.gat,50,165,4 script Wizard Test Guide::WzTG 123,{ mes "[Test Guide]"; mes "Welcome. I will be your guide for the Wizard Test."; next; @@ -1186,8 +1182,7 @@ OnStart: } // Room of Water ----------------------------------------------------------------------------- -job_wiz.gat,1,1,1 script WaterRm -1, -{ +job_wiz.gat,1,1,1 script WaterRm -1,{ set $@WzRm, 1; // used to determine which map area(room) to make time announcements in set $@WzMOB, 8; //used as a counter for the monsters that are summoned monster "job_wiz.gat",109,174,"Phen",1158,1,"WaterRm::OnMyMobDead1"; @@ -1239,8 +1234,7 @@ OnMyMobDead2: } // Room of Earth ----------------------------------------------------------------------------------------------- -job_wiz.gat,1,1,1 script EarthRm -1, -{ +job_wiz.gat,1,1,1 script EarthRm -1,{ set $@WzRm, 2; set $@WzMOB, 10; monster "job_wiz.gat",111,102,"Yoyo",1057,1,"EarthRm::OnMyMobDead1"; @@ -1296,8 +1290,7 @@ OnMyMobDead2: } // Room of Fire ------------------------------------------------------------------------------------------------------------ -job_wiz.gat,1,1,1 script FireRm -1, -{ +job_wiz.gat,1,1,1 script FireRm -1,{ set $@WzRm, 3; set $@WzMOB, 8; monster "job_wiz.gat",58,110,"Zerom",1178,1,"FireRm::OnMyMobDead1"; @@ -1349,8 +1342,7 @@ OnMyMobDead2: // Timer ----------------------------------------------------------------------------------------------- -job_wiz.gat,1,1,1 script TimerWz -1, -{ +job_wiz.gat,1,1,1 script TimerWz -1,{ OnTimer1000: if($@WzRm==1) areaannounce "job_wiz.gat", 98, 154, 129, 185, "[Test Guide]: Room of Water, testing will begin.",8; 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: diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index c0999273e..95703574d 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -11,8 +11,7 @@ //===== Additional Comments: ================================= //= Working. //============================================================ -alde_alche.gat,24,188,3 script Gever AI Sharp 740, -{ +alde_alche.gat,24,188,3 script Gever AI Sharp 740,{ mes "[Gever AI Sharp]"; mes "Welcome to the Alchemist Union."; mes "How can I assist you today?"; diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt index 456499f2f..a253ddcd1 100644 --- a/npc/merchants/dye_maker.txt +++ b/npc/merchants/dye_maker.txt @@ -15,8 +15,7 @@ // Dye Maker JavaDullihan ======================= -morocc_in.gat,146,99,2 script Dye Maker JavaDullihan 122, -{ +morocc_in.gat,146,99,2 script Dye Maker JavaDullihan 122,{ mes "[Dye Maker JavaDullihan]"; mes "Oh... What a Beautiful day today."; mes "This is a perfect day to make Dyestuffs"; diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt index 055e9e53c..aa866874e 100644 --- a/npc/merchants/grandpa_pharmacist.txt +++ b/npc/merchants/grandpa_pharmacist.txt @@ -23,8 +23,7 @@ //============================================================ -alberta_in.gat,16,28,4 script Grampa Pharmacist 61, -{ +alberta_in.gat,16,28,4 script Grampa Pharmacist 61,{ mes "[Grampa Pharmacist]"; mes "Hmmm... what do you want...?"; next; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 8900c0fec..c6d633350 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -26,8 +26,7 @@ //========================================================= // Christopher: Geffen Blacksmith //========================================================= -geffen_in.gat,110,172,2 script Christopher 63, -{ +geffen_in.gat,110,172,2 script Christopher 63,{ mes "[Christopher Guillenrow]"; mes "Welcome to Christopher's Workshop. Ye can find all yer forging equipment here. So what can I help ye with?"; M_Menu: diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt index 634337abf..d0910627b 100644 --- a/npc/other/msg_boards.txt +++ b/npc/other/msg_boards.txt @@ -18,16 +18,14 @@ // Al De Baran // //=======================================================================// / Welcome Sign ------------------------------------------------ -aldebaran.gat,133,104,1 script Welcome Sign 111, -{ +aldebaran.gat,133,104,1 script Welcome Sign 111,{ mes "~sign reads....~"; mes "Hello and enjoy your visit to Aldebaran! Aldebaran is the mystical city of clocks and Kafras!"; close; } // Kafra Corp. Main Office Sign --------------------------------------------------------------- -aldebaran.gat,53,223,1 script Kafra Corp. Main Office 111, -{ +aldebaran.gat,53,223,1 script Kafra Corp. Main Office 111,{ mes "~sign reads...~"; mes "This is the Kafra Services Main Office, home to the lovely Kafra employees."; close; @@ -38,24 +36,21 @@ aldebaran.gat,53,223,1 script Kafra Corp. Main Office 111, // Alberta // //=======================================================================// // Sign: Alberta Harbor ----------------------------------------------- -alberta.gat,35,241,1 script Alberta Harbor 111, -{ +alberta.gat,35,241,1 script Alberta Harbor 111,{ mes "~sign reads....~"; mes "Welcome to the port city Alberta! Alberta is the city of the sea! A tourist delight!"; close; } // Welcome Sign ----------------------------------------------- -alberta.gat,196,152,1 script Welcome Sign 111, -{ +alberta.gat,196,152,1 script Welcome Sign 111,{ mes "~sign reads...~"; mes "Welcome to the port city Alberta! Alberta is the city of the sea! A tourist delight!"; close; } // Sign: Merchant Guild ------------------------------------------ -alberta.gat,37,39,1 script Merchant Guild 111, -{ +alberta.gat,37,39,1 script Merchant Guild 111,{ mes "~sign reads...~"; mes "Enjoy the art of buying and selling? Love making unbeatable deals?"; mes "Then the Alberta Merchant Guild is perfect for you!"; @@ -68,48 +63,42 @@ alberta.gat,37,39,1 script Merchant Guild 111, // Geffen // //=======================================================================// // Welcome Sign ---------------------------------------------- -geffen.gat,116,58,1 script Welcome Sign 111, -{ +geffen.gat,116,58,1 script Welcome Sign 111,{ mes "~sign reads...~"; mes "Greetings!! You are in the wonderfull city of Geffen! Geffen is the city of Magic and home to Mages and Wizards!."; close; } // Sign: Restaurant Inn --------------------------------------------- -geffen.gat,167,175,1 script Geffen Restaurant Inn 111, -{ +geffen.gat,167,175,1 script Geffen Restaurant Inn 111,{ mes "~sign reads..... ~"; mes "Welcome weary travelers! Have a hot meal and stay the night at the the Geffen Restaurant Inn!"; close; } // Sign: Mage Association --------------------------------------- -geffen.gat,61,174,1 script Mage Association 111, -{ +geffen.gat,61,174,1 script Mage Association 111,{ mes "~sign reads...~"; mes "Greetings!! This is the Geffen Magic Academy. Come in if you have an interest in all things magic!"; close; } // Sign: Geffen Tower Sign ---------------------------------------------- -geffen.gat,113,104,1 script Geffen Tower 111, -{ +geffen.gat,113,104,1 script Geffen Tower 111,{ mes "~sign reads...~"; mes "This is the Geffen Tower, home to the Wizard Academey as well as the infamous Geffen Dungeon. Novices beware!!!"; close; } // Sign: Blacksmith Guild ------------------------------------------- -geffen.gat,184,61,1 script Blacksmith Guild 111, -{ +geffen.gat,184,61,1 script Blacksmith Guild 111,{ mes "~sign reads...~"; mes "This is the Blacksmith Guild."; close; } // Sign Post ----------------------------------------------------------- -geffen.gat,119,190,0 script Sign Post 111, -{ +geffen.gat,119,190,0 script Sign Post 111,{ mes "~sign reads...~"; mes "North to Geffen Fields"; mes "NorthEast to Al De Baran"; @@ -128,16 +117,14 @@ geffen.gat,119,190,0 script Sign Post 111, // Morroc // //=======================================================================// // Welcome Sign --------------------------------------------------- -morocc.gat,168,264,1 script Welcome Sign 111, -{ +morocc.gat,168,264,1 script Welcome Sign 111,{ mes "~sign reads...~"; mes "Morocc welcomes you! Morocc is the city of the desert and home to Thieves, Assassins, and alls sorts of Egyption temptations!"; close; } // Sign: Inn ---------------------------------------------------------- -morocc.gat,272,272,1 script Morroc Town Inn 111, -{ +morocc.gat,272,272,1 script Morroc Town Inn 111,{ mes "~sign reads....~"; mes "Welcome weary travelers! Stay the night at the Morroc Town Inn."; close; @@ -154,16 +141,14 @@ morocc.gat,272,272,1 script Morroc Town Inn 111, // Prontera // //=======================================================================// // Welcome Sign ----------------------------------------------------------- -prontera.gat,156,197,1 script Welcome Sign 111, -{ +prontera.gat,156,197,1 script Welcome Sign 111,{ mes"~sign reads...~"; mes "You've found yourself in the great city of Prontera! Prontera is one of the largest cities in Rune-Midgard and is home to the Prontera Chivalry!"; close; } // Sign Post ---------------------------------------------------------------- -prontera.gat,158,213,1 script Sign Post 111, -{ +prontera.gat,158,213,1 script Sign Post 111,{ mes "~ the sign post reads ~"; mes "North to Prontera Castle"; mes "Farther North to Al De Baran"; diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index b4d2fe583..c29d1f3d2 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -22,32 +22,27 @@ //========================================================================== // Alberta ----------------------------------------- -alberta_in.gat, 22, 146,4 script PvP Narrator#1 84, -{ +alberta_in.gat, 22, 146,4 script PvP Narrator#1 84,{ callfunc "F_PvPNarr", "alberta_in.gat", 24, 143; end; } // Payon ------------------------------------- -payon_in01.gat,173,109,3 script PvP Narrator#2 84, -{ +payon_in01.gat,173,109,3 script PvP Narrator#2 84,{ callfunc "F_PvPNarr", "payon_in01.gat", 169, 108; end; } // Prontera ------------------------------------- -prt_in.gat,56,140,4 script PvP Narrator#3 84, -{ +prt_in.gat,56,140,4 script PvP Narrator#3 84,{ callfunc "F_PvPNarr", "prt_in.gat", 54, 137; end; } // Morocc -------------------------------------- -morocc_in.gat,144,138,4 script PvP Narrator#4 84, -{ +morocc_in.gat,144,138,4 script PvP Narrator#4 84,{ callfunc "F_PvPNarr", "morocc_in.gat", 141, 140; end; } // Geffen -------------------------------------- -geffen_in.gat, 67,63,4 script PvP Narrator#5 84, -{ +geffen_in.gat, 67,63,4 script PvP Narrator#5 84,{ callfunc "F_PvPNarr", "geffen_in.gat", 64, 60; end; } @@ -134,8 +129,7 @@ function script F_PvPNarr { //========================================================================== // Alberta ----------------------------------- -alberta_in.gat, 26,146,4 script Gate Keeper#1::GateKeep 83, -{ +alberta_in.gat, 26,146,4 script Gate Keeper#1::GateKeep 83,{ mes "[Gate Keeper]"; mes "Hi. I'm glad to be of service. I will open the PvP fight square for you!"; mes "If you have any questions about the PvP modes or rules, please ask the Narrator....."; diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt index 81ff319c5..2f459da80 100644 --- a/npc/quests/bunnyband.txt +++ b/npc/quests/bunnyband.txt @@ -16,8 +16,7 @@ // Prontera ------------------------------------------------------------------------------------------------------------------------------------------ -prontera.gat,146,87,6 script Kafra Corp. Rep.#1::KCRep 83, -{ +prontera.gat,146,87,6 script Kafra Corp. Rep.#1::KCRep 83,{ mes "[Kafra Corp. Rep.]"; if (BUNYBND == 1) goto L_Check; mes "^529DFFSpecial Event, ^FF0000Bunny Band ^529DFFQuest!!^000000"; diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt index 19819b759..a41d6ad0f 100644 --- a/npc/quests/juice_maker.txt +++ b/npc/quests/juice_maker.txt @@ -19,8 +19,7 @@ // Morrison ------------------------------------------------ -prt_in.gat,47,173,2 script Morrison 97, -{ +prt_in.gat,47,173,2 script Morrison 97,{ mes "[Little Morrison]"; if(MEAT > 10) goto L_Candy; if(MARIANNE == 1) goto L_GoAway; @@ -110,8 +109,7 @@ L_Candy: } // Housewife Marianne --------------------------------------------------- -prt_in.gat,49,172,2 script Housewife Marianne 53, -{ +prt_in.gat,49,172,2 script Housewife Marianne 53,{ mes "[Housewife Marianne]"; if(MORRISON == 1) goto L_GaveMeat; if(MORRISON == 2) goto L_Juice; @@ -183,8 +181,7 @@ L_Juice: } // Juicer Marx Hansen --------------------------------------------------------- -payon_in01.gat,5,48,7 script Juicer Marx Hansen 86, -{ +payon_in01.gat,5,48,7 script Juicer Marx Hansen 86,{ mes "[Juicer Marx Hansen]"; if(MARIANNE == 1) goto L_Juice; mes "Welcome to my shop. What brings you here?"; diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt index 3b6868aee..ef20c4027 100644 --- a/npc/quests/monstertamers.txt +++ b/npc/quests/monstertamers.txt @@ -16,8 +16,7 @@ //<================================================= Alberta ===============================================>\\ -alberta_in.gat,173,77,3 script Monster Tamer 125, -{ +alberta_in.gat,173,77,3 script Monster Tamer 125,{ mes "[Monster Tamer Iwado]"; mes "Monster taming has never been more popular than it is now! Why not join in on all of the excitement?...."; M_Menu: @@ -130,8 +129,7 @@ M_Menu: //<================================================= Al De Baran ===============================================>\\ -aldeba_in.gat,167,177,3 script Monster Tamer 125, -{ +aldeba_in.gat,167,177,3 script Monster Tamer 125,{ mes "[Monster Tamer YuU]"; mes "You must be looking for some Taming Items.... When it comes to making Taming Items there is no one better than me here in Rune Midgard."; M_Menu: @@ -328,8 +326,7 @@ M_Menu: //<================================================= Izlude ===============================================>\\ -izlude_in.gat,128,64,3 script Monster Tamer 125, -{ +izlude_in.gat,128,64,3 script Monster Tamer 125,{ mes "[Monster Tamer Shogo]"; mes "Are you pre-occupied with gathering items for your cute pets, and want a break? Then let us find those items for you....."; M_Menu: diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt index 7a145ac1f..1f2bdb309 100644 --- a/npc/quests/mrsmile.txt +++ b/npc/quests/mrsmile.txt @@ -15,8 +15,7 @@ // Alberta ------------------------------------------------------------------------------------------ -alberta.gat,113,53,3 script Smile Assistance::SmileAT 92, -{ +alberta.gat,113,53,3 script Smile Assistance::SmileAT 92,{ mes "[Smile Assistant]"; mes "Hi, I'm a Smile Assistance. How may I help you?"; next; diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index 5c30668b8..99484c28d 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -23,8 +23,7 @@ //=======================================================================================================// // Doll Quest //=======================================================================================================// -alberta.gat,117,134,8 script Elin 96, -{ +alberta.gat,117,134,8 script Elin 96,{ mes "[Elin]"; if(Sex == 0) mes "Hello, miss. Since you're a girl, you must like dolls, don't you?"; @@ -382,8 +381,7 @@ alberta_in.gat,122,53,4 script Cherokee 47,{ //=======================================================================================================// // Bao Bao, Cresent Hairpin, Fashionbale Glasses, Heart Hairpin //=======================================================================================================// -alberta.gat,120,53,3 script Zic 51, -{ +alberta.gat,120,53,3 script Zic 51,{ mes "[Zic]"; mes "Yay! A cool breeze! That's why I love the sea!!"; emotion 2; @@ -503,8 +501,7 @@ alberta.gat,120,53,3 script Zic 51, //=======================================================================================================// // Hat of Sun God, Sunday Hat, Mage Hat, Magician Hat //=======================================================================================================// -alberta.gat,135,79,3 script Tempestra 71, -{ +alberta.gat,135,79,3 script Tempestra 71,{ mes "[Tempestra]"; mes "Ah...... Such a cool breeze. It's good to be next to the sea. I think it was the right choice for me to take a break from my business and come here."; emotion 2; diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt index 37e8d8d01..1ad4614c6 100644 --- a/npc/quests/quests_comodo.txt +++ b/npc/quests/quests_comodo.txt @@ -117,8 +117,7 @@ M_Menu: //===================================================================================================// // 'Mine Helmet', 'Parcel Hat', 'Money Loser's Grief', 'Phantom of the Opera Mask' //===============================================================// -comodo.gat,274,137,5 script Mari Isac 702, -{ +comodo.gat,274,137,5 script Mari Isac 702,{ mes "[Mari Isac]"; mes "I travel all over the world and get to hear many interesting stories from the people I meet."; mes "Sometimes they even teach me how to make special items"; diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt index f59cd3c15..101d26e9f 100644 --- a/npc/quests/quests_payon.txt +++ b/npc/quests/quests_payon.txt @@ -220,8 +220,7 @@ L_GotOra: //========================================================================================// // Derivuchi Cap(Hat of Petite Diablo), Helm of Angel //========================================================================================// -payon_in01.gat,56,12,4 script Young Man 89, -{ +payon_in01.gat,56,12,4 script Young Man 89,{ mes "[Young Man]"; mes "What is it?............"; next; diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index b1cb63512..0948a55ab 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -15,8 +15,7 @@ // Ph.D Hat Quest------------------------------------------------------- -prt_in.gat,38,108,4 script Teacher 53, -{ +prt_in.gat,38,108,4 script Teacher 53,{ if((countitem(710) >= 1) && (countitem(703) >= 1) && (countitem(704) >= 1) && (countitem(708) >= 1)) goto L_Start;//Items: Illusion Flower, Hinalle, Aloe, Ment, mes "Don't you think.... ^4444FF'flowers'^000000 are pretty?"; next; diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt index 7bde004be..25d74cf99 100644 --- a/npc/quests/quests_yuno.txt +++ b/npc/quests/quests_yuno.txt @@ -17,8 +17,7 @@ //=========================================================================== -yuno_in01.gat,103,158,4 script Bain 98, -{ +yuno_in01.gat,103,158,4 script Bain 98,{ set @name$, "[Bain]"; OnStart: diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt index 795df5d90..13d13503f 100644 --- a/npc/quests/skills/acolyte_skills.txt +++ b/npc/quests/skills/acolyte_skills.txt @@ -14,8 +14,7 @@ //============================================================ -prt_church.gat,173,23,4 script Acolyte Klift 79, -{ +prt_church.gat,173,23,4 script Acolyte Klift 79,{ mes "[Acolyte Klift]"; if (callfunc("Is_Holy_Class")) goto L_Start; diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index 3839ab777..57a5716c5 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -19,8 +19,7 @@ //<======================== Roberto: Arrow crafting =========================>\\ -morocc.gat,121,109,5 script Roberto 88, -{ +morocc.gat,121,109,5 script Roberto 88,{ mes "[Roberto]"; if (callfunc("Is_Bow_Class")) goto L_Start; @@ -143,8 +142,7 @@ L_LowLvl: //<============================== Arrow Repel ===============================>\\ -payon.gat,190,176,5 script Jason 88, -{ +payon.gat,190,176,5 script Jason 88,{ mes "[Jason]"; if (callfunc("Is_Bow_Class")) goto L_Start; diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt index 9bcb2e5e9..101b02a1d 100644 --- a/npc/quests/skills/mage_skills.txt +++ b/npc/quests/skills/mage_skills.txt @@ -15,8 +15,7 @@ -geffen_in.gat,151,119,4 script BLIZZARDRISS 71, -{ +geffen_in.gat,151,119,4 script BLIZZARDRISS 71,{ mes "[BLIZZARDRISS]"; if(callfunc("Is_Magic_Class")) goto L_Start; diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index 958e3b7e7..454c4b6d8 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -19,16 +19,14 @@ //--------------------------------------- Necko: Crazy Uproar--------------------------------\\ -alberta.gat,89,96,5 script Necko 139,0,4, -{ +alberta.gat,89,96,5 script Necko 139,0,4,{ mes "[!?]"; mes "Muahahahahhhahahahahhahah!!"; mes "Pukakakakakkakakakakakakaka!!"; close; } -alberta.gat,83,96,5 script Necko 98, -{ +alberta.gat,83,96,5 script Necko 98,{ mes "[Necko]"; if (callfunc("Is_Merc_Class")) goto L_Start; @@ -118,8 +116,7 @@ L_GotSkill: //----------------------------------------- Charlron: Change cart ---------------------------------\\ -alberta.gat,119,221,6 script Charlron 107, -{ +alberta.gat,119,221,6 script Charlron 107,{ mes "[Charlron]"; if (callfunc("Is_Merc_Class")) goto L_Start; L_Other: @@ -180,8 +177,7 @@ L_GotSkill: //-------------------------====-------- Gershuan: Cart Revolution ---------------------------------\\ -alberta.gat,232,106,6 script Gershaun 57, -{ +alberta.gat,232,106,6 script Gershaun 57,{ if (callfunc("Is_Merc_Class")) goto L_Start; L_Other: diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt index 85a565142..9f7d91595 100644 --- a/npc/quests/skills/novice_skills.txt +++ b/npc/quests/skills/novice_skills.txt @@ -16,8 +16,7 @@ //<---------------------------------------------------------------------------------------------- Nurse Aid: First Aid NPC ---------------------------------------------------------------------------->\\ -prt_in.gat,235,133,4 script Nurse Aid 90, -{ +prt_in.gat,235,133,4 script Nurse Aid 90,{ mes "[Nurse Aid]"; if(FIRSTAID == 1) goto L_GetAid; if(getskilllv(142)>0) goto L_GotAid; @@ -91,8 +90,7 @@ L_GotAid: //<-------------------------------------------------------------------------------------------------- Bulma: Play Dead -------------------------------------------------------------------------------------------->\\ -prt_in.gat,73,87,2 script Bulma 98, -{ +prt_in.gat,73,87,2 script Bulma 98,{ mes "[Bulma]"; if(Class == Job_Novice) goto L_Novice; @@ -221,8 +219,7 @@ L_GotSkill: //Newbie Assistant------------------------------------------------------------------------------ -prt_castle.gat,174,147,2 script Newbie Assistant 84, -{ +prt_castle.gat,174,147,2 script Newbie Assistant 84,{ mes "[Newbie Assistant]"; if(Class == Job_Novice) goto L_Start; diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt index 039be7621..f4ac546f7 100644 --- a/npc/quests/skills/thief_skills.txt +++ b/npc/quests/skills/thief_skills.txt @@ -21,8 +21,7 @@ //====================================================================================================== -moc_prydb1.gat,154,128,4 script Alcouskou 118, -{ +moc_prydb1.gat,154,128,4 script Alcouskou 118,{ mes "[Alcouskou]"; if(callfunc("Is_Thief_Class")) goto L_Start; if(Class==Job_Novice) goto L_Novice; @@ -330,8 +329,7 @@ L_Fling: //==================================================================================== -payon.gat,149,120,4 script RuRumuni 99, -{ +payon.gat,149,120,4 script RuRumuni 99,{ mes "[RuRumuni]"; if(SANDATTACK == 1 && BAGNFNTY != 2) goto L_Start; -- cgit v1.2.3-70-g09d2