From c77b6ef1c32bb1d64abff770768867b09c0d2561 Mon Sep 17 00:00:00 2001 From: euphyy Date: Tue, 19 Mar 2013 21:47:32 +0000 Subject: [PATCH] * Fixed some issues in Moscovia quests. (bugreport:7361) * Added official warper for Undersea Tunnel floor 6; added shops for Mora and Port Malaya; added some Izlude RE warp coordinates. (ea:15236) * Fixed Arrow Storm cast time and cooldown. (Hercules 54b5ec9) * Cleaned and updated README.txt. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17203 54d463be-8e91-2dee-dedb-b68131a5f0ec --- README.txt | 98 +++++++++++++------------------- db/re/skill_cast_db.txt | 2 +- npc/jobs/valkyrie.txt | 11 +++- npc/quests/quests_moscovia.txt | 30 +++++----- npc/re/merchants/shops.txt | 15 +++++ npc/re/warps/dungeons/iz_dun.txt | 53 +++++++++++++++-- 6 files changed, 129 insertions(+), 80 deletions(-) diff --git a/README.txt b/README.txt index f82c1b942c..3770fc498d 100644 --- a/README.txt +++ b/README.txt @@ -15,7 +15,7 @@ || Table of Contents || ============================ || 1. What is rAthena? || -|| 2. Prerequisites || +|| 2. Prerequisites || || 3. Installation || || 4. Troubleshooting || || 5. Helpful Links || @@ -34,7 +34,6 @@ located around the world as well as a tremendous community providing QA and support. rAthena is a continuation of the eAthena project. - ============================ || 2. Prerequisites || ============================ @@ -59,7 +58,6 @@ Linux (names of packages may require specific version numbers on certain distrib * zlib-devel - ============================ || 3. Installation || ============================ @@ -89,7 +87,6 @@ Linux * When you're ready, type: ./athena-start start - ============================ || 4. Troubleshooting || ============================ @@ -99,38 +96,40 @@ can be solved simply by looking at the error messages given. Examples: - 1.) You get an error on your map-server_sql that looks something like this: - [Error]: npc_parsesrcfile: Unable to parse, probably a missing or extra TAB in - file 'npc/custom/jobmaster.txt', line '17'. Skipping line... - * w1=prontera,153,193,6 script - * w2=Job Master - * w3=123,{ - * w4= +1.) You get an error on your map-server_sql that looks something like this: - If you look at the error, it's telling you that you're missing (or have an extra) TAB. - This is easily fixed by looking at this part of the error: * w1=prontera,153,193,6 script - If there was a TAB where it's supposed to be, that line would have prontera,153,193,6 at w1 - and 'script' at w2. As there's a space instead of a TAB, the two sections are read as a - single parameter. + [Error]: npc_parsesrcfile: Unable to parse, probably a missing or extra TAB in + file 'npc/custom/jobmaster.txt', line '17'. Skipping line... + * w1=prontera,153,193,6 script + * w2=Job Master + * w3=123,{ + * w4= - 2.) You have a default user/password warning similar to the following: - [Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED. - [Notice]: Please edit your 'login' table to create a proper inter-server user/pa - ssword (gender 'S') - [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo - rt/map_conf.txt) + If you look at the error, it's telling you that you're missing (or have an extra) TAB. + This is easily fixed by looking at this part of the error: * w1=prontera,153,193,6 script + If there was a TAB where it's supposed to be, that line would have prontera,153,193,6 at w1 + and 'script' at w2. As there's a space instead of a TAB, the two sections are read as a + single parameter. - Relax. This is just indicating that you're using the default username and password. To - fix this, check over the part in the installation instructions relevant to the `login` table. - - 3.) Your Map Server says the following: - [Error]: make_connection: connect failed (socket #2, error 10061: No connection - could be made because the target machine actively refused it. - )! +2.) You have a default user/password warning similar to the following: - If this shows up on the map server, it generally means that there is no Char Server available - to accept the connection. + [Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED. + [Notice]: Please edit your 'login' table to create a proper inter-server user/pa + ssword (gender 'S') + [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo + rt/map_conf.txt) + Relax. This is just indicating that you're using the default username and password. To + fix this, check over the part in the installation instructions relevant to the `login` table. + +3.) Your map-server outputs the following: + + [Error]: make_connection: connect failed (socket #2, error 10061: No connection + could be made because the target machine actively refused it. + )! + + If this shows up on the map server, it generally means that there is no Char Server available + to accept the connection. ============================ @@ -142,38 +141,23 @@ pages on the Wiki or topics within the rAthena forum. * rAthena Forums http://rathena.org/ -* SVN Repository URL: +* SVN Repository https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ -* Full Installation Instructions: - Windows http://rathena.org/wiki/Installation_on_Windows - CentOS http://rathena.org/wiki/Installation_(CentOS) - Debian http://rathena.org/wiki/Installation_(Debian) +* Full Installation Instructions + Windows http://rathena.org/wiki/Installation_on_Windows + CentOS http://rathena.org/wiki/Installation_(CentOS) + Debian http://rathena.org/wiki/Installation_(Debian) * rAthena IRC Channel - irc://irc.rathena.net - + irc://irc.rizon.net/rathena ============================ || 6. More Documentation || ============================ -rAthena has a large collection of help files and sample NPC scripts located in /doc/ - -* Scripting - It is recommended to look through /doc/script_commands.txt for help, pointers or - even for ideas for your next NPC script. Most script commands have a usage example. - -* @commands - In-game, Game Masters have the ability to use Atcommands (@) to control players, - create items, spawn mobs, reload configuration files and even control the weather. - For an in-depth explanation, please see /doc/atcommands.txt - -* Permissions - The rAthena emulator has a permission system that enables certain groups of players - to perform certain actions, or have access to certain visual enhancements or in-game - activity. To see what permissions are available, they are detailed in /doc/permissions.txt - -There are more files in the /doc/ directory that will help you to create scripts or update the -mapcache, or even explain how the job system and item bonuses work. Before posting a topic asking -for help on the forums, we recommend that all users take the time to look over this directory. \ No newline at end of file +rAthena has a large collection of help files and sample NPC scripts located in the /doc/ +directory. These include detailed explanations of NPC script commands, atcommands (@), +group permissions, item bonuses, and packet structures, among many other topics. We +recommend that all users take the time to look over this directory before asking for +assistance elsewhere. diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 7f8cc123a0..f900e9964c 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1231,7 +1231,7 @@ //===== Ranger ============================= //-- RA_ARROWSTORM -2233,2000:2200:2400:2600:2800,0,0,0,0,5400:5600:5800:6000:6400,-1 +2233,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,0,0,0,0,5000:4800:4600:4400:4200:4000:3800:3600:3400:3200,-1 //-- RA_FEARBREEZE 2234,2000,0,0,60000:90000:120000:150000:180000,0,0,0 diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index eadb39847d..d219477567 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -5,7 +5,7 @@ //= finished, optimized and tested by Lupus //= L0ne_W0lf //===== Current Version: ===================================== -//= 3.0 +//= 3.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -37,6 +37,7 @@ //= 2.9 Corrected Valkyrie case spicifying where to warp after rebirthing. [L0ne_W0lf] //= 2.9b Fixed Verdandi typo, fixed resetting vars [Lupus] //= 3.0 Added quest log commands. [L0ne_W0lf] +//= 3.1 Added Izlude Renewal coordinates. //============================================================ valkyrie,48,86,4 script Valkyrie# 811,{ @@ -172,7 +173,9 @@ valkyrie,48,86,4 script Valkyrie# 811,{ switch (ADVJOB) { case 4008: case 4015: - warp "izlude",94,103; break; + if (checkre(0)) warp "izlude",129,97; + else warp "izlude",94,103; + break; case 4009: case 4016: warp "prontera",273,354; break; @@ -376,7 +379,9 @@ valkyrie,44,33,5 script Teleporter 124,{ case 3: callsub S_Warpchar,"payon",69,100; case 4: callsub S_Warpchar,"geffen",120,39; case 5: callsub S_Warpchar,"alberta",117,56; - case 6: callsub S_Warpchar,"izlude",94,103; + case 6: + if (checkre(0)) callsub S_Warpchar,"izlude",129,97; + else callsub S_Warpchar,"izlude",94,103; case 7: callsub S_Warpchar,"aldebaran",91,105; case 8: callsub S_Warpchar,"comodo",209,143; case 9: callsub S_Warpchar,"yuno",328,101; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index a55f944f06..bf6177bed6 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 2.0 +//= 2.0a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -22,6 +22,7 @@ //= 1.8 Fixed some condition checks. [Gepard] //= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf] //= 2.0 Optimized. [Joseph] +//= 2.0a Bug fixes. [Euphy] //============================================================ //============================================================================ @@ -846,7 +847,7 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 964,{ close; } else if (mos_whale_edq == 8 || mos_whale_edq == 10) callsub S_D_1,3,91,92,93,94; - else if (mos_whale_edq >= 91 && mos_whale_edq <= 94) callsub S_D_2,91,0; + else if (mos_whale_edq >= 91 && mos_whale_edq <= 94) callsub S_D_2,(mos_whale_edq-91); else if (mos_whale_edq == 11) { mes "[Mr. Ibanoff]"; mes "Look... Beyond the sea!"; @@ -898,8 +899,8 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 964,{ close; } else if (mos_whale_edq == 23 || mos_whale_edq == 25) callsub S_D_1,5,241,242,243,244; - else if (mos_whale_edq == 241 || mos_whale_edq == 243 || mos_whale_edq == 244) callsub S_D_2,1,1; - else if (mos_whale_edq == 242) callsub S_D_2,1,2; + else if (mos_whale_edq == 241 || mos_whale_edq == 243 || mos_whale_edq == 244) callsub S_D_2,0; + else if (mos_whale_edq == 242) callsub S_D_2,1; else if (mos_whale_edq == 26) { mes "[Mr. Ibanoff]"; mes "Look there!"; @@ -947,14 +948,14 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 964,{ end; S_D_1: - if (rand(1,4) == 3) { + if (rand(1,getarg(0)) == 3) { set .@ship2,rand(4); - setarray .@d$,"East","West","South","North"; + setarray .@d$[0],"East","West","South","North"; mes "[Mr. Ibanoff]"; mes "Hm. The sea currents have changed."; mes "Adjust the rudder forward to the"; mes .@d$[.@ship2]+", to follow the currents."; - set mos_whale_edq,getarg(.@ship2); + set mos_whale_edq,getarg(.@ship2+1); close; } mes "[Mr. Ibanoff]"; @@ -967,14 +968,13 @@ S_D_1: close; S_D_2: - setarray .@d$[getarg(0)],"East","West","South","North"; - mes "[Mr. Ibanoff]"; - mes "Hey!"; - mes "Did you not hear me?"; - mes "Change the rudder forward to the"; - if (getarg(1)) mes .@d$[getarg(1)]+", and follow the currents!"; - else mes .@d$[mos_whale_edq]+", and follow the currents!"; - close; + setarray .@d$[0],"East","West","South","North"; + mes "[Mr. Ibanoff]"; + mes "Hey!"; + mes "Did you not hear me?"; + mes "Change the rudder forward to the"; + mes .@d$[getarg(0)]+", and follow the currents!"; + close; } //---------------------------------------------------------------------------- diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 5dce4ef58c..164726cecc 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -15,6 +15,7 @@ //= 1.3 Added Malangdo tool dealer. [Euphy] //= 1.4 Moved Izlude merchants. [Streusel] //= 1.5 Added Dewata merchants. [Lemongrass] +//= 1.6 Added Mora and Port Malaya merchants. //============================================================ //======================================================= @@ -69,6 +70,12 @@ s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1 //======================================================= malangdo,232,163,5 shop Tool Dealer Myo 560,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1 +//======================================================= +// Mora +//======================================================= +mora,100,118,4 shop Tool Dealer#mora 517,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1,713:-1 +mora,138,110,4 shop Mora Chef 518,11519:-1 + //======================================================= // Mid Camp //======================================================= @@ -80,6 +87,14 @@ mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2 //======================================================= payon,123,109,4 shop Trap Specialist#pay 66,7940:-1,12341:-1 +//======================================================= +// Port Malaya +//======================================================= +ma_in01,73,22,3 shop Weapon Dealer#ma 536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1 +ma_in01,22,23,3 shop Tool Dealer#ma 536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1 +malaya,150,261,3 shop Fruit Gardener#ma 535,512:-1,513:-1,515:-1,516:-1,535:-1 +ma_in01,67,13,5 shop Armor Dealer#ma 536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1 + //======================================================= // Prontera //======================================================= diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt index b912f62e1b..f66e467099 100644 --- a/npc/re/warps/dungeons/iz_dun.txt +++ b/npc/re/warps/dungeons/iz_dun.txt @@ -4,15 +4,60 @@ //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Bibilyn Island & Undersea Cave //===== Additional Comments: ================================= //= 1.2 Moved common warps to base path. [Euphy] +//= 1.3 Added Undersea Tunnel 6th floor warper. //============================================================ -//= Undersea Cave ============================================ -iz_dun04,129,233,0 warp izd07 2,2,iz_dun05,141,187 -iz_dun05,141,190,0 warp izd07-1 2,2,iz_dun04,129,230 +// Undersea Tunnel Warper +//============================================================ +iz_dun04,130,234,5 script Gatekeeper#iz_dun 413,{ + mes "[Gatekeeper]"; + mes "Halt!"; + mes "What brings you here, Adventurer?"; + mes "We've discovered a new floor of this underwater city."; + next; + mes "[Gatekeeper]"; + mes "Do you think you're up to the challenge?"; + mes "The monsters here are between levels 110 and 124."; + mes "And you must beware of the Kraken!"; + next; + switch(select("Release the Kraken!:I'll stay here.")) { + case 1: + mes "[Gatekeeper]"; + mes "Be cautious and good luck."; + mes "If you see the Kraken be sure you have your friends to help or do what we do and run."; + close2; + warp "iz_dun05",141,187; + end; + case 2: + mes "[Gatekeeper]"; + mes "It's always best to be prepared before exploring a new area."; + mes "Come back when you're ready to go."; + close; + } +} + +iz_dun05,142,190,5 script Guard#iz_dun 413,{ + mes "[Gatekeeper]"; + mes "So I guess you want to go back to the fifth floor?"; + next; + switch(select("Yes!:No, I'll stay.")) { + case 1: + mes "[Gatekeeper]"; + mes "Be safe, adventurer."; + close2; + warp "iz_dun04",129,232; + end; + case 2: + mes "[Gatekeeper]"; + mes "You're not going?"; + mes "You're braver than I thought."; + close; + } +}