4 files changed, 11 insertions, 11 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a466c9736..fd1f4cc02 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.

 

 2006/05/29

+	* Removed Undead being inmune to poison status. [Skotlex]

+	* Removed speed penalty from SC_SKA [Skotlex]

+	* Fixed SC_SPURT triggering on Soul Linkers. [Skotlex]

+	* SC_DODGE won't be dispelled on death now. [Skotlex]

 	* [Fixed]:

 	  - pc_follow_timer possible triggering crash.

 	  - pc_reg_received to use battle_status.hp instead of status.hp

diff --git a/db/Changelog.txt b/db/Changelog.txt
index e895d11dd..1ce97001d 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -29,6 +29,8 @@
 05/29

 	* Fixed Green Ale's effect, thanks to NLZ. [MasterOfMuppets]

 05/28

+	* Updated ASC_BREAKER's range to 9. [Skotlex]

+05/28

 	* Readded some aDelay fixes which were accidentaly reverted [Playtester]

 05/26

 	* Added Red Chile drop to Kraben & small aMotion fix [Playtester]

diff --git a/db/skill_db.txt b/db/skill_db.txt
index ceebf260a..2703ab43a 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -398,7 +398,7 @@
 376,0,0,0,0,1,0,5,1,no,0,0,0,weapon,0	//ASC_KATAR#Advanced Katar Mastery#

 //377,0,0,4,0,1,0,10,1,no,0,0,0,misc,0	//ASC_HALLUCINATION#Hallucination Walk#

 378,0,6,4,5,1,0,5,1,no,0,1024,0,weapon,0	//ASC_EDP#Deadly Poison Enchantment#

-379,5,6,1,-1,0,0,10,1,yes,0,0,0,weapon,0	//ASC_BREAKER#Soul Destroyer#

+379,9,6,1,-1,0,0,10,1,yes,0,0,0,weapon,0	//ASC_BREAKER#Soul Destroyer#

 380,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0	//SN_SIGHT#Falcon Eyes#

 381,5,8,1,0,0,0,5,1,yes,0,0,0,misc,0	//SN_FALCONASSAULT#Falcon Assault#

 382,4,8,1,-1,0,2,5,1,yes,0,0,0,weapon,0	//SN_SHARPSHOOTING#Focused Arrow Strike#

diff --git a/src/map/status.c b/src/map/status.c
index ab391e092..13106ccd6 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -317,7 +317,7 @@ void initChangeTables(void) {
 	add_sc(SL_STUN, SC_STUN);
 	set_sc(SL_SWOO, SC_SWOO, SI_BLANK, SCB_SPEED);
 	set_sc(SL_SKE, SC_SKE, SI_BLANK, SCB_BATK|SCB_WATK|SCB_DEF|SCB_DEF2);
-	set_sc(SL_SKA, SC_SKA, SI_BLANK, SCB_DEF|SCB_MDEF|SCB_SPEED|SCB_ASPD);
+	set_sc(SL_SKA, SC_SKA, SI_BLANK, SCB_DEF|SCB_MDEF|SCB_ASPD);
 	set_sc(SL_SMA, SC_SMA, SI_SMA, SCB_NONE);
 	set_sc(ST_PRESERVE, SC_PRESERVE, SI_PRESERVE, SCB_NONE);
 	set_sc(PF_DOUBLECASTING, SC_DOUBLECAST, SI_DOUBLECAST, SCB_NONE);
@@ -2986,8 +2986,6 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
 		speed += speed * 25/100;
 	if(sc->data[SC_STEELBODY].timer!=-1)
 		speed += speed * 25/100;
-	if(sc->data[SC_SKA].timer!=-1)
-		speed += speed * 25/100;
 	if(sc->data[SC_QUAGMIRE].timer!=-1)
 		speed += speed * 50/100;
 	if(sc->data[SC_DONTFORGETME].timer!=-1)
@@ -3836,11 +3834,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 
 	//Check for inmunities / sc fails
 	switch (type) {
-		case SC_POISON:
-		case SC_DPOISON:
-			if (undead_flag && !(flag&1))
-				return 0; //Undead inmune to poison. Thanks to orn [Skotlex]
-			break;
 		case SC_FREEZE:
 		case SC_STONE:
 			//Undead are inmune to Freeze/Stone
@@ -5059,7 +5052,8 @@ int status_change_clear(struct block_list *bl,int type)
 			(type == 0 && (
 				i == SC_EDP || i == SC_MELTDOWN || i == SC_XMAS || i == SC_NOCHAT ||
 				i == SC_FUSION || i == SC_TKREST || i == SC_READYSTORM ||
-			  	i == SC_READYDOWN || i == SC_READYCOUNTER || i == SC_READYTURN
+			  	i == SC_READYDOWN || i == SC_READYCOUNTER || i == SC_READYTURN ||
+				i == SC_DODGE
 			)))
 			continue;
 
@@ -5148,7 +5142,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
 			if (sc->data[type].val1 >= 7 &&
 				DIFF_TICK(gettick(), sc->data[type].val4) <= 1000 &&
 				(!sd || (sd->weapontype1 == 0 && sd->weapontype2 == 0 &&
-				(sd->class_&MAPID_BASEMASK) != MAPID_SOUL_LINKER))
+				(sd->class_&MAPID_UPPERMASK) != MAPID_SOUL_LINKER))
 			)
 				sc_start(bl,SC_SPURT,100,sc->data[type].val1,skill_get_time2(StatusSkillChangeTable[type], sc->data[type].val1));
 		}