* Fixed an incorrect item check (bugreport:6184)

* Disabled two Dewata warp portals clashing with quest scripts (bugreport:6185, bugreport:5944)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16380 54d463be-8e91-2dee-dedb-b68131a5f0ec

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...";

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