- ES magic will now put the caster on stun for 0.5 secs regardless of whether the skill-target is a mob or not.

- Added function clif_party_join_info which sends packet 0x1e9 each time a party-member joins. This packet (as redundant info as it has) should also contain the field for "adoptability", but that needs to be coded in yet.
- Added clif_ParseAdoptRequest which does the basic adoption handling. More checks and the reply packets still need to be coded in.
- Happy State and TK stances won't dispel on death now.


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

1 files changed, 6 insertions, 4 deletions

diff --git a/src/map/status.c b/src/map/status.c
index 74b7422d7..3a3cf5351 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4851,11 +4851,13 @@ int status_change_clear(struct block_list *bl,int type)
 		return 0;

 	for(i = 0; i < SC_MAX; i++)

 	{

-		//Type 0: PC killed -> EDP and Meltdown must not be dispelled. [Skotlex]

-		// Do not reset Xmas status when killed. [Valaris]

+		//Type 0: PC killed -> Place here stats that do not dispel on death.

 		if(sc->data[i].timer == -1 ||

-			(type == 0 &&

-			(i == SC_EDP || i == SC_MELTDOWN || i == SC_XMAS || i == SC_NOCHAT || i == SC_FUSION || i == SC_TKREST)))

+			(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

+			)))

 			continue;

 

 		status_change_end(bl, i, -1);