From 1753d5ae8dce576b021b91822440a10ff740f404 Mon Sep 17 00:00:00 2001 From: ultramage Date: Sun, 10 Jun 2007 08:45:19 +0000 Subject: NPC typo fixes, eol style definitons, newline at end of file git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10738 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/cities/alberta.txt | 2 +- npc/cities/amatsu.txt | 3 +- npc/cities/rachel.txt | 4 +- npc/guides/guides_rachel.txt | 220 +++++++++++++++++++------------------- npc/mobs/dungeons/lhzdun.txt | 19 ++-- npc/other/hugel_bingo.txt | 2 +- npc/other/resetskill.txt | 2 +- npc/quests/Kiel_Hyre_Quest.txt | 2 +- npc/quests/WIP/6.txt | 127 ---------------------- npc/quests/cooking_quest.txt | 2 +- npc/quests/quests_airship.txt | 2 +- npc/quests/quests_morocc.txt | 1 - npc/quests/quests_prontera.txt | 2 +- npc/quests/thana_quest.txt | 2 +- npc/warps/cities/moscovia.txt | 90 ++++++++-------- npc/warps/cities/rachel.txt | 2 +- npc/warps/dungeons/kiel_dun.txt | 2 +- npc/warps/dungeons/mosk_dun.txt | 44 ++++---- npc/warps/dungeons/rachel_dun.txt | 2 +- npc/warps/dungeons/thana_dun.txt | 2 +- npc/warps/other/kiel.txt | 1 - 21 files changed, 203 insertions(+), 330 deletions(-) delete mode 100644 npc/quests/WIP/6.txt (limited to 'npc') diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 61b7565b5..7e3c8827d 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -610,4 +610,4 @@ alberta,165,83,4 script Fastidious Old Man 755,{ mes "hurting worse and worse."; mes "*Sigh* I'm getting old..."; close; -} \ No newline at end of file +} diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index 71f0d1109..d6444d3ed 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -924,5 +924,4 @@ s_No: mes "at you. Kehehehehe..."; mes "KEHEHEHEHEHEHE!"; close; - -} \ No newline at end of file +} diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index fd051f41a..a1e8fbbf2 100644 --- a/npc/cities/rachel.txt +++ b/npc/cities/rachel.txt @@ -355,13 +355,13 @@ ra_temple,115,148,7 script Follower Yakum 917,{ } ra_temin,287,88,7 script Follower Lekua 927,{ - mes "[Follower Lekua["; + mes "[Follower Lekua]"; mes "Look at these flowers."; mes "Aren't they so beautiful?"; mes "I've spent a lot of time"; mes "cultivating this flower garden."; next; - mes "[Follower Lekua["; + mes "[Follower Lekua]"; mes "I think it's Freya's"; mes "will for us to"; mes "bring as much beauty into"; diff --git a/npc/guides/guides_rachel.txt b/npc/guides/guides_rachel.txt index 38a5f783d..3a621e971 100644 --- a/npc/guides/guides_rachel.txt +++ b/npc/guides/guides_rachel.txt @@ -1,110 +1,110 @@ -//===== eAthena Script ======================================= -//= Rachel Guide -//===== By: ================================================== -//= L0ne_W0lf -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= eAthena SVN -//===== Description: ========================================= -//= [Aegis Conversion] -//= Rachel City guide -//===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] -//= 1.1 Change the while loops a bit. [L0ne_W0lf] -//============================================================ -rachel,138,146,5 script Rachel Guide 934,{ - mes "[Rachel Guide]"; - mes "Welcome to the capital of"; - mes "Arunafeltz, Rachel where a warm"; - mes "breath of goddess Freya reaches."; - mes "If this is the first time for you"; - mes "to use the guide services, why"; - mes "don't you check the \"Notice\" menu first?"; - set .@loop,1; - while(.@loop) { - next; - switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) { - case 1: - mes "[Rachel Guide]"; - mes "I can tell you any building location as long as it is in Rachel."; - mes "So where do you want to go?"; - if (.@compass_check == 0) { - mes "Would you like me"; - mes "to mark locations"; - mes "on your Mini-Map?"; - next; - if (select("Yes:No") == 1) set .@compass_check,1; - next; - } - set .@loop2,1; - while(.@loop2) { - if (.@wait_button_chk == 0) set .@wait_button_chk,1; - else next; - - switch(select("Cheshrumnir:Inn:Weapon Shop:Tool Shop:Airport:Cancel")) { - case 1: - mes "[Rachel Guide]"; - mes "Cheshrumnir is a holy ground where pope, the incarnation of goddess Freya stays."; - mes "Take the road to the norh to find the building."; - if (.@compass_check == 1) viewpoint 1,150,249,1,0xFF0000; - break; - case 2: - mes "[Rachel Guide]"; - mes "You can rest your fatigue off the journey in the Inn."; - mes "The left building next to me is the Inn of Rachel."; - if (.@compass_check == 1) viewpoint 1,115,149,2,0xFF00FF; - break; - case 3: - mes "[Rachel Guide]"; - mes "Do you want to check out the weapons that are sold in Rachel?"; - mes "The weapon shop is located nearby the western gate."; - if (.@compass_check == 1) viewpoint 1,42,87,3,0x99FFFF; - break; - case 4: - mes "[Rachel Guide]"; - mes "Rachel tool shop sells the best quality potions."; - mes "It's located nearby the western gate."; - if (.@compass_check == 1) viewpoint 1,83,78,4,0x0000FF; - break; - case 5: - mes "[Rachel Guide]"; - mes "The Airport is located outside the eastern gate."; - if (.@compass_check == 1) viewpoint 1,273,125,5,0x00FF00; - break; - case 6: - mes "[Rachel Guide]"; - mes "If you like to get rid of all the location marks on your Mini-Map,"; - mes "just ask me again, and choose \"Remove Marks from Mini-Map\" menu."; - set .@loop2,0; - break; - } - } - break; - - case 2: - viewpoint 2,150,249,1,0xFF0000; - viewpoint 2,115,149,2,0xFF00FF; - viewpoint 2,42,87,3,0x99FFFF; - viewpoint 2,83,78,4,0x0000FF; - viewpoint 2,273,125,5,0x00FF00; - mes "[Rachel Guide]"; - mes "Okay, they are gone now. If you have more locations to ask, just let me know."; - break; - case 3: - mes "[Rachel Guide]"; - mes "When you are using the ''Village Guide'' menu,"; - mes "make sure that building locations will be marked on your mini-map at the upper right side of your screen."; - mes "If you cannot see your mini-map, use the short cut key ''ctrl+tab'' or press the ''Map'' button on your basic information windows, okay?"; - mes "And you can also zoom out your mini-map by using the ''-'' button in case you cannot view the entire map of the village."; - break; - case 4: - mes "[Rachel Guide]"; - mes "Hope you have a wonderfull journey"; - mes "in Arunafeltz."; - set .@loop,0; - break; - } - } - close; -} \ No newline at end of file +//===== eAthena Script ======================================= +//= Rachel Guide +//===== By: ================================================== +//= L0ne_W0lf +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= eAthena SVN +//===== Description: ========================================= +//= [Aegis Conversion] +//= Rachel City guide +//===== Additional Comments: ================================= +//= 1.0 First version. [L0ne_W0lf] +//= 1.1 Change the while loops a bit. [L0ne_W0lf] +//============================================================ +rachel,138,146,5 script Rachel Guide 934,{ + mes "[Rachel Guide]"; + mes "Welcome to the capital of"; + mes "Arunafeltz, Rachel where a warm"; + mes "breath of goddess Freya reaches."; + mes "If this is the first time for you"; + mes "to use the guide services, why"; + mes "don't you check the \"Notice\" menu first?"; + set .@loop,1; + while(.@loop) { + next; + switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) { + case 1: + mes "[Rachel Guide]"; + mes "I can tell you any building location as long as it is in Rachel."; + mes "So where do you want to go?"; + if (.@compass_check == 0) { + mes "Would you like me"; + mes "to mark locations"; + mes "on your Mini-Map?"; + next; + if (select("Yes:No") == 1) set .@compass_check,1; + next; + } + set .@loop2,1; + while(.@loop2) { + if (.@wait_button_chk == 0) set .@wait_button_chk,1; + else next; + + switch(select("Cheshrumnir:Inn:Weapon Shop:Tool Shop:Airport:Cancel")) { + case 1: + mes "[Rachel Guide]"; + mes "Cheshrumnir is a holy ground where pope, the incarnation of goddess Freya stays."; + mes "Take the road to the norh to find the building."; + if (.@compass_check == 1) viewpoint 1,150,249,1,0xFF0000; + break; + case 2: + mes "[Rachel Guide]"; + mes "You can rest your fatigue off the journey in the Inn."; + mes "The left building next to me is the Inn of Rachel."; + if (.@compass_check == 1) viewpoint 1,115,149,2,0xFF00FF; + break; + case 3: + mes "[Rachel Guide]"; + mes "Do you want to check out the weapons that are sold in Rachel?"; + mes "The weapon shop is located nearby the western gate."; + if (.@compass_check == 1) viewpoint 1,42,87,3,0x99FFFF; + break; + case 4: + mes "[Rachel Guide]"; + mes "Rachel tool shop sells the best quality potions."; + mes "It's located nearby the western gate."; + if (.@compass_check == 1) viewpoint 1,83,78,4,0x0000FF; + break; + case 5: + mes "[Rachel Guide]"; + mes "The Airport is located outside the eastern gate."; + if (.@compass_check == 1) viewpoint 1,273,125,5,0x00FF00; + break; + case 6: + mes "[Rachel Guide]"; + mes "If you like to get rid of all the location marks on your Mini-Map,"; + mes "just ask me again, and choose \"Remove Marks from Mini-Map\" menu."; + set .@loop2,0; + break; + } + } + break; + + case 2: + viewpoint 2,150,249,1,0xFF0000; + viewpoint 2,115,149,2,0xFF00FF; + viewpoint 2,42,87,3,0x99FFFF; + viewpoint 2,83,78,4,0x0000FF; + viewpoint 2,273,125,5,0x00FF00; + mes "[Rachel Guide]"; + mes "Okay, they are gone now. If you have more locations to ask, just let me know."; + break; + case 3: + mes "[Rachel Guide]"; + mes "When you are using the ''Village Guide'' menu,"; + mes "make sure that building locations will be marked on your mini-map at the upper right side of your screen."; + mes "If you cannot see your mini-map, use the short cut key ''ctrl+tab'' or press the ''Map'' button on your basic information windows, okay?"; + mes "And you can also zoom out your mini-map by using the ''-'' button in case you cannot view the entire map of the village."; + break; + case 4: + mes "[Rachel Guide]"; + mes "Hope you have a wonderfull journey"; + mes "in Arunafeltz."; + set .@loop,0; + break; + } + } + close; +} diff --git a/npc/mobs/dungeons/lhzdun.txt b/npc/mobs/dungeons/lhzdun.txt index d6e0bd4ae..ae7311e86 100644 --- a/npc/mobs/dungeons/lhzdun.txt +++ b/npc/mobs/dungeons/lhzdun.txt @@ -218,14 +218,17 @@ lhz_dun03,138,138,36,34 monster High Wizard Kathryne 1645,1,2580000,2460000,1 lhz_dun03,1,1,0 script Lhzdun03monster -1,{ OnInit: - while(1){ - set $@metaspawn,rand(1,6); - if($@metaspawn == 1)areamonster "lhz_dun03",1,1,300,300,"Lord Knight Seyren",1646,1,"Lhzdun03monster::OnMonsterDead"; - if($@metaspawn == 2)areamonster "lhz_dun03",1,1,300,300,"Assassin Cross Eremes",1647,1,"Lhzdun03monster::OnMonsterDead"; - if($@metaspawn == 3)areamonster "lhz_dun03",1,1,300,300,"Whitesmith Horward",1648,1,"Lhzdun03monster::OnMonsterDead"; - if($@metaspawn == 4)areamonster "lhz_dun03",1,1,300,300,"High Priest Margaretha",1649,1,"Lhzdun03monster::OnMonsterDead"; - if($@metaspawn == 5)areamonster "lhz_dun03",1,1,300,300,"Sniper Cecil",1650,1,"Lhzdun03monster::OnMonsterDead"; - if($@metaspawn == 6)areamonster "lhz_dun03",1,1,300,300,"High Wizard Kathryne",1651,1,"Lhzdun03monster::OnMonsterDead"; + while(1) + { + switch(rand(1,6)) + { + case 1: areamonster "lhz_dun03",1,1,300,300,"Lord Knight Seyren",1646,1,"Lhzdun03monster::OnMonsterDead"; break; + case 2: areamonster "lhz_dun03",1,1,300,300,"Assassin Cross Eremes",1647,1,"Lhzdun03monster::OnMonsterDead"; break; + case 3: areamonster "lhz_dun03",1,1,300,300,"Whitesmith Horward",1648,1,"Lhzdun03monster::OnMonsterDead"; break; + case 4: areamonster "lhz_dun03",1,1,300,300,"High Priest Margaretha",1649,1,"Lhzdun03monster::OnMonsterDead"; break; + case 5: areamonster "lhz_dun03",1,1,300,300,"Sniper Cecil",1650,1,"Lhzdun03monster::OnMonsterDead"; break; + case 6: areamonster "lhz_dun03",1,1,300,300,"High Wizard Kathryne",1651,1,"Lhzdun03monster::OnMonsterDead"; break; + } end; OnMonsterDead: initnpctimer; diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index 1a5a57c28..d938988b2 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -1118,4 +1118,4 @@ function script Func_BingoResult { enablenpc ""+getarg(0)+"e#bingo"; set getarg(0),getarg(0) +1; end; -} \ No newline at end of file +} diff --git a/npc/other/resetskill.txt b/npc/other/resetskill.txt index 650bc4a48..0d95b78cf 100644 --- a/npc/other/resetskill.txt +++ b/npc/other/resetskill.txt @@ -140,4 +140,4 @@ prontera,146,232,4 script Hypnotist#2 124,{ close; } -} \ No newline at end of file +} diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index e42f9a3dc..d21e79c60 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -63,7 +63,7 @@ //= 3.0 Fixed a typo in Elly, in her room. (was <= should have been <) [L0ne_W0lf] //= Added an 'end;' to the cookie basket. Kiel Hyre's final dialog will now delete all quest-related items. //= 3.1 Moved the "delitem" for all related quest items to the proper NPC. [L0ne_W0lf] -//= 3.2 Fixed error with Allysia teling yout o "Go away." maybe. [L0ne_W0lf] +//= 3.2 Fixed error with Allysia teling you to "Go away." maybe. [L0ne_W0lf] //============================================================ //============================================================================ // Kiel Hyre Quest/Robotic Lab Dungeon diff --git a/npc/quests/WIP/6.txt b/npc/quests/WIP/6.txt deleted file mode 100644 index 98d54d14b..000000000 --- a/npc/quests/WIP/6.txt +++ /dev/null @@ -1,127 +0,0 @@ -// by CallNix v.0.0 - -//======================================Juno to Izlude airship===================================================================== -airplane_01,238,154,4 script Captain 854,{ -if (airshipquest==0) { -mes "[Fayroll]"; -mes "I have nothing to say to you anymore"; -close; -} - -if (airshipquest==3) { -mes "[Fayroll]"; -mes "Oh, you have finished that work. Great. Now i shall read this letter."; -mes "Don't interrupt me please"; -delitem 7276,1; -set airshipquest,4; -//addtimer 30000,"Captain::OnFinish"; Возможно сделать так. Но тут по таймеру, а не по кликам на НПЦ -close; -} - -if (airshipquest==4) { -set @k,rand(4); -if (@k == 2) goto OnFinish; -mes "[Fayroll]"; -mes "I had not finished the letter yet"; -close; -} - -mes "[Fayroll]"; -mes "Hello, "+strcharinfo(0)+". Nice to see you"; -mes "Anything want from me?"; -next; -if (select("yes,about airships:no, nothing") == 1) { - mes "[Fayroll]"; - mes "So i think you want to know how airship works"; - mes "This is the top secret that only a captain will know. Anyway, if you're willing ti help me, I will let you know."; - next; - menu "I will help you. But what must I do?",-,"No, sorry, I have no time for this.",L_SORRY; - mes "[Fayroll]"; - mes " You see, I have a brother. He is also a captain of airplane in Juno to Lighthalzen airship."; - mes "As we are on different ships, i can't communicate with him. Yor is to deliver this letter to him."; - mes "If you will do this, I shall tell you the secret."; - getitem 7276,1; //Tarloks letter. Не нашел в базе - set airshipquest,1; -} else { - mes "[Fayroll]"; - mes "Then don't interrupt me. I have a lot of work to do."; - mes "Go to the Casino on ship. And spen some time there"; -} -close; - -L_SORRY: -mes "[Fayroll]"; -mes "Ye this is bad, but i can't insist on it. Follow your way"; -mes "See you the other day."; -close; - -OnFinish: -mes "[Fayroll]"; -mes "Whoo... I finally got it.Now i shall tell you the secret."; -next; -mes "[Fayroll]"; -mes "The cocept of the flight of airship"; -mes "is the energy produced from the boiler wich push the propeller"; -mes "that moves the giant beauty. Do you understand now?"; -next; -menu "Is That all???",-; -mes "[Fayroll]"; -mes "You can't lift this thing up only with steam."; -mes "thats why the machine ^5566FF'Enchancer'^000000 is used"; -mes "It is working on Heart of Ymir. Thats all the secret. Now go."; -set airshipquest,0; -getexp 200000,10000; -close; -} -//=======================================Juno to Lighthalzen airship==================================================================== -airplane,236,163,4 script Aiplane Captain 855,{ -if (airshipquest == 1) goto L_QUEST; -if (airshipquest == 2) goto L_FINISH; -mes "[Dulu]"; -mes "Welcome on the board of ourship. Guess you will have lots of time here"; -close; - -L_QUEST: -mes "[Dulu]"; -mes "Hello, stranger. I am the Airplane Captain of this ship."; -mes "If you have any problems with our stuff you can simply tell me about this."; -next; -if (select("I have letter for you:hmm.. sorry") == 1) { - mes "[Dulu]"; - mes "You have letter for me?? Really??"; - delitem 7276,1; - mes "WOHHOOO! Its from my brother. Thx alot, stranger.."; - mes "You see, he has borrowed something from me long ago. But unfortunatly he had lost it"; - mes "and this reallly bed for you..."; - next; - mes "*Dulu shows you a letter*"; - mes "^5566FF'The one who send you the letter will find it for me. Don't reply to me if he refuses to do so'^000000"; - next; - mes "[Dulu]"; - mes "So when you accept that work you accept doing this me. Now i shall tell you your work"; - next; - mes "[Dulu]"; - mes "My brother had lost 2 Will of Darkness and 2 Prickly Fruits"; - mes "They can simply be dropped on the deck of the ship. Monsters often atack ships. Get this items for me from them."; - mes "Now monster are going to atack Juno to Izlude airship. Go there and get what i need"; - set airshipquest,2; - } else { - mes "[Dulu]"; - mes "Well, you know where to find me. See you later"; -} -close; - -L_FINISH: -if (countitem(7340)<2 && countitem(576)<2) { -mes "[Dulu]"; -mes "You haven't gathered the items yet"; -close; -} -mes "[Dulu]"; -mes "Great work i can say"; -delitem 7340,2; -delitem 576,2; -getitem 7276,1; -set airshipquest,3; -close; -} diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index a5d8f9790..c5e8fddff 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -2470,4 +2470,4 @@ payon,209,127,3 script Servant 88,{ mes "that means more for me~"; close; } -} \ No newline at end of file +} diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index 7a3f1061d..54b32e315 100644 --- a/npc/quests/quests_airship.txt +++ b/npc/quests/quests_airship.txt @@ -1780,4 +1780,4 @@ airplane_01,252,41,0 duplicate(boom) boom#air-7 139 airplane_01,252,63,0 duplicate(boom) boom#air-8 139 airplane_01,234,65,0 duplicate(boom) boom#air-9::boom 139 airplane_01,227,67,0 duplicate(boom) boom#air-10::boom 139 -airplane_01,249,50,0 duplicate(boom) boom#air-0::boom 139 \ No newline at end of file +airplane_01,249,50,0 duplicate(boom) boom#air-0::boom 139 diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 6f3e877ae..28b6d2481 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -10491,4 +10491,3 @@ sec_in02,38,162,0 script Morroc Invasion Manager 882,{ close; } } - diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index 9c7607a4d..a448f22bb 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -3521,4 +3521,4 @@ prt_in,162,99,4 script Librarian#curse 67,{ mes "people can really be."; close; } -} \ No newline at end of file +} diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index db2370913..5f2564d0e 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -2591,4 +2591,4 @@ tha_t06,119,120,0 script thana6-7 45,1,1,{ mes "you from proceeding this way...^000000"; close; } -} \ No newline at end of file +} diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt index 27b6faa84..db7529f1b 100644 --- a/npc/warps/cities/moscovia.txt +++ b/npc/warps/cities/moscovia.txt @@ -1,45 +1,45 @@ -//===== Athena Script ======================================== -//= Moscovia City Warp Script -//===== By: ================================================== -//= $ephiroth -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Moscovia City -//===== Additional Comments: ================================= -//= 1.0 Initial version [$ephiroth] -//============================================================ - -// ---[ Mansion ]--- -moscovia,224,235,0 warp moskwarp1001 1,1,mosk_in,96,91 -mosk_in,93,91,0 warp moskwarp1002 1,1,moscovia,224,232 -mosk_in,100,126,0 warp moskwarp1003 1,1,mosk_in,21,116 -mosk_in,21,113,0 warp moskwarp1004 1,1,mosk_in,100,123 -// ---[ Weapon House ]--- -moscovia,185,189,0 warp moskwarp1005 1,1,mosk_in,16,179 -mosk_in,13,179,0 warp moskwarp1006 1,1,moscovia,188,193 -moscovia,203,171,0 warp moskwarp1007 1,1,mosk_in,85,179 -mosk_in,88,179,0 warp moskwarp1008 1,1,moscovia,205,168 -// ---[ Instrument House / Tool Dealer ]--- -moscovia,223,174,0 warp moskwarp1009 1,1,mosk_in,14,245 -mosk_in,11,245,0 warp moskwarp1010 1,1,moscovia,220,177 -// ---[ Inn ]--- -moscovia,229,207,0 warp moskwarp1011 1,1,mosk_in,141,178 -mosk_in,141,175,0 warp moskwarp1012 1,1,moscovia,226,204 -mosk_in,150,191,0 warp moskwarp1013 1,1,mosk_in,206,187 -mosk_in,203,187,0 warp moskwarp1014 1,1,mosk_in,147,191 -// ---[ Mansion ]--- -moscovia,256,138,0 warp moskwarp1015 1,1,mosk_in,211,114 -mosk_in,211,111,0 warp moskwarp1016 1,1,moscovia,254,141 -mosk_in,221,128,0 warp moskwarp1017 1,1,mosk_in,287,120 -mosk_in,287,117,0 warp moskwarp1018 1,1,mosk_in,221,125 -// ---[ Private House ]--- -moscovia,195,80,0 warp moskwarp1019 1,1,mosk_in,215,40 -mosk_in,215,37,0 warp moskwarp1020 1,1,moscovia,194,78 -// ---[ Private House ]--- -moscovia,146,112,0 warp moskwarp1021 1,1,mosk_in,213,256 -mosk_in,213,253,0 warp moskwarp1022 1,1,moscovia,146,109 -mosk_in,219,272,0 warp moskwarp1023 1,1,mosk_in,151,276 -mosk_in,151,273,0 warp moskwarp1024 1,1,mosk_in,219,269 \ No newline at end of file +//===== Athena Script ======================================== +//= Moscovia City Warp Script +//===== By: ================================================== +//= $ephiroth +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Moscovia City +//===== Additional Comments: ================================= +//= 1.0 Initial version [$ephiroth] +//============================================================ + +// ---[ Mansion ]--- +moscovia,224,235,0 warp moskwarp1001 1,1,mosk_in,96,91 +mosk_in,93,91,0 warp moskwarp1002 1,1,moscovia,224,232 +mosk_in,100,126,0 warp moskwarp1003 1,1,mosk_in,21,116 +mosk_in,21,113,0 warp moskwarp1004 1,1,mosk_in,100,123 +// ---[ Weapon House ]--- +moscovia,185,189,0 warp moskwarp1005 1,1,mosk_in,16,179 +mosk_in,13,179,0 warp moskwarp1006 1,1,moscovia,188,193 +moscovia,203,171,0 warp moskwarp1007 1,1,mosk_in,85,179 +mosk_in,88,179,0 warp moskwarp1008 1,1,moscovia,205,168 +// ---[ Instrument House / Tool Dealer ]--- +moscovia,223,174,0 warp moskwarp1009 1,1,mosk_in,14,245 +mosk_in,11,245,0 warp moskwarp1010 1,1,moscovia,220,177 +// ---[ Inn ]--- +moscovia,229,207,0 warp moskwarp1011 1,1,mosk_in,141,178 +mosk_in,141,175,0 warp moskwarp1012 1,1,moscovia,226,204 +mosk_in,150,191,0 warp moskwarp1013 1,1,mosk_in,206,187 +mosk_in,203,187,0 warp moskwarp1014 1,1,mosk_in,147,191 +// ---[ Mansion ]--- +moscovia,256,138,0 warp moskwarp1015 1,1,mosk_in,211,114 +mosk_in,211,111,0 warp moskwarp1016 1,1,moscovia,254,141 +mosk_in,221,128,0 warp moskwarp1017 1,1,mosk_in,287,120 +mosk_in,287,117,0 warp moskwarp1018 1,1,mosk_in,221,125 +// ---[ Private House ]--- +moscovia,195,80,0 warp moskwarp1019 1,1,mosk_in,215,40 +mosk_in,215,37,0 warp moskwarp1020 1,1,moscovia,194,78 +// ---[ Private House ]--- +moscovia,146,112,0 warp moskwarp1021 1,1,mosk_in,213,256 +mosk_in,213,253,0 warp moskwarp1022 1,1,moscovia,146,109 +mosk_in,219,272,0 warp moskwarp1023 1,1,mosk_in,151,276 +mosk_in,151,273,0 warp moskwarp1024 1,1,mosk_in,219,269 diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt index 84fd9f6b8..49d3aeb1a 100644 --- a/npc/warps/cities/rachel.txt +++ b/npc/warps/cities/rachel.txt @@ -120,4 +120,4 @@ ra_in01,375,109,0 warp rachel85 1,1,rachel,116,154 rachel,116,158,0 warp rachel86 1,1,ra_in01,375,114 //Additional Temple warp -ra_temin,275,243,0 warp rachel87 1,1,ra_temin,131,131 \ No newline at end of file +ra_temin,275,243,0 warp rachel87 1,1,ra_temin,131,131 diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kiel_dun.txt index fe0b27141..096e5fd03 100644 --- a/npc/warps/dungeons/kiel_dun.txt +++ b/npc/warps/dungeons/kiel_dun.txt @@ -35,4 +35,4 @@ OnTouch: warp "kh_dun01",32,199; } -} \ No newline at end of file +} diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt index 30b79c6ee..6cbbfde42 100644 --- a/npc/warps/dungeons/mosk_dun.txt +++ b/npc/warps/dungeons/mosk_dun.txt @@ -1,22 +1,22 @@ -//===== Athena Script ======================================== -//= Moscovia Dungeon Warp Script -//===== By: ================================================== -//= $ephiroth -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Description: ========================================= -//= Warp Points for Moscovia Dungeon -//===== Additional Comments: ================================= -//= 1.0 Initial version [$ephiroth] -//============================================================ - -mosk_fild02,190,256,0 warp moskwarp4001 1,1,mosk_dun01,190,46 -mosk_dun01,190,43,0 warp moskwarp4002 1,1,mosk_fild02,190,253 - -mosk_dun01,200,272,0 warp moskwarp4003 1,1,mosk_dun02,163,31 -mosk_dun02,165,28,0 warp moskwarp4004 1,1,mosk_dun01,200,269 - -mosk_dun02,266,117,0 warp moskwarp4005 1,1,mosk_dun03,33,136 -mosk_dun03,30,133,0 warp moskwarp4006 1,1,mosk_dun02,263,118 \ No newline at end of file +//===== Athena Script ======================================== +//= Moscovia Dungeon Warp Script +//===== By: ================================================== +//= $ephiroth +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Any Athena Version +//===== Description: ========================================= +//= Warp Points for Moscovia Dungeon +//===== Additional Comments: ================================= +//= 1.0 Initial version [$ephiroth] +//============================================================ + +mosk_fild02,190,256,0 warp moskwarp4001 1,1,mosk_dun01,190,46 +mosk_dun01,190,43,0 warp moskwarp4002 1,1,mosk_fild02,190,253 + +mosk_dun01,200,272,0 warp moskwarp4003 1,1,mosk_dun02,163,31 +mosk_dun02,165,28,0 warp moskwarp4004 1,1,mosk_dun01,200,269 + +mosk_dun02,266,117,0 warp moskwarp4005 1,1,mosk_dun03,33,136 +mosk_dun03,30,133,0 warp moskwarp4006 1,1,mosk_dun02,263,118 diff --git a/npc/warps/dungeons/rachel_dun.txt b/npc/warps/dungeons/rachel_dun.txt index 932609912..aa724c6c9 100644 --- a/npc/warps/dungeons/rachel_dun.txt +++ b/npc/warps/dungeons/rachel_dun.txt @@ -40,4 +40,4 @@ ra_san04,35,221,0 warp sanctuary13 1,1,ra_san02,213,9 ra_san02,30,21,0 warp sanctuary14 1,1,ra_san05,14,149 //Additional Dungeon warp. (Exit) -ra_san01,139,139,0 warp sanctuary15 1,1,ra_temin,27,314 \ No newline at end of file +ra_san01,139,139,0 warp sanctuary15 1,1,ra_temin,27,314 diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/thana_dun.txt index de237b5d1..36f8ab8cd 100644 --- a/npc/warps/dungeons/thana_dun.txt +++ b/npc/warps/dungeons/thana_dun.txt @@ -57,4 +57,4 @@ thana_step,15,15,0 warp WarpThana11a 1,1,tha_t11,50,17 tha_t11,92,36,0 warp WarpThana11b 1,1,thana_step,180,73 // Thanatos Tower Level 12 (tha_t12) -thana_step,181,15,0 warp WarpThana12a 1,1,tha_t12,115,16 \ No newline at end of file +thana_step,181,15,0 warp WarpThana12a 1,1,tha_t12,115,16 diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt index 32709a43a..7ca01c475 100644 --- a/npc/warps/other/kiel.txt +++ b/npc/warps/other/kiel.txt @@ -99,4 +99,3 @@ kh_rossi,204,238,0 warp kh_rossi_17a 1,1,kh_rossi,204,283 kh_rossi,204,279,0 warp kh_rossi_17b 1,1,kh_rossi,204,235 kh_rossi,220,238,0 warp kh_rossi_18a 1,1,kh_rossi,261,283 kh_rossi,260,279,0 warp kh_rossi_18b 1,1,kh_rossi,220,235 - -- cgit v1.2.3-70-g09d2