From dec3ae611b85e2ce1d01a572a0d07d0e2907408b Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Fri, 22 Feb 2008 06:16:21 +0000 Subject: * Several small fixes to scripts, and updates. - Updated City warps for Lighthalzen, and dugneon warps. - Updated castle warps for Schwaltzvalt Castles Map. - "The Sign" quest is now enabled by default. (bugreport:1011) - Added Dimensional Gorge map spawns (According to RO Future Wiki) - Updated Lighthalzen boss spawning mechanisim to official. - Fixed a small error in the novice potion exchanger. - Resolves the following: bugreport:879 bugreport:973 bugreport:983 bugreport:1013 bugreport:1021 bugreport:1024 bugreport:1026 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12227 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 10 ++ npc/guides/guides_veins.txt | 9 +- npc/guild/gldfunc_manager.txt | 5 +- npc/jobs/2-1/blacksmith.txt | 5 +- npc/jobs/2-1/wizard.txt | 5 +- npc/jobs/2-2/bard.txt | 6 +- npc/jobs/2-2/rogue.txt | 8 +- npc/merchants/novice_exchange.txt | 9 +- npc/mobs/dungeons/lhz_dun.txt | 102 ++++++++++++++---- npc/mobs/fields/morocc.txt | 40 ++++++- npc/quests/quests_hugel.txt | 5 +- npc/scripts_athena.conf | 6 +- npc/warps/cities/lighthalzen.txt | 214 ++++++++++++++++---------------------- npc/warps/dungeons/lhz_dun.txt | 84 +++++++-------- npc/warps/guild/guildcastles.txt | 20 ++-- 15 files changed, 308 insertions(+), 220 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index ba1c5b605..f4d704e60 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,15 @@ Date Added ====== +2008/02/22 + * Rev. 12227 Several small fixes to scripts, and updates. [L0ne_W0lf] + - Updated City warps for Lighthalzen, and dugneon warps. + - Updated castle warps for Schwaltzvalt Castles Map. + - "The Sign" quest is now enabled by default. (bugreport:1011) + - Added Dimensional Gorge map spawns (According to RO Future Wiki) + - Updated Lighthalzen boss spawning mechanisim to official. + - Fixed a small error in the novice potion exchanger. + - Resolves the following: bugreport:879 bugreport:973 bugreport:983 + - bugreport:1013 bugreport:1021 bugreport:1024 bugreport:1026 2008/02/21 * Fixed Hugel Airship Staff from teleporting you to the wrong airplane. [Paradox924X] 2008/02/17 diff --git a/npc/guides/guides_veins.txt b/npc/guides/guides_veins.txt index 91b771357..3410c4253 100644 --- a/npc/guides/guides_veins.txt +++ b/npc/guides/guides_veins.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 1.0 First version. [L0ne_W0lf] //= 1.1 Added second Veins guide NPC. [L0ne_W0lf] +//= 1.2 Fixed a few small typos. [L0ne_W0lf] //============================================================ veins,210,345,5 script Veins Guide#1::ve_guide 934,{ @@ -42,7 +43,7 @@ veins,210,345,5 script Veins Guide#1::ve_guide 934,{ case 1: mes "[Veins Guide]"; mes "Our temple is located north,"; - mes "and always crowded with sincere followes of Goddess Freya."; + mes "and always crowded with sincere followers of Goddess Freya."; if (.@compass_check == 1) viewpoint 1,196,258,1,0xFF0000; break; case 2: @@ -79,10 +80,10 @@ veins,210,345,5 script Veins Guide#1::ve_guide 934,{ break; case 7: mes "[Veins Guide]"; - mes "Are you intereste din studying geology?"; + mes "Are you interested in studying geology?"; mes "Then you'd better go check out the"; mes "Geological Research Institute on"; - mes "the 2nd floor of hte weapon shop."; + mes "the 2nd floor of the weapon shop."; if (.@compass_check == 1) viewpoint 1,150,175,7,0x00FF00; break; case 8: diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt index fc737b6f2..29abceed3 100644 --- a/npc/guild/gldfunc_manager.txt +++ b/npc/guild/gldfunc_manager.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= jAthena - kalen (1.0) & eAthena Team //===== Current Version: ===================================== -//= 1.9c +//= 2.0 //===== Compatible With: ===================================== //= eAthena SVN; RO Episode 4+ //===== Description: ========================================= @@ -41,6 +41,7 @@ //= 1.9a Fixed Kafra cutin not closing if you choose not to dismiss her. [L0ne_W0lf] //= 1.9b Corrected impropper variable being used for defense investment. [L0ne_W0lf] //= 1.9c Fixed a typo with zeny checkm when installing guardian. [L0ne_W0lf] +//= 2.0 Fixed a typo in abandon function call. [L0ne_W0lf] //============================================================ function script F_GldManager { @@ -375,7 +376,7 @@ function script F_GldManager { // mes "[ "+getarg(0)+" ]"; // mes "Master!!....."; // mes "...... Ma..s...ter....."; - // callfunc "F_GuildBreak",getarg(0),getarg(4); + // callfunc "F_GuildBreak",getarg(1),getarg(4); // return 0; // } // mes "[ "+getarg(0)+" ]"; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 7effb742c..c7721045f 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -7,7 +7,7 @@ //= Optimized and further edited by kobra_k88. //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.4c +//= 2.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -35,6 +35,7 @@ //= 2.4c More fixes courtosy of Micktu. [L0ne_W0lf] //= 2.4d Fixed an incorrect answer in the quiz. (Trojal) [L0ne_W0lf] //= 2.4e Touched up a few issues as pointed out by Ultramage. [L0ne_W0lf] +//= 2.5 Krongast is in Lighthalzen. (DarkValmir) [L0ne_W0lf] //============================================================== ein_in01,18,28,4 script Guildsman#BLS 731,{ @@ -685,7 +686,7 @@ L_AskQuestions: next; mes "[Geschupenschte]"; mes "Anyway, take this"; - mes "to ^8E6B23Krongast^000000 in Izlude"; + mes "to ^8E6B23Krongast^000000 in Lighthalzen"; break; case 12: mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt."; diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index 8b40063f4..6dceefcf1 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -4,7 +4,7 @@ //= (Aegis) Translated by yoshiki, converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.5c +//= 2.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 2.5a More bugfixes care of Barron-Monster. [L0ne_W0lf] //= 2.5b Fixed tests calling on a non-existant label in "Room of x#Failed" npcs. [L0ne_W0lf] //= 2.5c Bug fixes. Cleaned up some NPCs slightly. [L0ne_W0lf] +//= 2.6 Fixed Water Room not warping on time-up. [L0ne_W0lf] //============================================================ gef_tower,111,37,4 script Wizard Guildsman 70,{ @@ -1142,7 +1143,7 @@ OnTimer183000: end; OnTimer184000: - donpcevent "Room of Water#Failed::OnEnable"; + enablenpc "Room of Water#Failed"; end; OnTimer185000: diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index b1c91ecec..d9e03963e 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_Dib(The Prometheus Project), Lupus, Samuray22 //===== Current Version: ===================================== -//= 2.3 +//= 2.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //= - Temporary character variables "@" are now ".@" //= - Fixed some indentation. //= - Changed item names to item IDs +//= 2.4 Fixed hang up on bard quest. ($kiN.) [L0ne_W0lf] //============================================================ //=============== Ayealo ============================ @@ -331,6 +332,9 @@ comodo,226,123,5 script Wandering Bard 741,{ mes "[Lalo]"; mes "You can get this flower from the girl in Prontera."; mes "Please bring me a different flower."; + close2; + cutin "job_bard_aiolo02",255; + end; } else if(countitem(744) > 0) { mes "Oh no, you brought a Bouquet?"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 3ee0f5eab..1fc53589c 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -1275,7 +1275,7 @@ OnTouch: end; OnDisable: - killmonster "in_rogue","gen_ro#1"; + killmonster "in_rogue","gen_ro#1::OnMyMobDead"; end; } @@ -1290,7 +1290,7 @@ OnTouch: end; OnDisable: - killmonster "in_rogue","gen_ro#2"; + killmonster "in_rogue","gen_ro#2::OnMyMobDead"; end; } @@ -1306,7 +1306,7 @@ OnTouch: end; OnDisable: - killmonster "in_rogue","gen_ro#3"; + killmonster "in_rogue","gen_ro#3::OnMyMobDead"; end; } @@ -1321,7 +1321,7 @@ OnTouch: end; OnDisable: - killmonster "in_rogue","gen_ro#4"; + killmonster "in_rogue","gen_ro#4::OnMyMobDead"; end; } diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index ad87dc4ae..f3d1af076 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -3,9 +3,9 @@ //===== By: ================================================== //= ???, eAthena Team //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== -//= eAthena 1.0+ +//= eAthena SVN //===== Description: ========================================= //= [Aegis COnversion] //= Exchanges your Basic Monster drops for Red Potions. @@ -13,6 +13,7 @@ //= 1.2 Rescripted to Aegis 10.standards. [L0ne_W0lf[ //= Made it easier to add new items to exhange list //= meaning only the exchange is done in a function now. +//= 1.3 Fixed dialog mix-up in function. [L0ne_W0lf] //============================================================ prontera,123,102,5 script Merchant#pron 85,{ @@ -303,7 +304,7 @@ function script F_PotExchange { if (countitem(getarg(0)) < getarg(1)) { mes "[Merchant]"; mes "Hey, where are"; - mes "all those Shells"; + mes "all those "+getitemname(getarg(0))+""; mes "that you promised?"; mes "Give me "+getitemname(getarg(0))+"!"; close; @@ -311,7 +312,7 @@ function script F_PotExchange { else { mes "[Merchant]"; mes "Okay, let me check"; - mes "how many Shells you"; + mes "how many "+getitemname(getarg(0))+" you"; mes "have on you. Hmm..."; next; mes "[Merchant]"; diff --git a/npc/mobs/dungeons/lhz_dun.txt b/npc/mobs/dungeons/lhz_dun.txt index ae7311e86..df12e8544 100644 --- a/npc/mobs/dungeons/lhz_dun.txt +++ b/npc/mobs/dungeons/lhz_dun.txt @@ -3,7 +3,7 @@ //===== By: ================================================== // The Prometheus Project, eAthena dev team //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= Any Athena //===== Additional Comments: ================================= @@ -15,6 +15,10 @@ //= 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. //============================================================ @@ -216,26 +220,86 @@ lhz_dun03,139,117,20,11 monster Sniper Cecil 1644,1,2700000,2500000,1 lhz_dun03,138,138,36,34 monster High Priest Margaretha 1643,1,3300000,3000000,1 lhz_dun03,138,138,36,34 monster High Wizard Kathryne 1645,1,2580000,2460000,1 -lhz_dun03,1,1,0 script Lhzdun03monster -1,{ +lhz_dun03,2,2,0 script summon_boss_lt -1,{ OnInit: - 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; - setnpctimer 0; - end; - OnTimer7200000: + initnpctimer; + end; + +OnTimer6000000: + if (rand(1,6) == 1) { + donpcevent "summon_boss_lt::Onsummon"; + stopnpctimer; + } + end; + +OnTimer6300000: + if (rand(1,6) == 2) { + donpcevent "summon_boss_lt::Onsummon"; stopnpctimer; } + end; + +OnTimer6600000: + if (rand(1,6) == 3) { + donpcevent "summon_boss_lt::Onsummon"; + stopnpctimer; + } + end; + +OnTimer6900000: + if (rand(1,6) == 4) { + donpcevent "summon_boss_lt::Onsummon"; + stopnpctimer; + } + end; + +OnTimer7200000: + if (rand(1,6) == 5) { + donpcevent "summon_boss_lt::Onsummon"; + stopnpctimer; + } + end; + +OnTimer7500000: + if (rand(1,6) == 6) { + donpcevent "summon_boss_lt::Onsummon"; + stopnpctimer; + } + end; + +OnTimer7800000: + donpcevent "summon_boss_lt::Onsummon"; + stopnpctimer; + end; + +Onsummon: + // Select Coordinates to summon a random MVP on + switch(rand(1,6)) { + case 1: set .@x,140; set .@y,232; break; + case 2: set .@x,75; set .@y,138; break; + case 3: set .@x,140; set .@y,87; break; + case 4: set .@x,205; set .@y,140; break; + case 5: set .@x,123; set .@y,137; break; + case 6: set .@x,175; set .@y,137; break; + } + set .@mob,rand(1646,1651); + monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMvPDead"; + + // Select Coordinates to summon a random 99 on + switch(rand(1,6)) { + case 1: set .@x2,183; set .@y2,97; break; + case 2: set .@x2,97; set .@y2,96; break; + case 3: set .@x2,47; set .@y2,139; break; + case 4: set .@x2,231; set .@y2,140; break; + case 5: set .@x2,139; set .@y2,211; break; + case 6: set .@x2,139; set .@y2,259; break; + } + set .@mob2,rand(1640,1645); + monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMVP"; + end; +OnMyMvPDead: + killmonster "lhz_dun03","summon_boss_lt::OnMVP"; + initnpctimer; + end; } diff --git a/npc/mobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt index 998313582..1b610f8d7 100644 --- a/npc/mobs/fields/morocc.txt +++ b/npc/mobs/fields/morocc.txt @@ -3,12 +3,14 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 More accurate spawns [Playtester] +//= 1.3 Added Morroc field 20, 21, and 22 spawns, as [L0ne_W0lf] +// indicated by doddler. Incomplete mobs commented out. //============================================================ //================================================== @@ -279,3 +281,39 @@ moc_fild18,135,119,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild18,230,144,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild18,325,207,0,0 monster Yellow Plant 1081,1,180000,90000,1 moc_fild18,325,272,0,0 monster Yellow Plant 1081,1,180000,90000,1 + +//================================================== +// moc_fild20 - Dimensional Gorge +//================================================== +moc_fild20,0,0,0,0 monster Ant Egg 1097,10,0,0,0 +moc_fild20,0,0,0,0 monster Andre 1095,20,0,0,0 +moc_fild20,0,0,0,0 monster Deniro 1105,20,0,0,0 +moc_fild20,0,0,0,0 monster Piere 1160,20,0,0,0 +moc_fild20,0,0,0,0 monster Metaller 1058,20,0,0,0 +moc_fild20,0,0,0,0 monster Drops 1113,30,0,0,0 +moc_fild20,0,0,0,0 monster Scorpion 1001,70,0,0,0 +moc_fild20,0,0,0,0 monster Picky 1050,50,0,0,0 +moc_fild20,0,0,0,0 monster Picky 1049,50,0,0,0 +//moc_fild20,0,0,0,0 monster Morroc's Shadow 1918,1,0,0,0 +//moc_fild20,0,0,0,0 monster Morroc's Shadow 1919,1,0,0,0 +//moc_fild20,0,0,0,0 monster Morroc's Shadow 1920,1,0,0,0 +//moc_fild20,0,0,0,0 monster Morroc's Shadow 1921,1,0,0,0 + +//================================================== +// moc_fild21 - Dimensional Gorge +//================================================== +moc_fild21,0,0,0,0 monster Golem 1040,61,0,0,0 +moc_fild21,0,0,0,0 monster Stalactic Golem 1278,46,0,0,0 +moc_fild21,0,0,0,0 monster Lava Golem 1366,46,0,0,0 +//moc_fild21,0,0,0,0 monster Morroc's Shadow 1918,46,0,0,0 +//moc_fild21,0,0,0,0 monster Morroc's Shadow 1919,46,0,0,0 +//moc_fild21,0,0,0,0 monster Morroc's Shadow 1920,46,0,0,0 +//moc_fild21,0,0,0,0 monster Morroc's Shadow 1921,34,0,0,0 + +//================================================== +// moc_fild22 - Dimensional Gorge +//================================================== +//moc_fild22,0,0,0,0 monster Morroc's Shadow 1918,60,0,0,0 +//moc_fild22,0,0,0,0 monster Morroc's Shadow 1919,60,0,0,0 +//moc_fild22,0,0,0,0 monster Morroc's Shadow 1920,60,0,0,0 +//moc_fild22,0,0,0,0 monster Morroc's Shadow 1921,25,0,0,0 diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index a3e2782d0..419624cfe 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= MasterOfMuppets & SinSloth //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 1.5a Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 1.5b Fixed a variable name. [SinSloth] //= 1.6 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf] +//= 1.7 Corrected locations of warpinside#1. (DarkValmir) [L0ne_W0lf] //============================================================ //------------------------------------------------------------------------- @@ -10574,7 +10575,7 @@ OnTimer100000: } } -odin_tem03,206,302,0 script warpinside#1 139,3,3,{ +odin_tem03,266,302,0 script warpinside#1 139,3,3,{ OnInit: disablenpc "warpinside#1"; diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf index d5fed64a4..6ddb19fca 100644 --- a/npc/scripts_athena.conf +++ b/npc/scripts_athena.conf @@ -91,10 +91,10 @@ npc: npc/quests/Lvl4_weapon_quest.txt npc: npc/quests/thana_quest.txt npc: npc/quests/eye_of_hellion.txt npc: npc/quests/quests_airship.txt -//The Sign Quest will be "enable only". -//There are some things you might consider doing before implementing it, +//The Sign Quest +//Insure that the time zone set corrisponds with the server's. //For more info, read the comments in npc/quests/The_Sign_Quest.txt -//npc: npc/quests/The_Sign_Quest.txt +npc: npc/quests/The_Sign_Quest.txt npc: npc/quests/Kiel_Hyre_Quest.txt //The God Item Quest Files npc: npc/quests/seals/brisingamen_seal.txt diff --git a/npc/warps/cities/lighthalzen.txt b/npc/warps/cities/lighthalzen.txt index 9ca5914d9..c626a2060 100644 --- a/npc/warps/cities/lighthalzen.txt +++ b/npc/warps/cities/lighthalzen.txt @@ -3,12 +3,101 @@ //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points for Lighthalzen //===== Additional Comments: ================================= +//= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] +//============================================================ + +lighthalzen,101,248,0 warp lhz_rekenber1-1 1,1,lhz_in01,111,126 +lhz_in01,111,121,0 warp lhz_rekenber1-2 1,1,lighthalzen,101,243 +lighthalzen,106,248,0 warp lhz_rekenber2-1 1,1,lhz_in01,116,126 +lhz_in01,116,121,0 warp lhz_rekenber2-2 1,1,lighthalzen,106,243 +lhz_in01,88,215,0 warp lhz_rekenber3-1 1,1,lhz_in01,106,18 +lhz_in01,106,15,0 warp lhz_rekenber3-2 1,1,lhz_in01,88,211 +lhz_in01,140,215,0 warp lhz_rekenber4-1 1,1,lhz_in01,158,18 +lhz_in01,158,15,0 warp lhz_rekenber4-2 1,1,lhz_in01,140,211 +lhz_in01,149,179,0 warp lhz_rekenber5-1 1,1,lhz_in01,15,24 +lhz_in01,11,24,0 warp lhz_rekenber5-2 1,1,lhz_in01,145,178 +lhz_in01,76,254,0 warp lhz_rekenber6-1 1,1,lhz_in01,100,52 +lhz_in01,98,55,0 warp lhz_rekenber6-2 1,1,lhz_in01,76,250 +lhz_in01,188,254,0 warp lhz_rekenber7-1 1,1,lhz_in01,191,52 +lhz_in01,194,55,0 warp lhz_rekenber7-2 1,1,lhz_in01,188,250 +lhz_in01,231,226,0 warp lhz_rekenber8-1 1,1,lhz_in01,257,226 +lhz_in01,251,226,0 warp lhz_rekenber8-2 1,1,lhz_in01,225,226 +lhz_in01,40,224,0 warp lhz_rekenber9-1 1,1,lhz_in01,19,129 +lhz_in01,15,129,0 warp lhz_rekenber9-2 1,1,lhz_in01,34,224 +lhz_in01,43,144,0 warp lhz_rekenber10-1 1,1,lhz_in01,278,161 +lhz_in01,278,157,0 warp lhz_rekenber10-2 1,1,lhz_in01,43,139 +lhz_in01,58,129,0 warp lhz_rekenber11-1 1,1,lhz_in01,196,127 +lhz_in01,191,127,0 warp lhz_rekenber11-2 1,1,lhz_in01,53,129 +lighthalzen,198,257,0 warp lhz_bank1-1 1,1,lhz_in02,39,28 +lhz_in02,44,28,0 warp lhz_rekenberbank1-2 1,1,lighthalzen,203,257 +lighthalzen,236,276,0 warp lhz_police1-1 1,1,lhz_in02,133,199 +lhz_in02,129,199,0 warp lhz_police1-2 1,1,lighthalzen,232,275 +lighthalzen,238,220,0 warp lhz_com1-1 1,1,lhz_in02,28,270 +lhz_in02,27,265,0 warp lhz_com1-2 1,1,lighthalzen,238,217 +lhz_in02,13,284,0 warp lhz_com2-1 1,1,lhz_in02,89,285 +lhz_in02,95,285,0 warp lhz_com2-2 1,1,lhz_in02,18,284 +lhz_in02,114,272,0 warp lhz_com3-1 1,1,lhz_in02,153,282 +lhz_in02,149,282,0 warp lhz_com3-2 1,1,lhz_in02,109,272 +lighthalzen,93,110,0 warp lhz_jewel1-1 1,1,lhz_in02,104,26 +lhz_in02,108,26,0 warp lhz_jewel1-2 1,1,lighthalzen,96,110 +lighthalzen,197,36,0 warp lhz_weapon1-1 1,1,lhz_in02,284,30 +lhz_in02,288,30,0 warp lhz_weapon1-2 1,1,lighthalzen,194,35 +lighthalzen,196,46,0 warp lhz_weapon2-1 1,1,lhz_in02,282,83 +lhz_in02,282,79,0 warp lhz_weapon2-2 1,1,lighthalzen,194,48 +lhz_in02,265,14,0 warp lhz_weapon3-1 1,1,lhz_in02,269,82 +lhz_in02,274,82,0 warp lhz_weapon3-2 1,1,lhz_in02,270,14 +lighthalzen,159,133,0 warp lhz_inn1-1 1,1,lhz_in02,232,265 +lhz_in02,232,261,0 warp lhz_inn1-2 1,1,lighthalzen,158,129 +lhz_in02,210,284,0 warp lhz_inn2-1 1,1,lhz_in02,241,219 +lhz_in02,236,219,0 warp lhz_inn2-2 1,1,lhz_in02,206,284 +lhz_in02,250,278,0 warp lhz_inn3-1 1,1,lhz_in02,265,278 +lhz_in02,261,278,0 warp lhz_inn3-2 1,1,lhz_in02,246,278 +lhz_in02,254,212,0 warp lhz_inn4-1 1,1,lhz_in02,273,212 +lhz_in02,269,212,0 warp lhz_inn4-2 1,1,lhz_in02,250,212 +lhz_in02,238,169,0 warp lhz_inn5-1 1,1,lhz_in02,238,150 +lhz_in02,238,154,0 warp lhz_inn5-2 1,1,lhz_in02,238,173 +lhz_in02,231,182,0 warp lhz_inn6-1 1,1,lhz_in02,212,182 +lhz_in02,216,182,0 warp lhz_inn6-2 1,1,lhz_in02,235,182 +lhz_in02,231,200,0 warp lhz_inn7-1 1,1,lhz_in02,212,200 +lhz_in02,216,200,0 warp lhz_inn7-2 1,1,lhz_in02,235,200 +lighthalzen,198,163,0 warp lhz_store1-1 1,1,lhz_in02,21,195 +lhz_in02,21,191,0 warp lhz_store1-2 1,1,lighthalzen,202,160 +lhz_in02,39,204,0 warp lhz_store2-1 1,1,lhz_in02,41,136 +lhz_in02,36,136,0 warp lhz_store2-2 1,1,lhz_in02,34,204 +lhz_in02,13,155,0 warp lhz_store3-1 1,1,lhz_in02,84,223 +lhz_in02,79,223,0 warp lhz_store3-2 1,1,lhz_in02,17,155 +lhz_in02,49,154,0 warp lhz_store4-1 1,1,lhz_in02,98,155 +lhz_in02,103,155,0 warp lhz_store4-2 1,1,lhz_in02,44,154 +lhz_in02,94,212,0 warp lhz_store5-1 1,1,lhz_in02,94,144 +lhz_in02,89,144,0 warp lhz_store5-2 1,1,lhz_in02,89,212 +lighthalzen,324,301,0 warp lhz_tool1-1 1,1,lhz_in03,241,100 +lhz_in03,237,100,0 warp lhz_tool1-2 1,1,lighthalzen,322,296 +lhz_in03,257,83,0 warp lhz_tool2-1 1,1,lhz_in03,255,14 +lhz_in03,250,14,0 warp lhz_tool2-2 1,1,lhz_in03,252,83 +lighthalzen,347,261,0 warp lhz_house1_1-1 1,1,lhz_in03,14,218 +lhz_in03,10,216,0 warp lhz_house1_1-2 1,1,lighthalzen,341,261 +lighthalzen,345,231,0 warp lhz_pub1-1 1,1,lhz_in03,188,15 +lhz_in03,188,11,0 warp lhz_pub1-2 1,1,lighthalzen,344,227 +lhz_in03,191,35,0 warp lhz_pub2-1 1,1,lhz_in03,191,103 +lhz_in03,190,100,0 warp lhz_pub2-2 1,1,lhz_in03,190,31 +lighthalzen,50,86,0 warp lhz_house2_1-1 1,1,lhz_in03,45,31 +lhz_in03,50,31,0 warp lhz_house2_1-2 1,1,lighthalzen,55,86 +lhz_in03,13,31,0 warp lhz_house2_2-1 1,1,lhz_in03,15,99 +lhz_in03,20,99,0 warp lhz_house2_2-2 1,1,lhz_in03,17,31 +lighthalzen,251,299,0 warp lhz_house3_1-1 1,1,lhz_in03,97,21 +lhz_in03,93,21,0 warp lhz_house3_1-2 1,1,lighthalzen,247,299 +lhz_in03,134,14,0 warp lhz_house3_2-1 1,1,lhz_in03,125,90 +lhz_in03,120,90,0 warp lhz_house3_2-2 1,1,lhz_in03,130,14 + +//============================================================ +// Old changelog +//============================================================ //= 1.3 Removed fields and dungeons warps from here [DracoRPG] //= 1.3a A small fix for a warp [MasterOfMuppets] //= 1.4 Lighthalzen warp, taken from korean eA site [Vicious] @@ -18,126 +107,3 @@ //= 1.7 Yet more missing warps implemented :P [MasterOfMuppets] //= 1.8 Added missing warps and moved some related to quests. [SinSloth] //============================================================ - -lighthalzen,196,46,0 warp lhz010 1,1,lhz_in02,282,83 -lhz_in02,282,79,0 warp lhz010a 1,1,lighthalzen,193,47 - -lighthalzen,197,36,0 warp lhz011 1,1,lhz_in02,284,30 -lhz_in02,288,30,0 warp lhz011a 1,1,lighthalzen,194,35 - -lhz_in02,265,14,0 warp lhz012 1,1,lhz_in02,269,82 -lhz_in02,274,82,0 warp lhz012a 1,1,lhz_in02,269,14 - -lhz_in02,108,26,0 warp lhz013 1,1,lighthalzen,98,110 -lighthalzen,92,110,0 warp lhz013a 1,1,lhz_in02,104,26 - -lighthalzen,50,87,0 warp lhz014 1,1,lhz_in03,45,31 -lhz_in03,50,31,0 warp lhz014a 1,1,lighthalzen,54,87 - -lhz_in03,20,99,0 warp lhz015 1,1,lhz_in03,17,31 -lhz_in03,13,31,0 warp lhz015a 1,1,lhz_in03,15,99 - -lighthalzen,159,133,0 warp lhz016 1,1,lhz_in02,232,265 -lhz_in02,232,261,0 warp lhz016a 1,1,lighthalzen,159,129 - -lhz_in02,210,284,0 warp lhz017 1,1,lhz_in02,241,219 -lhz_in02,236,219,0 warp lhz017a 1,1,lhz_in02,206,284 - -lhz_in02,269,212,0 warp lhz018 1,1,lhz_in02,250,212 -lhz_in02,254,212,0 warp lhz018a 1,1,lhz_in02,273,212 - -lhz_in02,231,200,0 warp lhz019 1,1,lhz_in02,212,200 -lhz_in02,216,200,0 warp lhz019a 1,1,lhz_in02,233,200 - -lhz_in02,231,182,0 warp lhz020 1,1,lhz_in02,212,182 -lhz_in02,216,182,0 warp lhz020a 1,1,lhz_in02,235,182 - -lhz_in02,238,169,0 warp lhz021 1,1,lhz_in02,238,150 -lhz_in02,238,154,0 warp lhz021a 1,1,lhz_in02,238,173 - -lhz_in02,261,278,0 warp lhz022 1,1,lhz_in02,246,278 -lhz_in02,250,278,0 warp lhz022a 1,1,lhz_in02,265,278 - -lighthalzen,238,220,0 warp lhz023 1,1,lhz_in02,28,270 -lhz_in02,27,265,0 warp lhz023a 1,1,lighthalzen,238,216 - -lhz_in02,13,284,0 warp lhz024 1,1,lhz_in02,89,285 -lhz_in02,95,285,0 warp lhz024a 1,1,lhz_in02,19,284 - -lhz_in02,114,272,0 warp lhz025 1,1,lhz_in02,153,282 -lhz_in02,149,282,0 warp lhz025a 1,1,lhz_in02,110,272 - -lighthalzen,198,257,0 warp lhz026 1,1,lhz_in02,39,28 -lhz_in02,44,28,0 warp lhz026a 1,1,lighthalzen,203,257 - -lighthalzen,236,276,0 warp lhz027 1,1,lhz_in02,133,199 -lhz_in02,129,199,0 warp lhz027a 1,1,lighthalzen,232,276 - -lighthalzen,251,299,0 warp lhz028 1,1,lhz_in03,97,21 -lhz_in03,93,21,0 warp lhz028a 1,1,lighthalzen,247,299 - -lhz_in03,134,14,0 warp lhz029 1,1,lhz_in03,125,90 -lhz_in03,120,90,0 warp lhz029a 1,1,lhz_in03,130,14 - -lighthalzen,198,163,0 warp lhz030 1,1,lhz_in02,21,195 -lhz_in02,21,191,0 warp lhz030a 1,1,lighthalzen,202,160 - -lhz_in02,39,204,0 warp lhz031 1,1,lhz_in02,41,136 -lhz_in02,36,136,0 warp lhz031a 1,1,lhz_in02,34,204 - -lhz_in02,49,154,0 warp lhz032 1,1,lhz_in02,98,155 -lhz_in02,103,155,0 warp lhz032a 1,1,lhz_in02,44,154 - -lhz_in02,88,144,0 warp lhz033 1,1,lhz_in02,89,212 -lhz_in02,94,212,0 warp lhz033a 1,1,lhz_in02,94,144 - -lhz_in02,79,223,0 warp lhz034 1,1,lhz_in02,17,155 -lhz_in02,13,155,0 warp lhz034a 1,1,lhz_in02,84,223 - -lighthalzen,101,248,0 warp lhz035 1,1,lhz_in01,111,126 -lhz_in01,111,121,0 warp lhz035a 1,1,lighthalzen,101,243 - -lighthalzen,106,248,0 warp lhz036 1,1,lhz_in01,116,126 -lhz_in01,116,121,0 warp lhz036a 1,1,lighthalzen,106,243 - -lhz_in01,88,215,0 warp lhz037 1,1,lhz_in01,106,18 -lhz_in01,106,15,0 warp lhz037a 1,1,lhz_in01,88,211 - -lhz_in01,140,215,0 warp lhz038 1,1,lhz_in01,158,18 -lhz_in01,158,15,0 warp lhz038a 1,1,lhz_in01,140,211 - -lhz_in01,194,55,0 warp lhz039 1,1,lhz_in01,188,250 -lhz_in01,188,254,0 warp lhz039a 1,1,lhz_in01,191,52 - -lhz_in01,230,226,0 warp lhz040 1,1,lhz_in01,257,226 -lhz_in01,251,226,0 warp lhz040a 1,1,lhz_in01,225,226 - -lhz_in01,98,55,0 warp lhz041 1,1,lhz_in01,76,250 -lhz_in01,76,254,0 warp lhz041a 1,1,lhz_in01,100,52 - -lhz_in01,149,179,0 warp lhz042 1,1,lhz_in01,15,24 -lhz_in01,11,24,0 warp lhz042a 1,1,lhz_in01,145,178 - -lighthalzen,346,232,0 warp lhz043 1,1,lhz_in03,188,14 -lhz_in03,188,11,0 warp lhz043a 1,1,lighthalzen,346,229 - -lhz_in03,191,35,0 warp lhz044 1,1,lhz_in03,190,103 -lhz_in03,190,100,0 warp lhz044a 1,1,lhz_in03,189,34 - -lighthalzen,339,240,0 warp lhz045 1,1,lhz_in03,180,87 -lhz_in03,180,90,0 warp lhz045a 1,1,lighthalzen,339,242 - -lhz_in01,40,224,0 warp lhz046 1,1,lhz_in01,19,129 -lhz_in01,15,129,0 warp lhz046a 1,1,lhz_in01,34,224 - -lhz_in01,58,130,0 warp lhz047 1,1,lhz_in01,193,127 -lhz_in01,191,127,0 warp lhz047a 1,1,lhz_in01,56,130 - -//lhz_in01,275,235,0 warp lhz049 1,1,lhz_in01,275,242 //not sure -//lhz_in01,275,238,0 warp lhz049a 1,1,lhz_in01,275,232 //not sure - -lighthalzen,324,301,0 warp lhz050 1,1,lhz_in03,239,101 -lhz_in03,237,101,0 warp lhz050a 1,1,lighthalzen,324,299 - -lhz_in01,44,144,0 warp lhz051 1,1,lhz_in01,277,159 -lhz_in01,277,156,0 warp lhz051a 1,1,lhz_in01,44,141 diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt index c91b04565..9d9ce35bc 100644 --- a/npc/warps/dungeons/lhz_dun.txt +++ b/npc/warps/dungeons/lhz_dun.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 8+ //===== Description: ========================================= @@ -25,34 +25,47 @@ //= 1.8 Some small changes [MasterOfMuppets] //= 1.9 Removed duplicates [Toms] //= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus] +//= 2.1 Updated all standard dungeon warps. [L0ne_W0lf] +//= Updated Sewer pipe dungeon entrance. +//= Removed dialog from level 3 entrance warp. //============================================================ -lhz_dun03,140,139,0 warp lhz003 1,1,lhz_dun02,150,145 -lhz_dun02,18,150,0 warp lhz004 1,1,lhz_dun01,18,148 -lhz_dun01,18,146,0 warp lhz004a 1,1,lhz_dun02,18,148 -lhz_dun02,282,155,0 warp lhz005 1,1,lhz_dun01,281,152 -lhz_dun01,281,150,0 warp lhz005a 1,1,lhz_dun02,282,153 -lhz_dun02,148,18,0 warp lhz006 1,1,lhz_dun01,146,10 -lhz_dun01,148,10,0 warp lhz006a 1,1,lhz_dun02,150,18 - -//current entrance -lhz_dun01,150,290,0 warp lhz007 1,1,lhz_in01,23,137 -//lighthalzen,73,52,0 warp lhz007a 1,1,lhz_dun01,150,288 -//This should be only an Exit. This warp doesn't exist on kRO. +lhz_dun01,149,291,0 warp lhz_dun1-1 1,1,lhz_in01,19,129 +lhz_dun01,281,150,0 warp lhz_dun2-1 1,1,lhz_dun02,282,153 +lhz_dun02,282,161,0 warp lhz_dun2-2 1,1,lhz_dun01,281,154 +lhz_dun01,149,9,0 warp lhz_dun3-1 1,1,lhz_dun02,153,19 +lhz_dun02,146,19,0 warp lhz_dun3-2 1,1,lhz_dun01,144,9 +lhz_dun01,18,145,0 warp lhz_dun4-1 1,1,lhz_dun02,17,150 +lhz_dun02,17,156,0 warp lhz_dun4-2 1,1,lhz_dun01,18,150 +lhz_dun02,150,149,4 script lhz_dun5-1 45,2,2,{ +OnTouch: + if ((Upper != 1 && BaseLevel<95) || (Upper == 1 && BaseLevel<90)) end; + warp "lhz_dun03",140,137; + end; +} +lhz_dun03,139,137,0 warp lhz_dun5-2 1,1,lhz_dun02,149,142 //--------------------------Sewer Pipe-------------------------- -lighthalzen,313,301,0 script Sewer Pipe 111,{ - mes "You see some pipes for a sewage system."; - if(MISC_QUEST&512){ - mes "You found the way into the lab."; +lighthalzen,313,301,0 script Sewer Pipe#lt 111,{ + if (MISC_QUEST&512) { + mes "^3355FFYou found some sort"; + mes "of large sewage pipe."; + mes "Naturally, the stench"; + mes "emanating from inside"; + mes "the pipe is barely endurable.^000000"; next; - menu "Go in.",-,"Do not go in.",L_NO; - - warp "lhz_cube",231,17; - end; + if (select("Enter:Cancel") == 1) { + warp "lhz_cube",231,17; + end; + } + close; } -L_NO: + mes "^3355FFYou found some sort"; + mes "of large sewage pipe."; + mes "Naturally, the stench"; + mes "emanating from inside"; + mes "the pipe is barely endurable.^000000"; close; } @@ -66,22 +79,6 @@ lhz_dun02,224,6,0 warp lhzcube2 1,1,lhz_cube,231,90 lhz_cube,231,12,0 warp lhzcube3 1,1,lighthalzen,310,302 lhz_cube,177,96,0 warp lhzcube4 1,1,lighthalzen,310,302 -lhz_dun02,150,149,4 script lhz-warp 45,2,2,{ -OnTouch: - if(Upper != 1 && BaseLevel<95)goto s_Noentry0; - if(Upper == 1 && BaseLevel<90)goto s_Noentry1; - warp "lhz_dun03",140,137; - end; - -s_Noentry0: - mes "Non-Advanced class characters must be at least base level 95 to enter level 3 of the Bio Lab Dungeon"; - close; - -s_Noentry1: - mes "Advanced class characters must be at least base level 90 to enter level 3 of the Bio Lab Dungeon"; - close; -} - //----------------- Cube Room Maze --------------------------- // -1 are warps facing east. // -2 the warps facing south. @@ -204,10 +201,9 @@ lhz_cube,123,26,0 script cubew09-4 45,1,1,{ //----- Function for Random Warps ---------------------------- function script randomw { - set @rdm,rand(3); - if(@rdm==1)goto rdm1; - if(@rdm==2)goto rdm2; - warp "lhz_cube",67,193; end; - rdm1: warp "lhz_cube",66,136; end; - rdm2: warp "lhz_cube",66,74; end; + switch(rand(3)) { + case 1: warp "lhz_cube",66,136; end; + case 2: warp "lhz_cube",66,74; end; + default: warp "lhz_cube",67,193; end; + } } diff --git a/npc/warps/guild/guildcastles.txt b/npc/warps/guild/guildcastles.txt index d2c88f1f8..7c01a5960 100644 --- a/npc/warps/guild/guildcastles.txt +++ b/npc/warps/guild/guildcastles.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 2.4a +//= 2.4b //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 2.4a Added more warps between Juno Satellite and Castle Interiors. [L0ne_W0lf] //= castle 1, 4 and 5 entrances are questionable, and will be updated //= as I get more information. +//= 2.4b Corrected Warp points for Juno castles 1, 4 and 5. [L0ne_W0lf] //============================================================ @@ -400,19 +401,22 @@ prtg_cas05,58,7,0 warp prtg506 1,1,prtg_cas05,253,290 prtg_cas05,66,225,0 warp prtg503 1,1,prtg_cas05,260,92 prtg_cas05,76,242,0 warp prtg502 1,1,prtg_cas05,288,13 -// Episode 12: WoE:SE Schwaltzvalt +//Episode 12: WoE:SE +//Schwaltzvalt Guild Castles Map Connection yuno,23,127,0 warp schg001 1,1,sch_gld,260,92 sch_gld,355,89,0 warp schg002 1,1,yuno,26,127 -sch_gld,293,91,0 warp schg101 1,1,schg_cas01,276,243 -schg_cas01,276,241,0 warp schg102 1,1,sch_gld,293,95 + +//Schwaltzvalt Castles Map +sch_gld,293,91,0 warp schg101 1,1,schg_cas01,119,8 +schg_cas01,119,5,0 warp schg102 1,1,sch_gld,293,95 sch_gld,288,256,0 warp schg201 1,1,schg_cas02,340,73 schg_cas02,340,69,0 warp schg202 1,1,sch_gld,288,253 sch_gld,98,182,0 warp schg301 1,1,schg_cas03,338,332 schg_cas03,338,335,0 warp schg302 1,1,sch_gld,98,187 -sch_gld,138,96,0 warp schg401 1,1,schg_cas04,276,243 -schg_cas04,276,241,0 warp schg402 1,1,sch_gld,138,93 -sch_gld,63,315,0 warp schg501 1,1,schg_cas05,276,243 -schg_cas05,276,241,0 warp schg502 1,1,sch_gld,69,315 +sch_gld,138,96,0 warp schg401 1,1,schg_cas04,119,8 +schg_cas04,119,5,0 warp schg402 1,1,sch_gld,138,93 +sch_gld,63,315,0 warp schg501 1,1,schg_cas05,119,8 +schg_cas05,119,5,0 warp schg502 1,1,sch_gld,69,315 //================== 4 Novices Guild Castles ============================= //Novices Guild: Al de Baran Guild Castles Map -- cgit v1.2.3-70-g09d2