diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-06 20:55:43 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-06 20:55:43 +0000 |
| commit | 6d371c31155c7d34aee7cf43bcf8ba6ac88060c9 (patch) | |
| tree | 0e37a6b571890ce168ad35ca3cc481e779843950 /npc | |
| parent | a918be7300572eef5d188f76c7a1a3425e5a4248 (diff) | |
| download | hercules-6d371c31155c7d34aee7cf43bcf8ba6ac88060c9.tar.gz hercules-6d371c31155c7d34aee7cf43bcf8ba6ac88060c9.tar.bz2 hercules-6d371c31155c7d34aee7cf43bcf8ba6ac88060c9.tar.xz hercules-6d371c31155c7d34aee7cf43bcf8ba6ac88060c9.zip | |
* Fixed an incorrect item check (bugreport:6184)
* Disabled two Dewata warp portals clashing with quest scripts (bugreport:6185, bugreport:5944)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16380 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/quests/first_class/tu_acolyte.txt | 2 | ||||
| -rw-r--r-- | npc/warps/cities/dewata.txt | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt index 30daa5dc0..d60e0580d 100644 --- a/npc/quests/first_class/tu_acolyte.txt +++ b/npc/quests/first_class/tu_acolyte.txt @@ -846,7 +846,7 @@ monk_in,18,38,6 script Priest Gardron#tu 110,{ close; } } else if(tu_acolyte01 == 8){ - if(countitem(957) > 4){ + if(countitem(939) > 4){ mes "Oh..!"; mes "You've returned!"; mes "Let's see... One..."; diff --git a/npc/warps/cities/dewata.txt b/npc/warps/cities/dewata.txt index 3de40d40f..d5c0b7f93 100644 --- a/npc/warps/cities/dewata.txt +++ b/npc/warps/cities/dewata.txt @@ -3,18 +3,19 @@ //===== By: ================================================== //= Chilly //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Warp Points for Dewata //===== Additional Comments: ================================= //= 1.0 First version +//= 1.1 Disabled warps that clash with quest warps. [Euphy] //============================================================ dewata,44,252,0 warp dewata0001 1,1,dew_fild01,372,212 dew_fild01,375,212,0 warp dewata0002 1,1,dewata,47,252 -dew_fild01,57,273,0 warp dewata0003 1,1,dew_in01,16,34 -dew_in01,16,31,0 warp dewata0004 1,1,dew_fild01,60,273 +//dew_fild01,57,273,0 warp dewata0003 1,1,dew_in01,16,34 +//dew_in01,16,31,0 warp dewata0004 1,1,dew_fild01,60,273 dew_fild01,48,65,0 warp dewata0005 1,1,dew_dun02,302,30 dew_dun02,305,30,0 warp dewata0006 1,1,dew_fild01,51,65 |