- Corrected Caprice cast info. No cast time, delay time equal to the bolt spells.

- When slaves_inherit_speed is set (which is also the default), homun will have the same speed of their master when spawned.
- When using Hatred and you already have a hate target, your current hate target is displayed now.


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

5 files changed, 27 insertions, 11 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 250d86250..7894b7c49 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,11 @@ 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.

 

+2006/10/12

+	* When slaves_inherit_speed is set (which is also the default), homun will

+	  have the same speed of their master when spawned. [Skotlex]

+	* When using Hatred and you already have a hate target, your current hate

+	  target is displayed now. [Skotlex]

 2006/10/11

 	* Cleaned up the char-server code when the last point of a player is not

 	  found. First it'll check if there's any mapserver online, and then, if

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 8ee3e9f08..4bb4768df 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,8 @@
 

 ========================

 10/12

+	* Corrected Caprice cast info. No cast time, delay time equal to the bolt

+	  spells. [Skotlex]

 	* Probably official GS/NJ Job Exp [Playtester]

 10/09

 	* Fixed High Quality Sandals not being refinable [Playtester]

diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index f135e7126..ad804f3b2 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -978,7 +978,7 @@
 //-- HFLI_SPEED

 8011,0,0,0,60000:55000:50000:45000:40000,60000:70000:80000:90000:120000

 //-- HVAN_CAPRICE

-8013,700:1400:2100:2800:3500,0,1000:1200:1400:1600:1800,0,1000:1200:1400:1600:1800

+8013,0,1000:1200:1400:1600:1800,0,0,0

 //-- HVAN_CHAOTIC

 8014,0,0,1000,0,1000

 //-- HVAN_EXPLOSION

diff --git a/src/map/pc.c b/src/map/pc.c
index a37af8273..a69d63e29 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -777,8 +777,11 @@ int pc_set_hate_mob(struct map_session_data *sd, int pos, struct block_list *bl)
 	int class_;
 	if (!sd || !bl || pos < 0 || pos > 2)
 		return 0;
-	if (sd->hate_mob[pos] != -1)	//Can't change hate targets.
+	if (sd->hate_mob[pos] != -1)
+	{	//Can't change hate targets.
+		clif_hate_mob(sd,pos,sd->hate_mob[pos]); //Display current
 		return 0;
+	}
 
 	class_ = status_get_class(bl);
 	if (!pcdb_checkid(class_)) {
diff --git a/src/map/status.c b/src/map/status.c
index 73bddae64..7ce75dac2 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2341,20 +2341,26 @@ int status_calc_homunculus(struct homun_data *hd, int first)
 	status->int_ = hom->int_ / 10;

 	status->luk = hom->luk / 10;

 

-	status->def_ele =  hd->homunculusDB->element ;	//[orn]

-	status->ele_lv = 1;

-	status->race = hd->homunculusDB->race ;	//[orn]

-	status->size = hd->homunculusDB->size ;	//[orn]

-	status->rhw.range = 1 + status->size;	//[orn]

-	status->mode = MD_CANMOVE|MD_CANATTACK|MD_ASSIST|MD_AGGRESSIVE|MD_CASTSENSOR;	//[orn]

-	status->speed = DEFAULT_WALK_SPEED;

+	if (first) {	//[orn]

+		status->def_ele =  hd->homunculusDB->element;

+		status->ele_lv = 1;

+		status->race = hd->homunculusDB->race ;

+		status->size = hd->homunculusDB->size ;

+		status->rhw.range = 1 + status->size;

+		status->mode = MD_CANMOVE|MD_CANATTACK|MD_ASSIST|MD_AGGRESSIVE|MD_CASTSENSOR;

+		if (battle_config.slaves_inherit_speed && sd)

+			status->speed = status_get_speed(&sd->bl);

+		else

+			status->speed = DEFAULT_WALK_SPEED;

+		status->hp = 1;

+		status->sp = 1;

+	}

 	skill = hom->level/10 + status->vit/5;

 	status->def = cap_value(skill, 0, 99);

+

 	skill = hom->level/10 + status->int_/5;

 	status->mdef = cap_value(skill, 0, 99);

 

-	status->hp = 1;

-	status->sp = 1;

 	status->max_hp = hom->max_hp ;

 	status->max_sp = hom->max_sp ;