- Added HM_SKILLBASE, MAX_HOMUNSKILL to specify the skill level range of Homunculus.

- Added support for reading correctly status change data from Guild and Homun skills.
- Added support for reading Homun skill data (which means the HM skills are now safe to add to skill_db, skill_require_db, etc)
- Moved StatusSkillChangeTable to StatusSkillChangeTableArray and made a function called StatusSkillChangeTable to do the conversions taking into account HM/GD skills.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index c62877411..58e0e69a4 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -91,7 +91,7 @@ void merc_load_exptables(void)
 

 char *merc_skill_get_name(int id)

 {

-	return merc_skillname[id-8000];

+	return merc_skillname[id-HM_SKILLBASE];

 }

 

 void merc_damage(struct homun_data *hd,struct block_list *src,int hp,int sp)

@@ -112,8 +112,8 @@ void merc_skillup(struct map_session_data *sd,short skillnum)
 	nullpo_retv(sd->hd);

 	if(!sd->hd->skillpts) return;	//no skill points left

 

-	sd->hd->hskill[(skillnum-8001)%4].id=skillnum;

-	sd->hd->hskill[(skillnum-8001)%4].level+=1;

+	sd->hd->hskill[(skillnum-HM_SKILLBASE)%4].id=skillnum;

+	sd->hd->hskill[(skillnum-HM_SKILLBASE)%4].level+=1;

 	sd->hd->skillpts-=1;

 

 	clif_homuninfo(sd);