Merge pull request #2524 from MishimaHaruna/homunculus-fixes

Homunculus related fixes

8 files changed, 50 insertions, 46 deletions

diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index bb940fd44..43cb8d84b 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -172,7 +172,7 @@ static int homunculus_dead(struct homun_data *hd)
 }
 
 //Vaporize a character's homun. If flag, HP needs to be 80% or above.
-static int homunculus_vaporize(struct map_session_data *sd, enum homun_state flag)
+static int homunculus_vaporize(struct map_session_data *sd, enum homun_state state, bool force)
 {
 	struct homun_data *hd;
 
@@ -185,13 +185,13 @@ static int homunculus_vaporize(struct map_session_data *sd, enum homun_state fla
 	if (status->isdead(&hd->bl))
 		return 0; //Can't vaporize a dead homun.
 
-	if (flag == HOM_ST_REST && get_percentage(hd->battle_status.hp, hd->battle_status.max_hp) < 80)
+	if (!force && get_percentage(hd->battle_status.hp, hd->battle_status.max_hp) < 80)
 		return 0;
 
 	hd->regen.state.block = 3; //Block regen while vaporized.
 	//Delete timers when vaporized.
 	homun->hunger_timer_delete(hd);
-	hd->homunculus.vaporize = flag;
+	hd->homunculus.vaporize = state;
 	if(battle_config.hom_setting&0x40)
 		memset(hd->blockskill, 0, sizeof(hd->blockskill));
 	clif->hominfo(sd, sd->hd, 0);
@@ -258,7 +258,7 @@ static int homunculus_calc_skilltree(struct homun_data *hd, int flag_evolve)
 	for( i = 0; i < MAX_SKILL_TREE && ( id = homun->dbs->skill_tree[c][i].id ) > 0; i++ ) {
 		if( hd->homunculus.hskill[ id - HM_SKILLBASE ].id )
 			continue; //Skill already known.
-		j = ( flag_evolve ) ? 10 : hd->homunculus.intimacy;
+		j = ( flag_evolve ) ? 1000 : hd->homunculus.intimacy;
 		if( j < homun->dbs->skill_tree[c][i].intimacylv )
 			continue;
 		if(!battle_config.skillfree) {
@@ -835,7 +835,7 @@ static int homunculus_db_search(int key, int type)
  * @param hom The homunculus source data.
  * @retval false in case of errors.
  */
-static bool homunculus_create(struct map_session_data *sd, const struct s_homunculus *hom)
+static bool homunculus_create(struct map_session_data *sd, const struct s_homunculus *hom, bool is_new)
 {
 	struct homun_data *hd;
 	int i = 0;
@@ -879,7 +879,9 @@ static bool homunculus_create(struct map_session_data *sd, const struct s_homunc
 
 	map->addiddb(&hd->bl);
 	status_calc_homunculus(hd,SCO_FIRST);
-	status_percent_heal(&hd->bl, 100, 100);
+	if (is_new) {
+		status_percent_heal(&hd->bl, 100, 100);
+	}
 
 	hd->hungry_timer = INVALID_TIMER;
 	return true;
@@ -936,6 +938,7 @@ static bool homunculus_recv_data(int account_id, const struct s_homunculus *sh,
 {
 	struct map_session_data *sd;
 	struct homun_data *hd;
+	bool is_new = false;
 
 	nullpo_retr(false, sh);
 
@@ -951,15 +954,17 @@ static bool homunculus_recv_data(int account_id, const struct s_homunculus *sh,
 	if (sd->status.char_id != sh->char_id && sd->status.hom_id != sh->hom_id)
 		return false;
 
-	if (sd->status.hom_id == 0) //Hom just created.
+	if (sd->status.hom_id == 0) { // Hom just created.
 		sd->status.hom_id = sh->hom_id;
+		is_new = true;
+	}
 
 	if (sd->hd != NULL) {
 		//uh? Overwrite the data.
 		memcpy(&sd->hd->homunculus, sh, sizeof sd->hd->homunculus);
 		sd->hd->homunculus.char_id = sd->status.char_id; // Correct char id if necessary.
 	} else {
-		homun->create(sd, sh);
+		homun->create(sd, sh, is_new);
 	}
 
 	hd = sd->hd;
@@ -1321,7 +1326,7 @@ static bool homunculus_read_skill_db_sub(char *split[], int columns, int current
 		homun->dbs->skill_tree[classid][j].need[k].lv = atoi(split[3+k*2+minJobLevelPresent+1]);
 	}
 
-	homun->dbs->skill_tree[classid][j].intimacylv = atoi(split[13+minJobLevelPresent]);
+	homun->dbs->skill_tree[classid][j].intimacylv = atoi(split[13+minJobLevelPresent]) * 100;
 
 	return true;
 }
diff --git a/src/map/homunculus.h b/src/map/homunculus.h
index 502fb0b7f..2914a26cc 100644
--- a/src/map/homunculus.h
+++ b/src/map/homunculus.h
@@ -133,7 +133,7 @@ struct homun_skill_tree_entry {
 	short id;
 	unsigned char max;
 	unsigned char joblv;
-	short intimacylv;
+	int intimacylv;
 	struct {
 		short id;
 		unsigned char lv;
@@ -167,7 +167,7 @@ struct homunculus_interface {
 	enum homun_type (*class2type) (int class_);
 	void (*damaged) (struct homun_data *hd);
 	int (*dead) (struct homun_data *hd);
-	int (*vaporize) (struct map_session_data *sd, enum homun_state flag);
+	int (*vaporize) (struct map_session_data *sd, enum homun_state state, bool force);
 	int (*delete) (struct homun_data *hd, int emote);
 	int (*checkskill) (struct homun_data *hd, uint16 skill_id);
 	int (*calc_skilltree) (struct homun_data *hd, int flag_evolve);
@@ -190,7 +190,7 @@ struct homunculus_interface {
 	int (*change_name) (struct map_session_data *sd, const char *name);
 	bool (*change_name_ack) (struct map_session_data *sd, const char *name, int flag);
 	int (*db_search) (int key,int type);
-	bool (*create) (struct map_session_data *sd, const struct s_homunculus *hom);
+	bool (*create) (struct map_session_data *sd, const struct s_homunculus *hom, bool is_new);
 	void (*init_timers) (struct homun_data * hd);
 	bool (*call) (struct map_session_data *sd);
 	bool (*recv_data) (int account_id, const struct s_homunculus *sh, int flag);
diff --git a/src/map/pc.c b/src/map/pc.c
index a2ed4fb8a..8ac820d79 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1536,17 +1536,16 @@ static int pc_reg_received(struct map_session_data *sd)
 	if (sd->status.guild_id)
 		guild->member_joined(sd);
 
-	// pet
-	if (sd->status.pet_id > 0)
-		intif->request_petdata(sd->status.account_id, sd->status.char_id, sd->status.pet_id);
-
-	// Homunculus [albator]
-	if( sd->status.hom_id > 0 )
-		intif->homunculus_requestload(sd->status.account_id, sd->status.hom_id);
-	if( sd->status.mer_id > 0 )
-		intif->mercenary_request(sd->status.mer_id, sd->status.char_id);
-	if( sd->status.ele_id > 0 )
-		intif->elemental_request(sd->status.ele_id, sd->status.char_id);
+	if (sd->state.standalone == 0 && sd->state.autotrade == 0) { // prevents loading pets, homunculi, mercenaries or elementals if the character doesn't have a client attached
+		if (sd->status.pet_id != 0)
+			intif->request_petdata(sd->status.account_id, sd->status.char_id, sd->status.pet_id);
+		if (sd->status.hom_id != 0)
+			intif->homunculus_requestload(sd->status.account_id, sd->status.hom_id);
+		if (sd->status.mer_id != 0)
+			intif->mercenary_request(sd->status.mer_id, sd->status.char_id);
+		if (sd->status.ele_id != 0)
+			intif->elemental_request(sd->status.ele_id, sd->status.char_id);
+	}
 
 	map->addiddb(&sd->bl);
 	map->delnickdb(sd->status.char_id, sd->status.name);
@@ -7765,7 +7764,7 @@ static int pc_resetskill(struct map_session_data *sd, int flag)
 			pc->setoption(sd, i);
 
 		if( homun_alive(sd->hd) && pc->checkskill(sd, AM_CALLHOMUN) )
-			homun->vaporize(sd, HOM_ST_REST);
+			homun->vaporize(sd, HOM_ST_REST, true);
 
 		if ((sd->sc.data[SC_SPRITEMABLE] && pc->checkskill(sd, SU_SPRITEMABLE)))
 			status_change_end(&sd->bl, SC_SPRITEMABLE, INVALID_TIMER);
@@ -8006,7 +8005,7 @@ static void pc_damage(struct map_session_data *sd, struct block_list *src, unsig
 	if( sd->status.pet_id > 0 && sd->pd && battle_config.pet_damage_support )
 		pet->target_check(sd,src,1);
 
-	if( sd->status.ele_id > 0 )
+	if (sd->status.ele_id != 0 && sd->ed != NULL)
 		elemental->set_target(sd,src);
 
 	if (battle_config.prevent_logout_trigger & PLT_DAMAGE)
@@ -8054,7 +8053,7 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src)
 
 	if (sd->status.hom_id > 0){
 	    if(battle_config.homunculus_auto_vapor && sd->hd)
-		    homun->vaporize(sd, HOM_ST_REST);
+		    homun->vaporize(sd, HOM_ST_REST, true);
 	}
 
 	if( sd->md )
@@ -9069,7 +9068,7 @@ static int pc_jobchange(struct map_session_data *sd, int class, int upper)
 		pc->setoption(sd, i);
 
 	if(homun_alive(sd->hd) && !pc->checkskill(sd, AM_CALLHOMUN))
-		homun->vaporize(sd, HOM_ST_REST);
+		homun->vaporize(sd, HOM_ST_REST, true);
 
 	if ((sd->sc.data[SC_SPRITEMABLE] && pc->checkskill(sd, SU_SPRITEMABLE)))
 		status_change_end(&sd->bl, SC_SPRITEMABLE, INVALID_TIMER);
diff --git a/src/map/script.c b/src/map/script.c
index 4fc47e039..4bd8f2c85 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12629,7 +12629,7 @@ static BUILDIN(homunculus_morphembryo)
 				clif->additem(sd, 0, 0, i);
 				clif->emotion(&sd->hd->bl, E_SWT);
 			} else {
-				homun->vaporize(sd, HOM_ST_MORPH);
+				homun->vaporize(sd, HOM_ST_MORPH, true);
 				success = true;
 			}
 		} else {
diff --git a/src/map/skill.c b/src/map/skill.c
index af61c887c..4b6ab7d0d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8710,7 +8710,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list *
 
 		case AM_REST:
 			if (sd) {
-				if (homun->vaporize(sd,HOM_ST_REST))
+				if (homun->vaporize(sd, HOM_ST_REST, false))
 					clif->skill_nodamage(src, bl, skill_id, skill_lv, 1);
 				else
 					clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0, 0);
diff --git a/src/map/status.c b/src/map/status.c
index 90dfe2bfd..ba32b267e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -9072,7 +9072,7 @@ static int status_change_start(struct block_list *src, struct block_list *bl, en
 					if (sd->status.pet_id > 0)
 						pet->menu(sd, 3);
 					if (homun_alive(sd->hd))
-						homun->vaporize(sd,HOM_ST_REST);
+						homun->vaporize(sd, HOM_ST_REST, true);
 					if (sd->md)
 						mercenary->delete(sd->md,3);
 				}
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 06d8d618a..8560d2eff 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -3136,8 +3136,8 @@ typedef void (*HPMHOOK_pre_homun_damaged) (struct homun_data **hd);
 typedef void (*HPMHOOK_post_homun_damaged) (struct homun_data *hd);
 typedef int (*HPMHOOK_pre_homun_dead) (struct homun_data **hd);
 typedef int (*HPMHOOK_post_homun_dead) (int retVal___, struct homun_data *hd);
-typedef int (*HPMHOOK_pre_homun_vaporize) (struct map_session_data **sd, enum homun_state *flag);
-typedef int (*HPMHOOK_post_homun_vaporize) (int retVal___, struct map_session_data *sd, enum homun_state flag);
+typedef int (*HPMHOOK_pre_homun_vaporize) (struct map_session_data **sd, enum homun_state *state, bool *force);
+typedef int (*HPMHOOK_post_homun_vaporize) (int retVal___, struct map_session_data *sd, enum homun_state state, bool force);
 typedef int (*HPMHOOK_pre_homun_delete) (struct homun_data **hd, int *emote);
 typedef int (*HPMHOOK_post_homun_delete) (int retVal___, struct homun_data *hd, int emote);
 typedef int (*HPMHOOK_pre_homun_checkskill) (struct homun_data **hd, uint16 *skill_id);
@@ -3182,8 +3182,8 @@ typedef bool (*HPMHOOK_pre_homun_change_name_ack) (struct map_session_data **sd,
 typedef bool (*HPMHOOK_post_homun_change_name_ack) (bool retVal___, struct map_session_data *sd, const char *name, int flag);
 typedef int (*HPMHOOK_pre_homun_db_search) (int *key, int *type);
 typedef int (*HPMHOOK_post_homun_db_search) (int retVal___, int key, int type);
-typedef bool (*HPMHOOK_pre_homun_create) (struct map_session_data **sd, const struct s_homunculus **hom);
-typedef bool (*HPMHOOK_post_homun_create) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom);
+typedef bool (*HPMHOOK_pre_homun_create) (struct map_session_data **sd, const struct s_homunculus **hom, bool *is_new);
+typedef bool (*HPMHOOK_post_homun_create) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom, bool is_new);
 typedef void (*HPMHOOK_pre_homun_init_timers) (struct homun_data **hd);
 typedef void (*HPMHOOK_post_homun_init_timers) (struct homun_data *hd);
 typedef bool (*HPMHOOK_pre_homun_call) (struct map_session_data **sd);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index e1a2560b7..325d7407d 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -35356,15 +35356,15 @@ int HP_homun_dead(struct homun_data *hd) {
 	}
 	return retVal___;
 }
-int HP_homun_vaporize(struct map_session_data *sd, enum homun_state flag) {
+int HP_homun_vaporize(struct map_session_data *sd, enum homun_state state, bool force) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_homun_vaporize_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, enum homun_state *flag);
+		int (*preHookFunc) (struct map_session_data **sd, enum homun_state *state, bool *force);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_homun_vaporize_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &flag);
+			retVal___ = preHookFunc(&sd, &state, &force);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -35372,13 +35372,13 @@ int HP_homun_vaporize(struct map_session_data *sd, enum homun_state flag) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.homun.vaporize(sd, flag);
+		retVal___ = HPMHooks.source.homun.vaporize(sd, state, force);
 	}
 	if (HPMHooks.count.HP_homun_vaporize_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum homun_state flag);
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum homun_state state, bool force);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_homun_vaporize_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, flag);
+			retVal___ = postHookFunc(retVal___, sd, state, force);
 		}
 	}
 	return retVal___;
@@ -35973,15 +35973,15 @@ int HP_homun_db_search(int key, int type) {
 	}
 	return retVal___;
 }
-bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom) {
+bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom, bool is_new) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_homun_create_pre > 0) {
-		bool (*preHookFunc) (struct map_session_data **sd, const struct s_homunculus **hom);
+		bool (*preHookFunc) (struct map_session_data **sd, const struct s_homunculus **hom, bool *is_new);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_create_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_homun_create_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &hom);
+			retVal___ = preHookFunc(&sd, &hom, &is_new);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -35989,13 +35989,13 @@ bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.homun.create(sd, hom);
+		retVal___ = HPMHooks.source.homun.create(sd, hom, is_new);
 	}
 	if (HPMHooks.count.HP_homun_create_post > 0) {
-		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom);
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom, bool is_new);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_create_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_homun_create_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, hom);
+			retVal___ = postHookFunc(retVal___, sd, hom, is_new);
 		}
 	}
 	return retVal___;