From 729a171c5eab680888fcb65f78b67487887eaa9b Mon Sep 17 00:00:00 2001 From: euphyy Date: Wed, 4 Jul 2012 15:26:16 +0000 Subject: * Corrected and optimized 12 guide NPCs (/guides/) * Fixed a small typo in Warlock quest, bugreport:6164 (jobs\3-1\warlock.txt) * Fixed a couple of job constant typos in "Nameless Island Quests" (quests\quests_nameless.txt) * Removed non-RE changelogs from RE scripts git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16376 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/guides/guides_amatsu.txt | 55 +++++++----------- npc/guides/guides_comodo.txt | 92 ++++++++---------------------- npc/guides/guides_geffen.txt | 75 ++++++++---------------- npc/guides/guides_gonryun.txt | 57 +++++++------------ npc/guides/guides_hugel.txt | 116 +++++++++++++------------------------- npc/guides/guides_juno.txt | 107 +++++++++-------------------------- npc/guides/guides_lighthalzen.txt | 105 +++++++++------------------------- npc/guides/guides_lutie.txt | 53 +++++++---------- npc/guides/guides_morroc.txt | 89 ++++++++++------------------- npc/guides/guides_moscovia.txt | 26 +++++---- npc/guides/guides_niflheim.txt | 41 ++++++-------- npc/guides/guides_payon.txt | 112 ++++++++++++------------------------ npc/jobs/3-1/warlock.txt | 5 +- npc/merchants/shops.txt | 4 +- npc/merchants/shops_re.txt | 29 +--------- npc/mobs/dungeons/iz_dun.txt | 2 +- npc/mobs/dungeons/iz_dun_re.txt | 4 +- npc/mobs/dungeons/lhz_dun.txt | 2 +- npc/mobs/dungeons/lhz_dun_re.txt | 16 +----- npc/quests/quests_nameless.txt | 11 ++-- 20 files changed, 312 insertions(+), 689 deletions(-) diff --git a/npc/guides/guides_amatsu.txt b/npc/guides/guides_amatsu.txt index 7d0379cf4..50ffe3f24 100644 --- a/npc/guides/guides_amatsu.txt +++ b/npc/guides/guides_amatsu.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guide for the city of Amatsu +//= Guide for the city of Amatsu. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Optimized. [Euphy] //============================================================ amatsu,202,91,3 script Amatsu Guide#amatsu 758,{ @@ -30,59 +31,35 @@ amatsu,202,91,3 script Amatsu Guide#amatsu 758,{ next; switch(select("[ Kafra Employee ]:[ Bar ]:[ Weapon Dealer ]:[ Tool Dealer ]:[ Amatsu Palace ]:[ Chef Assistant ]:[ Ninja Guild Building ]:[ Sea Captain ]:Remove Marks from Mini-Map:Cancel")) { case 1: - mes "[Amachang]"; - mes "The ^0000FFKafra Employee^000000 is"; - mes "marked on your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^0000FFKafra Employee"; viewpoint 1,102,149,0,0x0A82FF; break; case 2: - mes "[Amachang]"; - mes "The ^006400Bar^000000 is"; - mes "marked on your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^006400Bar"; viewpoint 1,215,116,1,0xAAFF00; break; case 3: - mes "[Amachang]"; - mes "The ^008080Weapon Dealer^000000 is"; - mes "marked on your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^008080Weapon Dealer"; viewpoint 1,129,117,2,0x008080; break; case 4: - mes "[Amachang]"; - mes "The ^FF1493Tool Dealer^000000 is"; - mes "marked on your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^FF1493Tool Dealer"; viewpoint 1,97,117,3,0xFF1493; break; case 5: - mes "[Amachang]"; - mes "The ^8B4513Amatsu Palace^000000 is"; - mes "marked on your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^8B4513Amatsu Palace"; viewpoint 1,87,235,4,0x8B4513; break; case 6: - mes "[Amachang]"; - mes "The ^8A2BE2Chef Assistant^000000 is"; - mes "marked on your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^8A2BE2Chef Assistant"; viewpoint 1,206,150,5,0x8A2BE2; break; case 7: - mes "[Amachang]"; - mes "The ^4B0082Ninja Guild Building^000000 is"; - mes "marked on your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^4B0082Ninja Guild Building"; viewpoint 1,148,137,6,0x4B0082; break; case 8: - mes "[Amachang]"; - mes "The ^00BFFFSea Captain^000000 is"; - mes "marked on your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^00BFFFSea Captain"; viewpoint 1,195,79,7,0x00BFFF; break; case 9: @@ -104,5 +81,11 @@ amatsu,202,91,3 script Amatsu Guide#amatsu 758,{ close; } } + end; +L_Mark: + mes "[Amachang]"; + mes "The "+getarg(0)+"^000000 is"; + mes "marked on your mini-map."; + mes "Is there anything else I can do for you?"; + return; } - diff --git a/npc/guides/guides_comodo.txt b/npc/guides/guides_comodo.txt index d1d7f1125..f627235fa 100644 --- a/npc/guides/guides_comodo.txt +++ b/npc/guides/guides_comodo.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guides for the city of Comodo +//= Guides for the city of Comodo. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Fixed and optimized. [Euphy] //============================================================ comodo,322,178,4 script Comodo Guide#01comodo::GuideComodo 700,{ @@ -26,101 +27,57 @@ comodo,322,178,4 script Comodo Guide#01comodo::GuideComodo 700,{ while (.@loop) { switch(select("[ Tavern ]:[ Casino ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Campsite ]:[ Souvenir Vendor ]:[ East Cave Mao ]:[ West Cave Karu ]:[ North Cave Ruanda ]:[ Hula Dance Stage ]:[ Kafra Co. Western Branch ]:Previous Menu")) { case 1: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "the ^FF0000Tavern^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF0000Tavern"; viewpoint 1,166,298,0,0xFF0000; next; break; case 2: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "the ^FF4500Weapon & Armor Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FFA500Casino"; viewpoint 1,140,98,1,0xFFA500; next; break; case 3: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "the ^FFA500Casino^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF4500Weapon & Armor Shop"; viewpoint 1,266,70,2,0xFF4500; next; break; case 4: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "the ^B8860BTool Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^B8860BTool Shop"; viewpoint 1,86,128,3,0xB8860B; next; break; case 5: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "the ^32CD32Campsite^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^32CD32Campsite"; viewpoint 1,210,308,4,0x32CD32; next; break; case 6: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "the ^6B8E23Souvenir Vendor^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^6B8E23Souvenir Vendor"; viewpoint 1,298,124,5,0x6B8E23; next; break; case 7: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "^008B8BEast Cave Mao^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^008B8BEast Cave Mao",1; viewpoint 1,333,175,6,0x008B8B; next; break; case 8: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "^1E90FFWest Cave Karu^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^1E90FFWest Cave Karu",1; viewpoint 1,24,214,7,0x1E90FF; next; break; case 9: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "^0000CDNorth Cave Ruanda^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000CDNorth Cave Ruanda",1; viewpoint 1,176,358,8,0x0000CD; next; break; case 10: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "the ^C71585Hula Dance Stage^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^C71585Hula Dance Stage"; viewpoint 1,188,168,9,0xC71585; next; break; case 11: - mes "[Comodo Guide]"; - mes "Let me mark the location of"; - mes "the ^DB7093Kafra Corporation Western Branch^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^DB7093Kafra Corporation Western Branch"; viewpoint 1,136,202,10,0xDB7093; next; break; @@ -135,10 +92,7 @@ comodo,322,178,4 script Comodo Guide#01comodo::GuideComodo 700,{ while (.@loop) { switch(select("[ Chief's House ]:[ Bor Robin ]:[ Kafra Employee ]:[ Roaming Bard ]:Previous Menu")) { case 1: - mes "[Comodo Guide]"; - mes "Let me mark the ^6495EDChief's House^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^6495EDChief's House"; viewpoint 1,114,294,11,0x6495ED; next; break; @@ -151,11 +105,7 @@ comodo,322,178,4 script Comodo Guide#01comodo::GuideComodo 700,{ next; break; case 3: - mes "[Comodo Guide]"; - mes "Let me mark the location of the"; - mes "^1E90FFKafra Employee^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^1E90FFKafra Employee"; viewpoint 1,195,149,13,0x1E90FF; next; break; @@ -213,6 +163,14 @@ comodo,322,178,4 script Comodo Guide#01comodo::GuideComodo 700,{ break; } } + end; +L_Mark: + mes "[Comodo Guide]"; + mes "Let me mark the location of"; + mes ((getarg(1,0))?"":"the ")+getarg(0)+"^000000"; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } comodo,181,347,4 duplicate(GuideComodo) Comodo Guide#02comodo 700 diff --git a/npc/guides/guides_geffen.txt b/npc/guides/guides_geffen.txt index 10951b509..1662cdc37 100644 --- a/npc/guides/guides_geffen.txt +++ b/npc/guides/guides_geffen.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guides for the city of Geffen +//= Guides for the city of Geffen. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Fixed and optimized. [Euphy] //============================================================ geffen,203,116,4 script Guide#01geffen::GuideGeffen 705,{ @@ -38,29 +39,17 @@ geffen,203,116,4 script Guide#01geffen::GuideGeffen 705,{ next; break; case 2: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "the ^0000FFGeffen Tower^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000FFGeffen Tower"; viewpoint 1,120,114,1,0x0000FF; next; break; case 3: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "the ^FF5400Fountain^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF5400Fountain"; viewpoint 1,126,48,2,0xFFB400; next; break; case 4: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "the ^006400Tool Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Tool Shop"; viewpoint 1,44,86,3,0xAAFF00; next; break; @@ -75,20 +64,12 @@ geffen,203,116,4 script Guide#01geffen::GuideGeffen 705,{ next; break; case 6: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "the ^800080Inn^00000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^800080Inn"; viewpoint 1,172,174,5,0xDA70D6; next; break; case 7: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "the ^B9062FTavern^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^B9062FTavern"; viewpoint 1,138,138,6,0xFF0000; next; break; @@ -112,49 +93,29 @@ geffen,203,116,4 script Guide#01geffen::GuideGeffen 705,{ while (.@loop) { switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Dimensional Arcanist Guide ]:Previous Menu")) { case 1: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "^B9062FEden Teleport Officers^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^B9062FEden Teleport Officers"; viewpoint 1,61,180,7,0xFF0000; viewpoint 1,132,66,8,0xFF0000; next; break; case 2: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "^FF5400Kafra Employees^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF5400Kafra Employees"; viewpoint 1,203,123,10,0xFFB400; viewpoint 1,120,62,11,0xFFB400; next; break; case 3: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "^006400Pet Groomer^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Pet Groomer"; viewpoint 1,193,152,12,0xAAFF00; next; break; case 4: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "^7F3300Chef Assistant^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^7F3300Chef Assistant"; viewpoint 1,196,111,13,0xD2691E; next; break; case 5: - mes "[Geffen Guide]"; - mes "Let me mark the location of the"; - mes "^800080Dimensional Arcanist Guide^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^800080Dimensional Arcanist Guide"; viewpoint 1,140,196,14,0xDA70D6; next; break; @@ -193,6 +154,14 @@ geffen,203,116,4 script Guide#01geffen::GuideGeffen 705,{ end; } } + end; +L_Mark: + mes "[Geffen Guide]"; + mes "Let me mark the location of the"; + mes getarg(0)+"^000000"; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } geffen,118,62,0 duplicate(GuideGeffen) Guide#02geffen 705 diff --git a/npc/guides/guides_gonryun.txt b/npc/guides/guides_gonryun.txt index 24b15dba0..b108a3ccb 100644 --- a/npc/guides/guides_gonryun.txt +++ b/npc/guides/guides_gonryun.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guide for the city of Kunlun +//= Guide for the city of Kunlun. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Optimized. [Euphy] //============================================================ gonryun,163,60,4 script Kunlun Guide#01gonryun 780,{ @@ -29,59 +30,31 @@ gonryun,163,60,4 script Kunlun Guide#01gonryun 780,{ next; switch(select("[ Kafra Employee ]:[ Chief's Residence ]:[ Tool Dealer ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Wine Maker ]:[ Kunlun Envoy ]:Remove Marks from Mini-Map:Cancel")) { case 1: - mes "[He Yuen Zhe]"; - mes "The ^0000FFKafra Employee^000000 is"; - mes "marked on your mini-map."; - mes "Check your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^0000FFKafra Employee"; viewpoint 1,159,122,0,0x0A82FF; break; case 2: - mes "[He Yuen Zhe]"; - mes "The ^006400Chief's Residence^000000 is"; - mes "marked on your mini-map."; - mes "Check your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^006400Chief's Residence"; viewpoint 1,110,131,1,0xAAFF00; break; case 3: - mes "[He Yuen Zhe]"; - mes "The ^D8BFD8Tool Dealer^000000 is"; - mes "marked on your mini-map."; - mes "Check your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^D8BFD8Tool Dealer"; viewpoint 1,147,84,2,0xD8BFD8; break; case 4: - mes "[He Yuen Zhe]"; - mes "The ^FF1493Weapon Dealer^000000 is"; - mes "marked on your mini-map."; - mes "Check your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^FF1493Weapon Dealer"; viewpoint 1,174,101,3,0xFF1493; break; case 5: - mes "[He Yuen Zhe]"; - mes "The ^8B4513Armor Dealer^000000 is"; - mes "marked on your mini-map."; - mes "Check your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^8B4513Armor Dealer"; viewpoint 1,173,84,4,0x8B4513; break; case 6: - mes "[He Yuen Zhe]"; - mes "The ^9400DWine Maker^000000 is"; - mes "marked on your Mini-Map."; - mes "Check your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^9400DWine Maker"; viewpoint 1,213,115,5,0x9400D3; break; case 7: - mes "[He Yuen Zhe]"; - mes "The ^00BFFFKunlun Envoy^000000 is"; - mes "marked on your mini-map."; - mes "Check your mini-map."; - mes "Is there anything else I can do for you?"; + callsub L_Mark,"^00BFFFKunlun Envoy"; viewpoint 1,161,11,6,0x00BFFF; break; case 8: @@ -102,4 +75,12 @@ gonryun,163,60,4 script Kunlun Guide#01gonryun 780,{ close; } } + end; +L_Mark: + mes "[He Yuen Zhe]"; + mes "The "+getarg(0)+"^000000 is"; + mes "marked on your mini-map."; + mes "Check your mini-map."; + mes "Is there anything else I can do for you?"; + return; } diff --git a/npc/guides/guides_hugel.txt b/npc/guides/guides_hugel.txt index 7b3fd27ac..aa343f9ef 100644 --- a/npc/guides/guides_hugel.txt +++ b/npc/guides/guides_hugel.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guides for the city of Hugel +//= Guides for the city of Hugel. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Optimized. [Euphy] //============================================================ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ @@ -19,6 +20,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "Welcome to ^8B4513Hugel^000000. I am honored to guide you in this beautiful village."; mes "If this is the first time for you to use the guide services, you should ask a lot of questions."; next; + set .@str$,"Would you like to know more locations?"; while (1) { switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) { case 1: @@ -28,7 +30,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ case 1: mes "[Hugel Guide Granny]"; mes "Well, to me, this Church is rather like a place for old folks like me, you know..."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,159,113,0,0xFF0000; next; break; @@ -36,7 +38,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; mes "Pudding rather than praise."; mes "You'd better unpack your stuff first before you start looking around this village."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,101,77,1,0x8B4513; next; break; @@ -44,7 +46,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; mes "Yes, when you travel, you want to drop by a Pub and make new friends."; mes "Go east from here, then you will arrive at the pub."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,126,65,2,0xDAA520; next; break; @@ -52,7 +54,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; mes "A while ago, strangers came to the village and built that strange Airport kind of thing..."; mes "What do they call it? Airship?"; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,178,146,3,0xD7567F; next; break; @@ -60,7 +62,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; mes "Well, we have a Weapon Shop in the center of the village."; mes "But I don't know if there is any weapon that you find useful."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,88,167,4,0xCD5C5C; next; break; @@ -68,7 +70,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; mes "Yes, I love Hugel brand Red Potions. I haven't tasted Red Potions from any other brands yet...hohoho. "; mes "The tool shop is located in the center of village."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,92,163,5,0x000080; next; break; @@ -77,7 +79,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "I will mark the location"; mes "of the ^800080Bingo Game Room^000000"; mes "on your mini-map."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,58,206,6,0x800080; next; break; @@ -85,7 +87,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; mes "Oh, are you an aspiring Hunter?"; mes "Then head northeast following the beach, then you will find the Hunter Guild."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,209,224,7,0xFF1493; next; break; @@ -94,7 +96,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "I will mark the location"; mes "of the ^483D8BParty Supplies Shop^000000"; mes "on your mini-map."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,95,103,8,0x483D8B; next; break; @@ -102,8 +104,8 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; mes "I heard that the Shrine Expedition is staying in a house at the west."; mes "They have put some kind of sign in the middle of village, so I guess that they are hiring people for something..."; - mes "I wonder what they are doing in here...hmmm."; - mes "Would you like to know more locations?"; + mes "I wonder what they are doing in here... hmmm."; + mes .@str$; viewpoint 1,52,95,9,0x834683; next; break; @@ -121,7 +123,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; mes "I also like playing Monster Race games. It is pretty fun, you know?"; mes "Oh, you haven't tried it yet? No~ you'd better try. Trust me, you will like it."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,60,71,10,0xFF1493; next; break; @@ -130,7 +132,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "I will mark the location"; mes "of the ^DA70D6Cool Event Corp. Staff^000000"; mes "on your mini-map."; - mes "Would you like to know more locations?"; + mes .@str$; viewpoint 1,88,168,11,0xDA70D6; next; break; @@ -167,7 +169,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ } } -hugel,187,172,6 script Guide Rich King# 414,{ +hugel,187,172,6 script Guide Rich King#hugel 414,{ mes "[Guide Rich King]"; mes "What business do you have"; mes "in this countryside village?"; @@ -184,92 +186,52 @@ hugel,187,172,6 script Guide Rich King# 414,{ while (.@loop) { switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ Hunter Guild ]:[ Party Supplies Shop ]:[ Shrine Expedition ]:Previous Menu")) { case 1: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^FF0000Church^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^FF0000Church"; viewpoint 1,159,113,0,0xFF0000; next; break; case 2: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^8B4513Inn^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^8B4513Inn"; viewpoint 1,101,77,1,0x8B4513; next; break; case 3: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^DAA520Pub^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^DAA520Pub"; viewpoint 1,126,65,2,0xDAA520; next; break; case 4: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^D7567FAirport^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^D7567FAirport"; viewpoint 1,178,146,3,0xD7567F; next; break; case 5: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^CD5C5CWeapon Shop^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^CD5C5CWeapon Shop"; viewpoint 1,88,167,4,0xCD5C5C; next; break; case 6: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^000080Tool Shop^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^000080Tool Shop"; viewpoint 1,92,163,5,0x000080; next; break; case 7: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^800080Bingo Game Room^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^800080Bingo Game Room"; viewpoint 1,58,206,6,0x800080; next; break; case 8: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^FF1493Hunter Guild^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^FF1493Hunter Guild"; viewpoint 1,209,224,7,0xFF1493; next; break; case 9: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^483D8BParty Supplies Shop^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^483D8BParty Supplies Shop"; viewpoint 1,95,103,8,0x483D8B; next; break; case 10: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^834683Shrine Expedition^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^834683Shrine Expedition"; viewpoint 1,52,95,9,0x834683; next; break; @@ -284,20 +246,12 @@ hugel,187,172,6 script Guide Rich King# 414,{ while (.@loop) { switch(select("[ Monster Race Arena ]:[ Cool Event Corp. Staff ]:Previous Menu")) { case 1: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^FF1493Monster Race Arena^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^FF1493Monster Race Arena"; viewpoint 1,60,71,10,0xFF1493; next; break; case 2: - mes "[Rich King]"; - mes "I will mark the location"; - mes "of the ^DA70D6Cool Event Corp. Staff^000000."; - mes "Do you want to know more locations?"; - mes "Are you going to keep bugging me and make me get upset?"; + callsub L_Mark,"^DA70D6Cool Event Corp. Staff"; viewpoint 1,88,168,11,0xDA70D6; next; break; @@ -332,4 +286,12 @@ hugel,187,172,6 script Guide Rich King# 414,{ close; } } + end; +L_Mark: + mes "[Rich King]"; + mes "I will mark the location"; + mes "of the "+getarg(0)+"^000000."; + mes "Do you want to know more locations?"; + mes "Are you going to keep bugging me and make me get upset?"; + return; } diff --git a/npc/guides/guides_juno.txt b/npc/guides/guides_juno.txt index 652b218af..dc8d41812 100644 --- a/npc/guides/guides_juno.txt +++ b/npc/guides/guides_juno.txt @@ -3,20 +3,21 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guides for the city of Juno +//= Guides for the city of Juno. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Fixed and optimized. [Euphy] //============================================================ yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 700,{ mes "[Juno Guide]"; mes "A place that takes the vision of the future, and gives it form in the present. Welcome to"; - mes "the city of ^8B4513Juno^00000!"; + mes "the city of ^8B4513Juno^000000!"; next; while (1) { switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove marks from Mini-Map:Cancel")) { @@ -25,119 +26,67 @@ yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 700,{ while (.@loop) { switch(select("[ Tool Shop ]:[ Forge ]:[ Airport ]:[ Government Building ]:[ Street of Book Stores ]:[ Inn & Pub ]:[ Sage Castle ]:[ Monster Academy ]:[ Library of the Republic ]:[ Weapon & Armor Shop ]:[ Juphero Plaze ]:[ Monster Museum ]:[ Schweicherbil Magic Academy ]:Previous Menu")) { case 1: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^FF0000Tool Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF0000Tool Shop"; viewpoint 1,194,140,0,0xFF0000; next; break; case 2: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^FF4500Forge^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF4500Forge"; viewpoint 1,120,137,1,0xFF4500; next; break; case 3: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^DAA520Airport^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^DAA520Airport"; viewpoint 1,16,261,2,0xDAA520; next; break; case 4: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^008000Government Building^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^008000Government Building"; viewpoint 1,157,317,3,0x008000; next; break; case 5: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^0000FFStreet of Book Stores^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000FFStreet of Book Stores"; viewpoint 1,172,100,4,0x0000FF; next; break; case 6: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^000080Inn & Pub^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^000080Inn & Pub"; viewpoint 1,51,105,5,0x000080; next; break; case 7: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^800080Sage Castle^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^800080Sage Castle"; viewpoint 1,90,318,6,0x800080; next; break; case 8: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^834683Monster Academy^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^834683Monster Academy"; viewpoint 1,95,184,7,0x834683; next; break; case 9: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^4B0082Juno Library^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^4B0082Juno Library"; viewpoint 1,338,203,8,0x4B0082; next; break; case 10: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^008080Weapon & Armor Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^008080Weapon & Armor Shop"; viewpoint 1,120,137,9,0x008080; next; break; case 11: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^FF1493Juphero Plaza^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF1493Juphero Plaza"; viewpoint 1,115,157,10,0xFF1493; next; break; case 12: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^DA70D6Monster Museum^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^DA70D6Monster Museum"; viewpoint 1,278,290,11,0xDA70D6; next; break; case 13: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^CD1039Schweicherbil Magic Academy^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^CD1039Schweicherbil Magic Academy"; viewpoint 1,323,280,12,0xCD1039; next; break; @@ -152,22 +101,14 @@ yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 700,{ while (.@loop) { switch(select("[ Kafra Employees ]:[ Eden Teleport Officer ]:Previous Menu")) { case 1: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^FA8072Kafra Employees^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FA8072Kafra Employees"; viewpoint 1,152,187,13,0xFA8072; viewpoint 1,277,221,14,0xFA8072; viewpoint 1,327,108,15,0xFA8072; next; break; case 2: - mes "[Juno Guide]"; - mes "I will mark the location"; - mes "of the ^803232Eden Teleport Officer^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^803232Eden Teleport Officer"; viewpoint 1,144,189,16,0x803232; next; break; @@ -206,6 +147,14 @@ yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 700,{ close; } } + end; +L_Mark: + mes "[Juno Guide]"; + mes "I will mark the location"; + mes "of the "+getarg(0)+"^000000"; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } yuno,153,47,4 duplicate(GuideJuno) Juno Guide#yuno02 700 diff --git a/npc/guides/guides_lighthalzen.txt b/npc/guides/guides_lighthalzen.txt index 045e7b1a2..52ee73902 100644 --- a/npc/guides/guides_lighthalzen.txt +++ b/npc/guides/guides_lighthalzen.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guides for the city of Lighthalzen +//= Guides for the city of Lighthalzen. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Optimized. [Euphy] //============================================================ lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ @@ -38,92 +39,52 @@ lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ while (.@loop) { switch(select("[ Hotel ]:[ Bank ]:[ Airport ]:[ Weapon Shop ]:[ Department Store ]:[ Police Station ]:[ Jewelry Store ]:[ Cool Event Corp. ]:[ Somatology Laboratory ]:[ Alchemist Association ]:Previous Menu")) { case 1: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^FF0000Hotel^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF0000Hotel"; viewpoint 1,160,217,0,0xFF0000; next; break; case 2: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^FF4500Bank^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF4500Bank"; viewpoint 1,203,257,1,0xFF4500; next; break; case 3: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^DAA520Airport^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^DAA520Airport"; viewpoint 1,262,75,2,0xDAA520; next; break; case 4: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^7B68EEWeapon Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^7B68EEWeapon Shop"; viewpoint 1,194,35,3,0x7B68EE; next; break; case 5: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^B91A4DDepartment Store^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^B91A4DDepartment Store"; viewpoint 1,202,106,4,0xB91A4D; next; break; case 6: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^008000Police Station^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^008000Police Station"; viewpoint 1,234,276,5,0x008000; next; break; case 7: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^0000FFJewelry Store^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000FFJewelry Store"; viewpoint 1,96,110,6,0x0000FF; next; break; case 8: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^000080Cool Event Corp.^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^000080Cool Event Corp."; viewpoint 1,238,217,7,0x000080; next; break; case 9: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^800080Somatology Laboratory^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^800080Somatology Laboratory"; viewpoint 1,101,243,8,0x800080; next; break; case 10: - mes "[Lighthalzen Guide]"; - mes "I will mark the location of"; - mes "^0A9696Alchemist Association^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0A9696Alchemist Association"; viewpoint 1,54,132,9,0x0A9696; next; break; @@ -144,11 +105,7 @@ lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ mes "on the 1st floor of the Weapon Shop."; viewpoint 1,194,35,10,0x0A9696; next; - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^0A9696Armsmith^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0A9696Armsmith"; next; break; case 2: @@ -159,38 +116,22 @@ lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ mes "of the Weapon Shop."; viewpoint 1,194,35,11,0x4B0082; next; - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of ^4B0082Seiyablem^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^4B0082Seiyablem",1; next; break; case 3: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^FF4500Pet Groomer^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF4500Pet Groomer"; viewpoint 1,222,191,12,0xFF4500; next; break; case 4: - mes "[Lighthalzen Guide]"; - mes "I will mark the locations"; - mes "of the ^008080Kafra Employees^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^008080Kafra Employees"; viewpoint 1,164,99,13,0x008080; viewpoint 1,164,99,14,0x008080; next; break; case 5: - mes "[Lighthalzen Guide]"; - mes "I will mark the location"; - mes "of the ^FF1493Cool Event Corp. Staff^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF1493Cool Event Corp. Staff"; viewpoint 1,94,247,15,0xFF1493; next; break; @@ -230,6 +171,14 @@ lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ end; } } + end; +L_Mark: + mes "[Lighthalzen Guide]"; + mes "I will mark the location"; + mes "of "+((getarg(1,0))?"":"the ")+getarg(0)+"^000000"; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } lighthalzen,220,310,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz02 852 diff --git a/npc/guides/guides_lutie.txt b/npc/guides/guides_lutie.txt index 60b9a97c2..418637ba5 100644 --- a/npc/guides/guides_lutie.txt +++ b/npc/guides/guides_lutie.txt @@ -3,70 +3,47 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guide for the city of Lutie +//= Guide for the city of Lutie. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Fixed and optimized. [Euphy] //============================================================ xmas,140,137,3 script Lutie Guide#xmas 717,{ mes "[Lutie Guide]"; mes "Welcome to ^8B4513Lutie^000000,"; mes "the Snow Village."; - mes "Do you need help navigating the village?" ; + mes "Do you need help navigating the village?"; while (1) { next; switch(select("[ Gift Shop ]:[ Church ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Santa's House ]:[ Toy Factory ]:Remove Marks from Mini-Map:Cancel")) { case 1: - mes "[Lutie Guide]"; - mes "Let me mark the location of the"; - mes "^00808Gift Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^008080Gift Shop"; viewpoint 1,172,131,2,0x008080; break; case 2: - mes "[Lutie Guide]"; - mes "Let me mark the location of the"; - mes "^006400Church^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Church"; viewpoint 1,104,287,1,0xAAFF00; break; case 3: - mes "[Lutie Guide]"; - mes "Let me mark the location of the"; - mes "^FF1493Weapon & Armor Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF1493Weapon & Armor Shop"; viewpoint 1,171,158,3,0xFF1493; break; case 4: - mes "[Lutie Guide]"; - mes "Let me mark the location of the"; - mes "^8B4513Tool Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^8B4513Tool Shop"; viewpoint 1,122,131,4,0x8B4513; break; case 5: - mes "[Lutie Guide]"; - mes "Let me mark the location of the"; - mes "^9400D3Toy Factory^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^B9062FSanta's House",1; viewpoint 1,149,237,5,0x9400D3; break; case 6: - mes "[Lutie Guide]"; - mes "Let me mark the location of"; - mes "^B9062FSanta's House^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^9400D3Toy Factory"; viewpoint 1,143,312,6,0xFF0000; break; case 7: @@ -87,4 +64,12 @@ xmas,140,137,3 script Lutie Guide#xmas 717,{ close; } } + end; +L_Mark: + mes "[Lutie Guide]"; + mes "Let me mark the location of "+((getarg(1,0))?"":"the"); + mes getarg(0)+"^000000"; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } diff --git a/npc/guides/guides_morroc.txt b/npc/guides/guides_morroc.txt index 8ff31b7ed..d12859251 100644 --- a/npc/guides/guides_morroc.txt +++ b/npc/guides/guides_morroc.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guides for the city of Morroc, and Morroc Ruins +//= Guides for the city of Morroc and Morroc Ruins. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Fixed and optimized. [Euphy] //============================================================ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ @@ -52,20 +53,12 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ next; break; case 4: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "the ^006400Forge^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Forge"; viewpoint 1,47,47,3,0xAAFF00; next; break; case 5: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "the ^7F3300Weapon & Armor Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^7F3300Weapon & Armor Shop"; viewpoint 1,253,56,4,0xD2691E; next; break; @@ -80,11 +73,7 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ next; break; case 7: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "the ^B9062FTavern^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^B9062FTavern"; viewpoint 1,52,259,6,0xFF0000; next; break; @@ -99,21 +88,13 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ while (.@loop) { switch(select("[ Kafra Employee ]:[ Poison Herb Salesman ]:[ Dye Maker ]:[ Seiyablem ]:Previous Menu")) { case 1: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "^0000FFKafra Employees^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000FFKafra Employees"; viewpoint 1,156,97,7,0x0A82FF; viewpoint 1,160,258,8,0x0A82FF; next; break; case 2: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "^006400Poison Herb Salesman^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Poison Herb Salesman"; viewpoint 1,190,96,9,0xAAFF00; next; break; @@ -171,6 +152,14 @@ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ end; } } + end; +L_Mark: + mes "[Morroc Guide]"; + mes "Let me mark the location of the"; + mes getarg(0)+"^000000"; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } morocc,154,38,6 duplicate(GuideMorroc) Guide#02morocc 707,{ @@ -229,57 +218,33 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ while (.@loop) { switch(select("[ Eden Teleport Officer ]:[ Tool Dealer ]:[ Kafra Employee ]:[ Repairman ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Leablem ]:Previous Menu")) { case 1: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "^006400Eden Teleport Officer^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Eden Teleport Officer"; viewpoint 1,68,164,3,0xAAFF00; next; break; case 2: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "^800080Tool Dealers^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^800080Tool Dealers"; viewpoint 1,92,128,5,0xDA70D6; viewpoint 1,114,63,6,0xDA70D6; next; break; case 3: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "^B9062FKafra Employee^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^B9062FKafra Employee"; viewpoint 1,59,157,7,0xFF0000; next; break; case 4: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "^0000FFRepairman^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000FFRepairman"; viewpoint 1,107,94,8,0x0A82FF; next; break; case 5: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "^FF5400Pet Groomer^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF5400Pet Groomer"; viewpoint 1,118,170,9,0xFFB400; next; break; case 6: - mes "[Morroc Guide]"; - mes "Let me mark the location of the"; - mes "^006400Chef Assistant^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Chef Assistant"; viewpoint 1,115,123,10,0xAAFF00; next; break; @@ -326,6 +291,14 @@ moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{ end; } } + end; +L_Mark: + mes "[Morroc Guide]"; + mes "Let me mark the location of the"; + mes getarg(0)+"^000000"; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } moc_ruins,70,164,3 duplicate(GuideMocRuins) Guide#02ruins 707 diff --git a/npc/guides/guides_moscovia.txt b/npc/guides/guides_moscovia.txt index a4f96bcae..de9f7ddf0 100644 --- a/npc/guides/guides_moscovia.txt +++ b/npc/guides/guides_moscovia.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guide for the city of Moscovia +//= Guide for the city of Moscovia. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Optimized (a little bit). [Euphy] //============================================================ moscovia,226,191,4 script Moscovia Guide#02mosc 959,{ @@ -21,57 +22,58 @@ moscovia,226,191,4 script Moscovia Guide#02mosc 959,{ mes "welcome to come here."; mes "I'm supporting to offer information about here."; mes "if you want to ask anything just feel free tell me."; + set .@str$,"Is there anything else I can do for you?"; while (1) { next; switch(select("[ Palace ]:[ Chapel ]:[ Weapon Shop ]:[ Armor Shop ]:[ Tool Shop ]:[ Inn ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) { case 1: mes "[Moscovia Guide]"; mes "In the ^006400Palace^000000 you will find our Lord the Czar and other servants."; - mes "Is there anything else I can do for you?"; + mes .@str$; viewpoint 1,255,140,0,0x0A82FF; break; case 2: mes "[Moscovia Guide]"; mes "The ^008080Chapel^000000 is located here."; - mes "Is there anything else I can do for you?"; + mes .@str$; viewpoint 1,253,179,1,0xAAFF00; break; case 3: mes "[Moscovia Guide]"; mes "You can buy weapons from the best craftsmen in Moscovia if you go to ^FF1493Weapon Shop^000000."; - mes "Is there anything else I can do for you?"; + mes .@str$; viewpoint 1,186,191,2,0x008080; break; case 4: - mes "[Moscovia Guide]" ; + mes "[Moscovia Guide]"; mes "You will find only the best gear at the Moscovia ^8B4513Armor Shop^000000."; - mes "Is there anything else I can do for you?"; + mes .@str$; viewpoint 1,204,169,3,0xB200FF; break; case 5: mes "[Moscovia Guide]"; mes "The ^FF1493Tool Shop^000000 is located just south from the center of town."; mes "You can find all sorts of things you need for your travels."; - mes "Is there anything else I can do for you?"; + mes .@str$; viewpoint 1,221,176,4,0xFF1493; break; case 6: mes "[Moscovia Guide]"; mes "The Inn 'Sticky Herb Tree' is just north from the center of town."; mes "If you need to rest, there is no better place to stay."; - mes "Is there anything else I can do for you?"; + mes .@str$; viewpoint 1,227,206,5,0x8B4513; break; case 7: mes "[Moscovia Guide]"; mes "You can go back to Alberta at the docks."; - mes "Is there anything else I can do for you?"; + mes .@str$; viewpoint 1,166,53,6,0x00BFFF; break; case 8: mes "[Moscovia Guide]"; mes "I'll remove all marks from your mini-map."; - mes "Is there anything else I can do for you?"; + mes .@str$; viewpoint 2,1,1,0,0xFFFFFF; viewpoint 2,1,1,1,0xFFFFFF; viewpoint 2,1,1,2,0xFFFFFF; diff --git a/npc/guides/guides_niflheim.txt b/npc/guides/guides_niflheim.txt index b5c7a62fc..e698ee954 100644 --- a/npc/guides/guides_niflheim.txt +++ b/npc/guides/guides_niflheim.txt @@ -3,54 +3,39 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guide for the city of Niflehim +//= Guide for the city of Niflehim. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. +//= 1.1 Optimized. [Euphy] //============================================================ niflheim,201,187,3 script Niflheim Guide#01nif 849,{ mes "[Niflheim Guide]"; mes "Welcome to.. ^8B4513Niflheim^000000..."; mes "the Realm of the Dead..."; - mes "Do you need help navigating the realm...?" ; + mes "Do you need help navigating the realm...?"; while (1) { next; switch(select("[ Tool Shop ]:[ Pub ]:[ Weapon Shop ]:[ Witch's Castle ]:Remove Marks from Mini-Map:Cancel")) { case 1: - mes "[Niflheim Guide]"; - mes "Let me mark the location of the"; - mes "^0000FFTool Shop^000000.."; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000FFTool Shop"; viewpoint 1,218,196,0,0x0A82FF; break; case 2: - mes "[Niflheim Guide]"; - mes "Let me mark the location of the"; - mes "^006400Pub^000000.."; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Pub"; viewpoint 1,189,208,1,0xAAFF00; break; case 3: - mes "[Niflheim Guide]"; - mes "Let me mark the location of the"; - mes "^800080Weapon Shop^000000.."; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^800080Weapon Shop"; viewpoint 1,218,170,2,0xDA70D6; break; case 4: - mes "[Niflheim Guide]"; - mes "Let me mark the location of the"; - mes "^FF1493Witch's Castle^000000.."; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF1493Witch's Castle"; viewpoint 1,255,195,3,0xFF1493; break; case 5: @@ -68,4 +53,12 @@ niflheim,201,187,3 script Niflheim Guide#01nif 849,{ close; } } + end; +L_Mark: + mes "[Niflheim Guide]"; + mes "Let me mark the location of the"; + mes getarg(0)+"^000000..."; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } diff --git a/npc/guides/guides_payon.txt b/npc/guides/guides_payon.txt index c96e02532..c703a98c9 100644 --- a/npc/guides/guides_payon.txt +++ b/npc/guides/guides_payon.txt @@ -3,14 +3,15 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] -//= Guides for the city of Payon +//= Guides for the city of Payon. //===== Additional Comments: ================================= //= 1.0 First version, Renewal guides. +//= 1.1 Fixed and optimized. [Euphy] //============================================================ payon,163,64,3 script Guide#01payon::GuidePayon 708,{ @@ -36,56 +37,32 @@ payon,163,64,3 script Guide#01payon::GuidePayon 708,{ next; break; case 2: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "the ^0000FFTool Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000FFTool Shop"; viewpoint 1,144,85,1,0x0A82FF; next; break; case 3: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "the ^FF5400Weapon & Armor Shop^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF5400Weapon & Armor Shop"; viewpoint 1,139,159,2,0xFFB400; next; break; case 4: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "the ^006400Inn & Tavern^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Inn & Tavern"; viewpoint 1,220,117,3,0xAAFF00; next; break; case 5: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "the ^7F3300Central Palace^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^7F3300Central Palace"; viewpoint 1,155,245,4,0xD2691E; next; break; case 6: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "the ^800080Palace Court^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^800080Palace Court"; viewpoint 1,107,325,5,0xDA70D6; next; break; case 7: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "the ^B9062FRoyal Kitchen^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^B9062FRoyal Kitchen"; viewpoint 1,154,325,6,0xFF0000; next; break; @@ -98,50 +75,30 @@ payon,163,64,3 script Guide#01payon::GuidePayon 708,{ case 2: set .@loop,1; while (.@loop) { - switch(select("[ Eden Teleport Officer ]:[ Kafra Shop ]:[ Repair /Armsmith ]:[ Trap Specialist ]:[ Seiayblem ]:[ Leablem ]:[ Jade ]:[ Pet Groomer ]:[ Chef Assistant ]:Previous Menu")) { + switch(select("[ Eden Teleport Officer ]:[ Kafra Shop ]:[ Repair / Armsmith ]:[ Kafra Employee]:[ Trap Specialist ]:[ Seiayblem ]:[ Leablem ]:[ Jade ]:[ Pet Groomer ]:[ Chef Assistant ]:Previous Menu")) { case 1: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "^0000FFEden Teleport Officer^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^0000FFEden Teleport Officer"; viewpoint 1,177,111,7,0x0A82FF; next; break; case 2: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "^FF5400Kafra Shop Girls^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^FF5400Kafra Shop Girls"; viewpoint 1,164,157,8,0xFFB400; next; break; case 3: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "^006400Repairman & Armsmith^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Repairman & Armsmith"; viewpoint 1,144,170,9,0xAAFF00; next; break; case 4: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "^7F3300Kafra Employees^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^7F3300Kafra Employees"; viewpoint 1,181,104,10,0xD2691E; viewpoint 1,175,226,11,0xD2691E; next; break; case 5: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "^800080Trap Specialist^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^800080Trap Specialist"; viewpoint 1,123,109,12,0xDA70D6; next; break; @@ -177,20 +134,12 @@ payon,163,64,3 script Guide#01payon::GuidePayon 708,{ next; break; case 9: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "^006400Pet Groomer^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^006400Pet Groomer"; viewpoint 1,177,131,16,0xAAFF00; next; break; case 10: - mes "[Payon Guide]"; - mes "Let me mark the location of the"; - mes "^7F3300Chef Assistant^000000"; - mes "on your mini-map."; - mes "Would you like to check any other locations?"; + callsub L_Mark,"^7F3300Chef Assistant"; viewpoint 1,206,119,17,0xD2691E; next; break; @@ -232,6 +181,14 @@ payon,163,64,3 script Guide#01payon::GuidePayon 708,{ end; } } + end; +L_Mark: + mes "[Payon Guide]"; + mes "Let me mark the location of the"; + mes getarg(0)+"^000000"; + mes "on your mini-map."; + mes "Would you like to check any other locations?"; + return; } payon,151,182,6 duplicate(GuidePayon) Guide#02payon 708 @@ -245,6 +202,7 @@ pay_arche,86,33,4 script Guide#05payon 708,{ mes "a subsidiary village of Payon."; mes "Do you need help navigating the village?"; next; + set .@str$,"Would you like to check any other locations?"; while (1) { switch(select("[ Payon Dungeon ]:[ Archer Guild ]:[ Tool Shop ]:[ Kafra Employee ]:[ Mercenary Guildsman ]:[ Alchemist Guildsman ]:[ Eden Teleport Officer ]:Remove Marks from Mini-Map:Cancel")) { case 1: @@ -252,7 +210,7 @@ pay_arche,86,33,4 script Guide#05payon 708,{ mes "Let me mark the entrance of"; mes "the ^B9062FPayon Dungeon^000000"; mes "on your mini-map."; - mes "Would you like to check any other locations?"; + mes .@str$; viewpoint 1,38,131,0,0xFF0000; next; break; @@ -261,7 +219,7 @@ pay_arche,86,33,4 script Guide#05payon 708,{ mes "The ^0000FFArcher Guild^000000"; mes "is where you can change"; mes "your job to Archer."; - mes "Would you like to check any other locations?"; + mes .@str$; viewpoint 1,143,164,1,0x0A82FF; next; break; @@ -270,7 +228,7 @@ pay_arche,86,33,4 script Guide#05payon 708,{ mes "Let me mark the location of the"; mes "^FF5400Tool Shop^000000"; mes "on your mini-map."; - mes "Would you like to check any other locations?"; + mes .@str$; viewpoint 1,72,156,2,0xFFB400; next; break; @@ -278,7 +236,7 @@ pay_arche,86,33,4 script Guide#05payon 708,{ mes "[Payon Guide]"; mes "Let me mark the location of the ^006400Kafra Employee^000000"; mes "on your mini-map."; - mes "Would you like to check any other locations?"; + mes .@str$; viewpoint 1,55,123,3,0xAAFF00; next; break; @@ -288,7 +246,7 @@ pay_arche,86,33,4 script Guide#05payon 708,{ mes "^7F3300Bow Mercenary Manager^000000 and"; mes "^7F3300Mercenary Goods Merchant^000000"; mes "on your mini-map."; - mes "Would you like to check any other locations?"; + mes .@str$; viewpoint 1,101,166,4,0xD2691E; next; break; @@ -297,7 +255,7 @@ pay_arche,86,33,4 script Guide#05payon 708,{ mes "Let me mark the location of the"; mes "^800080Alchemist Guildsman^000000"; mes "on your mini-map."; - mes "Would you like to check any other locations?"; + mes .@str$; viewpoint 1,127,113,5,0xDA70D6; next; break; @@ -306,14 +264,14 @@ pay_arche,86,33,4 script Guide#05payon 708,{ mes "The ^0000FFEden Teleport Officer^000000"; mes "is currently staying inside"; mes "the Archer Guild building."; - mes "Would you like to check any other locations?"; + mes .@str$; viewpoint 1,143,164,6,0x0A82FF; next; break; case 8: mes "[Payon Guide]"; mes "Sure, I'll remove all marks from your mini-map."; - mes "Would you like to check any other locations?"; + mes .@str$; viewpoint 2,1,1,0,0xFFFF00; viewpoint 2,1,1,1,0x000000; viewpoint 2,1,1,2,0xFF0000; diff --git a/npc/jobs/3-1/warlock.txt b/npc/jobs/3-1/warlock.txt index aef2df846..8c517c991 100644 --- a/npc/jobs/3-1/warlock.txt +++ b/npc/jobs/3-1/warlock.txt @@ -4,7 +4,7 @@ //= Masao //= Credits: Muad_Dib, Gepard & L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.2a //===== Compatible With: ===================================== //= Any rAthena SVN //===== Description: ========================================= @@ -16,13 +16,14 @@ //= constants, added item names in comments. //= 1.2 Fixed the problem where NPC are not enabled and chamber will never open //= for the second try or use. +//= 1.2a Fixed a typo. [Euphy] //============================================================ morocc,103,144,0 script distorted place morroc 139,1,1,{ OnTouch: if (job_wl > 1){ - if (Class == Job_Warlock || Class == Job_Warlock_T || Job_Baby_Warlock){ + if (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock){ mes " - There is a strange distortion here - "; close; } diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index f8ad2529b..00adf71b4 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -3,11 +3,11 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 3.0 +//= 3.1 //===== Compatible With: ===================================== //= rAthena 1.0+ //===== Description: ========================================= -//= +//= Town shop NPCs. //===== Additional Comments: ================================= //= For earlier update notes see the bottom. //= 2.0 updated several shop npcs. [L0ne_W0lf] diff --git a/npc/merchants/shops_re.txt b/npc/merchants/shops_re.txt index 5fa158ce0..4f0ad37e3 100644 --- a/npc/merchants/shops_re.txt +++ b/npc/merchants/shops_re.txt @@ -3,37 +3,12 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 3.0 +//= 3.1 //===== Compatible With: ===================================== //= rAthena 1.0+ //===== Description: ========================================= -//= +//= Renewal-specific town shop NPCs. //===== Additional Comments: ================================= -//= For earlier update notes see the bottom. -//= 2.0 updated several shop npcs. [L0ne_W0lf] -//= Added proper Venom Knife dealer, and consiquently removed wenom Knives from weapon dealers. -//= Moved all Cooking related NPCs to their own section. -//= Re-alphabetized sections. Some of them were out of place. -//= Removed commented out shops. -//= 2.0b Einbech tool dealer got lost somewhere along the way, re-added. [L0ne_W0lf] -//= 2.1 Fixed missing item from "Fresh Fish" from cooking addition shops. [L0ne_W0lf] -//= 2.1a Fixed the second "Line" selling in Comodo Weapon shop. (Should have been Whip) [L0ne_W0lf] -//= 2.2 Added Veins shops. [L0ne_W0lf] -//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//= 2.4 Fixed Jawaii Ice cream salesman. [L0ne_W0lf] -//= 2.5 Updated Morroc shops to episode 12.1. [L0ne_W0lf] -//= 2.6 Added Brasilis shops. [L0ne_W0lf] -//= Updated Pet Groomers with four new pet feeds. -//= 2.7 Added Trading merchants, (ninja& gunslinger) to Izlude and Alberta. [L0ne_W0lf] -//= Made Brasilis shop names unique, and uncommented. -//= Changed the whip sold in comodo weapon shop. (1956 ->1960) -//= Added Fire and Silver arrow to Einbroch tool dealer. -//= Re-added Bill of Birds to Morroc Item Collectors. -//= 2.7a Actually applied the right update to the comodo weapon shop. [L0ne_W0lf] -//= 2.7b Corrected Brasilis Fruit Merchant. (bugreport:4278) [L0ne_W0lf] -//= 2.8 Updates to Brasilis Merchants. [L0ne_W0lf] -//= 2.9 Added missing Cooking Items for Material Seller. [tr0n] -//= 3.0 Added all new Shops which were available in the latest available official files. [Masao] //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi] //============================================================ diff --git a/npc/mobs/dungeons/iz_dun.txt b/npc/mobs/dungeons/iz_dun.txt index 6e6901de1..b56f8eed3 100644 --- a/npc/mobs/dungeons/iz_dun.txt +++ b/npc/mobs/dungeons/iz_dun.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.3 +//= 1.3a //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= diff --git a/npc/mobs/dungeons/iz_dun_re.txt b/npc/mobs/dungeons/iz_dun_re.txt index 42f97fd9f..43ade6c10 100644 --- a/npc/mobs/dungeons/iz_dun_re.txt +++ b/npc/mobs/dungeons/iz_dun_re.txt @@ -3,12 +3,10 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.3 +//= 1.3a //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= -//= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester] -//= 1.2 More accurate spawns [Playtester] //= 1.3 Added Izlude Dungeon F6 spawns [Chilly] //= 1.3a Moved Izlude Dungeon F6 spawns to separate file. [Kenpachi] //============================================================ diff --git a/npc/mobs/dungeons/lhz_dun.txt b/npc/mobs/dungeons/lhz_dun.txt index d42c7a19d..cc0a53f16 100644 --- a/npc/mobs/dungeons/lhz_dun.txt +++ b/npc/mobs/dungeons/lhz_dun.txt @@ -3,7 +3,7 @@ //===== By: ================================================== // The Prometheus Project, rAthena dev team //===== Current Version: ===================================== -//= 1.9 +//= 1.9a //===== Compatible With: ===================================== //= Any Athena //===== Additional Comments: ================================= diff --git a/npc/mobs/dungeons/lhz_dun_re.txt b/npc/mobs/dungeons/lhz_dun_re.txt index ed90c353f..3a6deb5d0 100644 --- a/npc/mobs/dungeons/lhz_dun_re.txt +++ b/npc/mobs/dungeons/lhz_dun_re.txt @@ -3,24 +3,10 @@ //===== By: ================================================== // The Prometheus Project, rAthena dev team //===== Current Version: ===================================== -//= 1.9 +//= 1.9a //===== Compatible With: ===================================== //= Any Athena //===== Additional Comments: ================================= -//= 08/24/05 : Added 1st version. [Muad_Dib] -//= 1.1: Some corrections to level 1, 2 as pointed out by -//= MasterofMuppets. [Skotlex] -//= 1.3: Some fixes based on kRO's "RO Map" [Poki#3] -//= I also made the place more Moby ^^ -//= 1.4: Adjusted spawns according to own info from iRO [MasterOfMuppets] -//= 1.5: More accurate spawn numbers and iRO names thanks to Tharis [Playtester] -//= 1.6: Official X.3 spawns [Playtester] -//= 1.7 Corrected MVP spawn function to be standard to iRO. [L0ne_W0lf] -//= - A random 99 will now be spawned when the MVP spawns. -//= - Spare spawn and MVP spawn now spawn in official locations. -//= - Expandeded timer to allow for varying spawn times. -//= 1.7a Added dummy event to keep from causnig warnings. [L0ne_W0lf] -//= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf] //= 1.9 Added Bio4 spawns. [Chilly] //= 1.9a Moved Bio4 spawns to separate file. [Kenpachi] //============================================================ diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 59d23c234..a9639e69a 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.1 +//= 2.2a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -59,6 +59,7 @@ //= - Muff's Loan //= - Broken Diamond //= - Z-Gang Quest +//= 2.2a Fixed a few job constant typos. [Euphy] //============================================================ // Nameless Island and Cursed Monestary Access Quest @@ -4645,7 +4646,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ close; } case 2: - if ((BaseJob == Job_Novice) || (BaseJob == Job_Supernovice)) { + if ((BaseJob == Job_Novice) || (BaseJob == Job_SuperNovice)) { mes "[Ibrahim]"; mes "So it's true..."; mes "People say you're"; @@ -4663,7 +4664,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ mes "for someone smart and strong."; close; } - else if (BaseClass == CRUSADER) { + else if (BaseClass == Job_Crusader) { mes "[Ibrahim]"; mes "Heh, so you really"; mes "are one of those holy"; @@ -4694,7 +4695,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ mes "really spoke highly of you."; close; } - else if (BaseClass == Job_Alcehmist) { + else if (BaseClass == Job_Alchemist) { mes "[Ibrahim]"; mes "I know a guy who knows"; mes "a guy in the Alchemist Guild."; @@ -4738,7 +4739,7 @@ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ mes "like an angel..."; close; } - else if (BaseClass == Job_dancer) { + else if (BaseClass == Job_Dancer) { mes "[Ibrahim]"; mes "Is it really true?"; mes "I hear you dance"; -- cgit v1.2.3-60-g2f50