From e5ddac85d2a1363807bbe5dde2f35d98e69d48b1 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 14 Jul 2006 01:36:13 +0000
Subject: - Kaahi no longer shows the heal effect to everyone. - Eska no will
 cause defense to change randomly every second.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7666 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt |  2 ++
 src/map/status.c    | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3f862a877..408a6227b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/07/13
+	* Kaahi no longer shows the heal effect to everyone. [Skotlex]
+	* Eska no will cause defense to change randomly every second. [Skotlex]
 	* Tuned up some more NJ_KAENSIN based on Tharis's information. [Skotlex]
 	* Corrected NJ_KAENSIN as per description. [Skotlex]
 	* Fixed a leaking map_freeblocklock on skill_del_unitgroup. [Skotlex]
diff --git a/src/map/status.c b/src/map/status.c
index fc0fe1ada..a349bf08e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3165,7 +3165,7 @@ static signed char status_calc_def(struct block_list *bl, struct status_change *
 	if(sc->data[SC_KEEPING].timer!=-1)
 		return 100;
 	if(sc->data[SC_SKA].timer != -1)
-		return rand()%100; //Reports indicate SKA actually randomizes defense.
+		return sc->data[SC_SKA].val3;
 	if(sc->data[SC_STEELBODY].timer!=-1)
 		return 90;
 	if(sc->data[SC_DRUMBATTLE].timer!=-1)
@@ -5199,6 +5199,11 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			val2 = 20*val1; //matk increase.
 			val3 = 12*val1; //mdef2 reduction.
 			break;
+		case SC_SKA:
+			val2 = tick/1000;
+			val3 = rand()%100; //Def changes randomly every second...
+			tick = 1000;
+			break;
 		default:
 			if (calc_flag == SCB_NONE && StatusSkillChangeTable[type]==0)
 			{	//Status change with no calc, and no skill associated...? unknown?
@@ -5871,10 +5876,8 @@ int kaahi_heal_timer(int tid, unsigned int tick, int id, int data)
 	hp = status->max_hp - status->hp;
 	if (hp > sc->data[data].val2)
 		hp = sc->data[data].val2;
-	if (hp) {
-		status_heal(bl, hp, 0, 0);
-		clif_skill_nodamage(NULL,bl,AL_HEAL,hp,1);
-	}
+	if (hp)
+		status_heal(bl, hp, 0, 2);
 	sc->data[data].val4=-1;
 	return 1;
 }
@@ -5944,6 +5947,15 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
 		return 0;
 	break;
 
+	case SC_SKA:
+		if((--sc->data[type].val2)>0){
+			sc->data[type].val3 = rand()%100; //Random defense.
+			sc->data[type].timer=add_timer(
+				1000+tick, status_change_timer,
+				bl->id, data);
+			return 0;
+		}
+	
 	case SC_HIDING:
 		if((--sc->data[type].val2)>0){
 			
-- 
cgit v1.2.3-60-g2f50