- Twilight Pharmacy's cast time is no longer reducable by dex.

- All weapon enchant levels now last 3 minutes.
- Corrected Ankle Snare/Spider Web having a 1% chance to trap rather than 100%
- Food boosts are now dispelled on death only.


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

7 files changed, 23 insertions, 38 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9ab8b7f9f..7cd3757c7 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,10 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/03/23
+	* Corrected Ankle Snare/Spider Web having a 1% chance to trap rather than
+	  100%
+	* Food boosts are now dispelled on death only.
 2007/03/22
 	* Corrected setitemscript not correctly updating the item's script.
 	* Added define MAX_CHARS so you can easily mod the server to support a
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 66467b472..04ec10cd2 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -19,7 +19,10 @@
 	-----
 
 ========================
+
 03/23
+	* Twilight Pharmacy's cast time is no longer reducable by dex.
+	* All weapon enchant levels now last 3 minutes. [Skotlex]
 	* Added 11.2 weapons [Playtester]
 03/22
 	* Optimized Aliza Card [Lupus]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index c4e8ab7c8..5095cfbdc 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -822,7 +822,7 @@
 //==========================================
 
 //-- ITEM_ENCHANTARMS
-492,0,0,0,180000:180000:180000:180000:180000:1200000:1200000:1200000:1200000:1200000,0
+492,0,0,0,180000,0
 
 //===== Mixed Taekwon Skills ===============
 //-- TK_MISSION
diff --git a/db/skill_castnodex_db.txt b/db/skill_castnodex_db.txt
index 74ce7b299..f366056d5 100644
--- a/db/skill_castnodex_db.txt
+++ b/db/skill_castnodex_db.txt
@@ -22,6 +22,9 @@
 410,1	//WE_CALLBABY
 482,1	//PF_DOUBLECASTING
 462,1 //SL_KAIZEL
+496,1 //AM_TWILIGHT1
+497,1 //AM_TWILIGHT2
+498,1 //AM_TWILIGHT3
 512,3 //GS_TRACKING
 1014,1	//PR_REDEMPTIO
 10010,3	//GD_BATTLEORDER
diff --git a/src/map/clif.c b/src/map/clif.c
index d95f78c87..f1fa8c2fa 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8845,31 +8845,6 @@ void clif_parse_Restart(int fd, struct map_session_data *sd) {
 			break;
 		pc_setstand(sd);
 		pc_setrestartvalue(sd, 3);
-		if (sd->sc.count && battle_config.debuff_on_logout&2) {
-			//For some reason food buffs are removed when you respawn.
-			if(sd->sc.data[SC_STRFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_STRFOOD,-1);
-			if(sd->sc.data[SC_AGIFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_AGIFOOD,-1);
-			if(sd->sc.data[SC_VITFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_VITFOOD,-1);
-			if(sd->sc.data[SC_INTFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_INTFOOD,-1);
-			if(sd->sc.data[SC_DEXFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_DEXFOOD,-1);
-			if(sd->sc.data[SC_LUKFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_LUKFOOD,-1);
-			if(sd->sc.data[SC_HITFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_HITFOOD,-1);
-			if(sd->sc.data[SC_FLEEFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_FLEEFOOD,-1);
-			if(sd->sc.data[SC_BATKFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_BATKFOOD,-1);
-			if(sd->sc.data[SC_WATKFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_WATKFOOD,-1);
-			if(sd->sc.data[SC_MATKFOOD].timer!=-1)
-				status_change_end(&sd->bl,SC_MATKFOOD,-1);
-		}
 		//If warping fails, send a normal stand up packet.
 		if (pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 2))
 			clif_resurrection(&sd->bl, 1);
diff --git a/src/map/skill.c b/src/map/skill.c
index c625ab80f..33113f9ac 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7209,7 +7209,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 		case UNT_ANKLESNARE:
 			if(sg->val2==0 && tsc){
 				int sec = skill_get_time2(sg->skill_id,sg->skill_lv);
-				if (status_change_start(bl,type,100,sg->skill_lv,sg->group_id,0,0,sec, 8))
+				if (status_change_start(bl,type,10000,sg->skill_lv,sg->group_id,0,0,sec, 8))
 				{
 					struct TimerData* td = get_timer(tsc->data[type].timer); 
 					if (td) sec = DIFF_TICK(td->tick, tick);
diff --git a/src/map/status.c b/src/map/status.c
index 076b8c573..e2452ad93 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6035,17 +6035,6 @@ int status_change_clear(struct block_list *bl,int type)
 		case SC_READYTURN:
 		case SC_DODGE:
 		case SC_JAILED:
-		case SC_STRFOOD:
-		case SC_AGIFOOD:
-		case SC_VITFOOD:
-		case SC_INTFOOD:
-		case SC_DEXFOOD:
-		case SC_LUKFOOD:
-		case SC_HITFOOD:
-		case SC_FLEEFOOD:
-		case SC_BATKFOOD:
-		case SC_WATKFOOD:
-		case SC_MATKFOOD:
 			continue;
 		}
 		status_change_end(bl, i, -1);
@@ -7021,6 +7010,17 @@ int status_change_clear_buffs (struct block_list *bl, int type)
 			case SC_CP_SHIELD:
 			case SC_CP_ARMOR:
 			case SC_CP_HELM:
+			case SC_STRFOOD:
+			case SC_AGIFOOD:
+			case SC_VITFOOD:
+			case SC_INTFOOD:
+			case SC_DEXFOOD:
+			case SC_LUKFOOD:
+			case SC_HITFOOD:
+			case SC_FLEEFOOD:
+			case SC_BATKFOOD:
+			case SC_WATKFOOD:
+			case SC_MATKFOOD:
 				continue;
 				
 			//Debuffs that can be removed.