diff options
author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-06 00:34:10 +0000 |
---|---|---|
committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-06 00:34:10 +0000 |
commit | 879ec7651fc545054e749290c45226c0a7f6b4f7 (patch) | |
tree | 5ba8afd46a39efa57a5d27594af415f6a3df5583 /npc | |
parent | 9479293df183202eec534ec3c5fd4ecba94fae41 (diff) | |
download | hercules-879ec7651fc545054e749290c45226c0a7f6b4f7.tar.gz hercules-879ec7651fc545054e749290c45226c0a7f6b4f7.tar.bz2 hercules-879ec7651fc545054e749290c45226c0a7f6b4f7.tar.xz hercules-879ec7651fc545054e749290c45226c0a7f6b4f7.zip |
* Added Dewata and El Dicastes town (\cities\) and quest (\quests\) NPCs.
* db\quest_db.txt updated with Dewata and El Dicastes quests.
* Fixed minor bug with Arch Bishop check in Thanatos Tower (bugreport:5942)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16234 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r-- | npc/quests/thana_quest.txt | 5 | ||||
-rw-r--r-- | npc/scripts_athena.conf | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index 7fc59c6ce..b9906d7fb 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -25,6 +25,7 @@ //= 2.1 Replaced effect numerics with constants. [Samuray22] //= 2.2 Updated the whole Script to match with latest available official file. [Masao] //= 2.3 Added continue and break in switch case. [JayPee] +//= 2.4a Fixed a minor bug with Arch Bishop checks. [Euphy] //============================================================ hu_fild01,140,163,5 script Tower Keeper 852,3,3,{ @@ -3111,11 +3112,11 @@ OnTouch: warp "thana_step",69,369; end; } - else if ((Class == Job_Rune_Knight) || (Class == Job_Archbishop) || (Class == Job_Warlock) || (Class == Job_Mechanic) || (Class == Job_Ranger) || (Class == Job_Guillotine_Cross) || (Class == Job_Royal_Guard) || (Class == Job_Sura) || (Class == Job_Sorcerer) || (Class == Job_Shadow_Chaser) || (Class == Job_Genetic) || (Class == Job_Wanderer) || (Class == Job_Minstrel)) { + else if ((Class == Job_Rune_Knight) || (Class == Job_Arch_Bishop) || (Class == Job_Warlock) || (Class == Job_Mechanic) || (Class == Job_Ranger) || (Class == Job_Guillotine_Cross) || (Class == Job_Royal_Guard) || (Class == Job_Sura) || (Class == Job_Sorcerer) || (Class == Job_Shadow_Chaser) || (Class == Job_Genetic) || (Class == Job_Wanderer) || (Class == Job_Minstrel)) { warp "thana_step",69,369; end; } - else if ((Class == Job_Rune_Knight_T) || (Class == Job_Archbishop_T) || (Class == Job_Warlock_T) || (Class == Job_Mechanic_T) || (Class == Job_Ranger_T) || (Class == Job_Guillotine_Cross_T) || (Class == Job_Royal_Guard_T) || (Class == Job_Sura_T) || (Class == Job_Sorcerer_T) || (Class == Job_Shadow_Chaser_T) || (Class == Job_Genetic_T) || (Class == Job_Wanderer_T) || (Class == Job_Minstrel_T)) { + else if ((Class == Job_Rune_Knight_T) || (Class == Job_Arch_Bishop_T) || (Class == Job_Warlock_T) || (Class == Job_Mechanic_T) || (Class == Job_Ranger_T) || (Class == Job_Guillotine_Cross_T) || (Class == Job_Royal_Guard_T) || (Class == Job_Sura_T) || (Class == Job_Sorcerer_T) || (Class == Job_Shadow_Chaser_T) || (Class == Job_Genetic_T) || (Class == Job_Wanderer_T) || (Class == Job_Minstrel_T)) { warp "thana_step",69,369; end; } diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf index 3478705ab..a2d6affac 100644 --- a/npc/scripts_athena.conf +++ b/npc/scripts_athena.conf @@ -10,6 +10,8 @@ npc: npc/cities/amatsu.txt npc: npc/cities/ayothaya.txt npc: npc/cities/brasilis.txt npc: npc/cities/comodo.txt +npc: npc/cities/dewata.txt +npc: npc/cities/dicastes.txt npc: npc/cities/einbech.txt npc: npc/cities/einbroch.txt npc: npc/cities/geffen.txt @@ -94,6 +96,8 @@ npc: npc/quests/quests_amatsu.txt npc: npc/quests/quests_ayothaya.txt npc: npc/quests/quests_brasilis.txt npc: npc/quests/quests_comodo.txt +npc: npc/quests/quests_dewata.txt +npc: npc/quests/quests_dicastes.txt npc: npc/quests/quests_ein.txt npc: npc/quests/quests_geffen.txt npc: npc/quests/quests_gonryun.txt |