fixed 2 bugs in DTS.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8832 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 5 insertions, 3 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 2ad5b7b92..8f9ce21a2 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,7 @@ Date		Added
 	- Fixed old Cube Room sticks-bug

 	- Now Bio-Lab passage uses MISC_QUEST | 512 instead of 'hzdun'

 		Don't forget to update your lhazeh warps script ^_-'

+	- Fixed 2 bugs in Dungeon Teleport Service. Should use ( ) !!!

 09/20

 	* Fixed some bugs in Cube Room. Some parts could be skipped [Lupus]

 	* Final optimization of Niflheim quests [Lupus]

diff --git a/npc/other/dts_warper.txt b/npc/other/dts_warper.txt
index 8f36f9d95..7e6fc9129 100644
--- a/npc/other/dts_warper.txt
+++ b/npc/other/dts_warper.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= Evera

 //===== Current Version: ===================================== 

-//= 2.3

+//= 2.3a

 //===== Compatible With: ===================================== 

 //= eAthena

 //===== Description: =========================================

@@ -69,6 +69,7 @@
 //=	Added $dtsday for vote session counter

 //=	Fixed bug that involved having both warpers enabled at the same time. [Evera]

 //=	New $dtsday system and bug fix[Evera]

+//= 2.3a fixed 2 bugs with comparision [Lupus]

 //============================================================ 

 

 //Yuno

@@ -222,7 +223,7 @@ lhz_in02.gat,36,274,3	script	Cool Event Staff#02	831,{
 		mes "selecting our valued customers";

 		mes "to choose the company they want.";

 		next;

-		if(dtseligible == 0 && baselevel >= 60 && MISC_QUEST&128 == 0 || dtseligible == 3 && baselevel >= 60 && MISC_QUEST&128 == 0) set dtseligible,1;	//Clear previous var of dtseligible,3 being tried for eligibility already

+		if((dtseligible == 0 || dtseligible == 3) && baselevel >= 60 && MISC_QUEST&128 == 0)) set dtseligible,1;	//Clear previous var of dtseligible,3 being tried for eligibility already

 		if(dtseligible != $dtsday && baselevel >= 60 && MISC_QUEST&128){

 			set MISC_QUEST,MISC_QUEST&~128;

 			set dtseligible,1;

@@ -519,7 +520,7 @@ function	script	F_DTS_Warp	{
 		set $dts,$dts|(1<<0);

 		set $dts,$dts|(1<<3);

 	}

-	if(dtseligible == 0 && baselevel >= 60 && MISC_QUEST&128 == 0 || dtseligible == 3 && baselevel >= 60 && MISC_QUEST&128 == 0) set dtseligible,1;	//Clear previous var of dtseligible,3 being tried for eligibility already

+	if((dtseligible == 0 || dtseligible == 3) && baselevel >= 60 && MISC_QUEST&128 == 0) set dtseligible,1;	//Clear previous var of dtseligible,3 being tried for eligibility already

 	if(dtseligible != $dtsday && baselevel >= 60 && MISC_QUEST&128){

 		set MISC_QUEST,MISC_QUEST&~128;

 		set dtseligible,1;