From 3a62199919ded96f857bc0c0c8f9943229359fa9 Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Fri, 31 May 2024 02:43:15 +0200
Subject: [PATCH 01/14] Add pc->is_own_skill to check for learnable or learned
 skills

---
 src/map/pc.c | 28 ++++++++++++++++++++++++++++
 src/map/pc.h |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/src/map/pc.c b/src/map/pc.c
index f203d03cf..59b399734 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -12609,6 +12609,32 @@ void pc_crimson_marker_clear(struct map_session_data *sd)
 	}
 }
 
+/**
+ * Checks if a skill is a permanent skill that one has prerequisites for or has learned.
+ *
+ * NOTE: Unfortunately even uninitialized skills have the flag SKILL_FLAG_PERMANENT, so we have to distinguish by id as well.
+ *       Ideally a more saner zero value should be used for e_skill_flag.
+ * WARNING: This function relies on the skill tree being already calculated / filled.
+ *
+ * @param sd The player to check for.
+ * @param skill_id The skill to check for.
+ * @return True if the player meets the skill prerequisites or has it, false otherwise.
+ */
+static bool pc_is_own_skill(struct map_session_data *sd, uint16 skill_id)
+{
+	nullpo_retr(false, sd);
+
+	int idx = skill->get_index(skill_id);
+	if (idx <= 0)
+		return false; // skill not found
+	if (sd->status.skill[idx].id != skill_id)
+		return false; // not meeting pre-requisites for skill or skill id to index mapping faulty.
+	if (sd->status.skill[idx].flag != SKILL_FLAG_PERMANENT)
+		return false; // script granted or temporary.
+
+	return true;
+}
+
 static void do_final_pc(void)
 {
 
@@ -13035,4 +13061,6 @@ void pc_defaults(void)
 	pc->auto_exp_insurance = pc_auto_exp_insurance;
 
 	pc->crimson_marker_clear = pc_crimson_marker_clear;
+
+	pc->is_own_skill = pc_is_own_skill;
 }
diff --git a/src/map/pc.h b/src/map/pc.h
index b842717fc..951de5d58 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -1283,6 +1283,8 @@ END_ZEROED_BLOCK; /* End */
 	bool (*auto_exp_insurance) (struct map_session_data *sd);
 
 	void (*crimson_marker_clear) (struct map_session_data *sd);
+
+	bool (*is_own_skill) (struct map_session_data *sd, uint16 skill_id);
 };
 
 #ifdef HERCULES_CORE

From 7adf875d34a79280b9085c895c27befa71b63146 Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Fri, 24 May 2024 20:26:58 +0200
Subject: [PATCH 02/14] Fix RG_PLAGIARISM deleting learned skills and all
 skills that required them by accident

---
 src/map/pc.c    | 14 +++++++++++---
 src/map/skill.c | 14 +++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/map/pc.c b/src/map/pc.c
index 59b399734..991c98ffc 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1520,11 +1520,17 @@ static int pc_reg_received(struct map_session_data *sd)
 	if ((i = pc->checkskill(sd,RG_PLAGIARISM)) > 0) {
 		sd->cloneskill_id = pc_readglobalreg(sd,script->add_variable("CLONE_SKILL"));
 		if (sd->cloneskill_id > 0 && (idx = skill->get_index(sd->cloneskill_id)) > 0) {
+			int learned_lv = sd->status.skill[idx].lv;
+			bool is_own_skill = pc->is_own_skill(sd, sd->cloneskill_id);
 			sd->status.skill[idx].id = sd->cloneskill_id;
 			sd->status.skill[idx].lv = pc_readglobalreg(sd,script->add_variable("CLONE_SKILL_LV"));
 			if (sd->status.skill[idx].lv > i)
 				sd->status.skill[idx].lv = i;
-			sd->status.skill[idx].flag = SKILL_FLAG_PLAGIARIZED;
+
+			if (is_own_skill)
+				sd->status.skill[idx].flag = learned_lv + SKILL_FLAG_REPLACED_LV_0;
+			else
+				sd->status.skill[idx].flag = SKILL_FLAG_PLAGIARIZED;
 		}
 	}
 	if ((i = pc->checkskill(sd,SC_REPRODUCE)) > 0) {
@@ -1644,7 +1650,8 @@ static void pc_calc_skilltree_clear(struct map_session_data *sd)
 	nullpo_retv(sd);
 
 	for (i = 0; i < MAX_SKILL_DB; i++) {
-		if (sd->status.skill[i].flag != SKILL_FLAG_PLAGIARIZED && sd->status.skill[i].flag != SKILL_FLAG_PERM_GRANTED) //Don't touch these
+		if (sd->status.skill[i].flag != SKILL_FLAG_PLAGIARIZED && sd->status.skill[i].flag != SKILL_FLAG_PERM_GRANTED
+		    && sd->status.skill[i].id != sd->cloneskill_id) //Don't touch these
 			sd->status.skill[i].id = 0; //First clear skills.
 		/* permanent skills that must be re-checked */
 		if (sd->status.skill[i].flag == SKILL_FLAG_PERMANENT) {
@@ -1679,7 +1686,8 @@ static int pc_calc_skilltree(struct map_session_data *sd)
 	pc->calc_skilltree_clear(sd);
 
 	for (int i = 0; i < MAX_SKILL_DB; i++) {
-		if (sd->status.skill[i].flag == SKILL_FLAG_TEMPORARY || sd->status.skill[i].flag >= SKILL_FLAG_REPLACED_LV_0) {
+		if ((sd->status.skill[i].flag >= SKILL_FLAG_REPLACED_LV_0 && sd->status.skill[i].id != sd->cloneskill_id)
+		    || sd->status.skill[i].flag == SKILL_FLAG_TEMPORARY) {
 			// Restore original level of skills after deleting earned skills.
 			sd->status.skill[i].lv = (sd->status.skill[i].flag == SKILL_FLAG_TEMPORARY) ? 0 : sd->status.skill[i].flag - SKILL_FLAG_REPLACED_LV_0;
 			sd->status.skill[i].flag = SKILL_FLAG_PERMANENT;
diff --git a/src/map/skill.c b/src/map/skill.c
index 871ff873d..1baaa442c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3693,10 +3693,19 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 					tsd->status.skill[idx].lv = 0;
 					tsd->status.skill[idx].flag = 0;
 					clif->deleteskill(tsd, tsd->cloneskill_id, false);
+				} else if (tsd->status.skill[idx].flag >= SKILL_FLAG_REPLACED_LV_0) {
+					tsd->status.skill[idx].lv = tsd->status.skill[idx].flag - SKILL_FLAG_REPLACED_LV_0;
+					tsd->status.skill[idx].flag = SKILL_FLAG_PERMANENT;
+					// CAREFUL! This assumes you will only ever use SKILL_FLAG_REPLACED_LV_0 logic when copying SKILL_FLAG_PERMANENT skills!!!
+					clif->addskill(tsd, tsd->cloneskill_id);
 				}
 			}
+			int learned_lv = tsd->status.skill[cidx].lv;
+			bool copying_own_skill = pc->is_own_skill(tsd, copy_skill);
 
 			lv = min(skill_lv, pc->checkskill(tsd, RG_PLAGIARISM));
+			if (learned_lv > lv)
+				break; // [Aegis] can't overwrite skill of higher level, but will still remove previously copied skill.
 
 			tsd->cloneskill_id = copy_skill;
 			pc_setglobalreg(tsd, script->add_variable("CLONE_SKILL"), copy_skill);
@@ -3704,7 +3713,10 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 
 			tsd->status.skill[cidx].id = copy_skill;
 			tsd->status.skill[cidx].lv = lv;
-			tsd->status.skill[cidx].flag = SKILL_FLAG_PLAGIARIZED;
+			if (copying_own_skill)
+				tsd->status.skill[cidx].flag = learned_lv + SKILL_FLAG_REPLACED_LV_0;
+			else
+				tsd->status.skill[cidx].flag = SKILL_FLAG_PLAGIARIZED;
 			clif->addskill(tsd, copy_skill);
 		}
 		break;

From 27a5ec18f03bbd33adeba3970c418c84bb1dfcff Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Fri, 24 May 2024 21:19:38 +0200
Subject: [PATCH 03/14] Move clearing of RG_PLAGIARISM copied skill to its own
 function pc->clear_existing_cloneskill

---
 src/map/pc.c    | 33 +++++++++++++++++++++++++++++++++
 src/map/pc.h    |  1 +
 src/map/skill.c | 15 +--------------
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/map/pc.c b/src/map/pc.c
index 991c98ffc..016cea4f0 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -12643,6 +12643,38 @@ static bool pc_is_own_skill(struct map_session_data *sd, uint16 skill_id)
 	return true;
 }
 
+/**
+ * Clears / removes the existing cloned skill from RG_PLAGIARISM
+ *
+ * @param sd The player to clear the cloned skill from.
+ * @param clear_vars If true, the remembered clone_skill level and ID will be cleared, otherwise it will not be touched.
+ */
+static void pc_clear_existing_cloneskill(struct map_session_data *sd, bool clear_vars)
+{
+	nullpo_retv(sd);
+
+	if (sd->cloneskill_id != 0) {
+		int idx = skill->get_index(sd->cloneskill_id);
+		if (sd->status.skill[idx].flag == SKILL_FLAG_PLAGIARIZED) {
+			sd->status.skill[idx].id = 0;
+			sd->status.skill[idx].lv = 0;
+			sd->status.skill[idx].flag = 0;
+			clif->deleteskill(sd, sd->cloneskill_id, false);
+		} else if (sd->status.skill[idx].flag >= SKILL_FLAG_REPLACED_LV_0) {
+			sd->status.skill[idx].lv = sd->status.skill[idx].flag - SKILL_FLAG_REPLACED_LV_0;
+			sd->status.skill[idx].flag = SKILL_FLAG_PERMANENT;
+			// CAREFUL! This assumes you will only ever use SKILL_FLAG_REPLACED_LV_0 logic when copying SKILL_FLAG_PERMANENT skills!!!
+			clif->addskill(sd, sd->cloneskill_id);
+		}
+	}
+
+	if (clear_vars) {
+		sd->cloneskill_id = 0;
+		pc_setglobalreg(sd, script->add_variable("CLONE_SKILL"), 0);
+		pc_setglobalreg(sd, script->add_variable("CLONE_SKILL_LV"), 0);
+	}
+}
+
 static void do_final_pc(void)
 {
 
@@ -13071,4 +13103,5 @@ void pc_defaults(void)
 	pc->crimson_marker_clear = pc_crimson_marker_clear;
 
 	pc->is_own_skill = pc_is_own_skill;
+	pc->clear_existing_cloneskill = pc_clear_existing_cloneskill;
 }
diff --git a/src/map/pc.h b/src/map/pc.h
index 951de5d58..bd5a84e54 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -1285,6 +1285,7 @@ END_ZEROED_BLOCK; /* End */
 	void (*crimson_marker_clear) (struct map_session_data *sd);
 
 	bool (*is_own_skill) (struct map_session_data *sd, uint16 skill_id);
+	void (*clear_existing_cloneskill) (struct map_session_data *sd, bool clear_vars);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/skill.c b/src/map/skill.c
index 1baaa442c..7551bbae7 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3686,20 +3686,7 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 		switch(can_copy(tsd, copy_skill)) {
 		case 1: // Plagiarism
 		{
-			if (tsd->cloneskill_id) {
-				idx = skill->get_index(tsd->cloneskill_id);
-				if (tsd->status.skill[idx].flag == SKILL_FLAG_PLAGIARIZED) {
-					tsd->status.skill[idx].id = 0;
-					tsd->status.skill[idx].lv = 0;
-					tsd->status.skill[idx].flag = 0;
-					clif->deleteskill(tsd, tsd->cloneskill_id, false);
-				} else if (tsd->status.skill[idx].flag >= SKILL_FLAG_REPLACED_LV_0) {
-					tsd->status.skill[idx].lv = tsd->status.skill[idx].flag - SKILL_FLAG_REPLACED_LV_0;
-					tsd->status.skill[idx].flag = SKILL_FLAG_PERMANENT;
-					// CAREFUL! This assumes you will only ever use SKILL_FLAG_REPLACED_LV_0 logic when copying SKILL_FLAG_PERMANENT skills!!!
-					clif->addskill(tsd, tsd->cloneskill_id);
-				}
-			}
+			pc->clear_existing_cloneskill(tsd, false);
 			int learned_lv = tsd->status.skill[cidx].lv;
 			bool copying_own_skill = pc->is_own_skill(tsd, copy_skill);
 

From 18afc419a15ab3971807cbff958df30ada37ba3c Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Fri, 24 May 2024 21:21:38 +0200
Subject: [PATCH 04/14] Replace code-duplication in pc_jobchange with
 pc->clear_existing_cloneskill and thus add support for
 SKILL_FLAG_REPLACED_LV_0

---
 src/map/pc.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/map/pc.c b/src/map/pc.c
index 016cea4f0..4b90b6221 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -8870,18 +8870,7 @@ static int pc_jobchange(struct map_session_data *sd, int class, int upper)
 		pc_setglobalreg(sd, script->add_variable("jobchange_level_3rd"), sd->change_level_3rd);
 	}
 
-	if(sd->cloneskill_id) {
-		idx = skill->get_index(sd->cloneskill_id);
-		if( sd->status.skill[idx].flag == SKILL_FLAG_PLAGIARIZED ) {
-			sd->status.skill[idx].id = 0;
-			sd->status.skill[idx].lv = 0;
-			sd->status.skill[idx].flag = 0;
-			clif->deleteskill(sd, sd->cloneskill_id, false);
-		}
-		sd->cloneskill_id = 0;
-		pc_setglobalreg(sd, script->add_variable("CLONE_SKILL"), 0);
-		pc_setglobalreg(sd, script->add_variable("CLONE_SKILL_LV"), 0);
-	}
+	pc->clear_existing_cloneskill(sd, true);
 
 	if(sd->reproduceskill_id) {
 		idx = skill->get_index(sd->reproduceskill_id);

From a77014eff74d282e02359d331b0f79b8c6551289 Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Fri, 24 May 2024 23:05:32 +0200
Subject: [PATCH 05/14] Move clearing of SC_REPRODUCE copied skill to its own
 function pc->clear_existing_reproduceskill

---
 src/map/pc.c    | 43 ++++++++++++++++++++++++++++++-------------
 src/map/pc.h    |  1 +
 src/map/skill.c | 12 ++----------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/map/pc.c b/src/map/pc.c
index 4b90b6221..ee7358627 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -8831,7 +8831,7 @@ static int jobchange_killclone(struct block_list *bl, va_list ap)
 static int pc_jobchange(struct map_session_data *sd, int class, int upper)
 {
 	int i, fame_flag=0;
-	int job, idx = 0;
+	int job = 0;
 
 	nullpo_ret(sd);
 
@@ -8872,18 +8872,7 @@ static int pc_jobchange(struct map_session_data *sd, int class, int upper)
 
 	pc->clear_existing_cloneskill(sd, true);
 
-	if(sd->reproduceskill_id) {
-		idx = skill->get_index(sd->reproduceskill_id);
-		if( sd->status.skill[idx].flag == SKILL_FLAG_PLAGIARIZED ) {
-			sd->status.skill[idx].id = 0;
-			sd->status.skill[idx].lv = 0;
-			sd->status.skill[idx].flag = 0;
-			clif->deleteskill(sd, sd->reproduceskill_id, false);
-		}
-		sd->reproduceskill_id = 0;
-		pc_setglobalreg(sd, script->add_variable("REPRODUCE_SKILL"),0);
-		pc_setglobalreg(sd, script->add_variable("REPRODUCE_SKILL_LV"),0);
-	}
+	pc->clear_existing_reproduceskill(sd, true);
 
 	if ((job & MAPID_UPPERMASK) != (sd->job & MAPID_UPPERMASK)) { //Things to remove when changing class tree.
 		const int class_idx = pc->class2idx(sd->status.class);
@@ -12664,6 +12653,33 @@ static void pc_clear_existing_cloneskill(struct map_session_data *sd, bool clear
 	}
 }
 
+/**
+ * Clears / removes the existing reproduced skill from SC_REPRODUCE
+ *
+ * @param sd The player to clear the reproduced skill from.
+ * @param clear_vars If true, the remembered reproduced skill level and ID will be cleared, otherwise it will not be touched.
+ */
+static void pc_clear_existing_reproduceskill(struct map_session_data *sd, bool clear_vars)
+{
+	nullpo_retv(sd);
+
+	if (sd->reproduceskill_id != 0) {
+		int idx = skill->get_index(sd->reproduceskill_id);
+		if (sd->status.skill[idx].flag == SKILL_FLAG_PLAGIARIZED) {
+			sd->status.skill[idx].id = 0;
+			sd->status.skill[idx].lv = 0;
+			sd->status.skill[idx].flag = 0;
+			clif->deleteskill(sd, sd->reproduceskill_id, false);
+		}
+	}
+
+	if (clear_vars) {
+		sd->reproduceskill_id = 0;
+		pc_setglobalreg(sd, script->add_variable("REPRODUCE_SKILL"), 0);
+		pc_setglobalreg(sd, script->add_variable("REPRODUCE_SKILL_LV"), 0);
+	}
+}
+
 static void do_final_pc(void)
 {
 
@@ -13093,4 +13109,5 @@ void pc_defaults(void)
 
 	pc->is_own_skill = pc_is_own_skill;
 	pc->clear_existing_cloneskill = pc_clear_existing_cloneskill;
+	pc->clear_existing_reproduceskill = pc_clear_existing_reproduceskill;
 }
diff --git a/src/map/pc.h b/src/map/pc.h
index bd5a84e54..6b8b32bf7 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -1286,6 +1286,7 @@ END_ZEROED_BLOCK; /* End */
 
 	bool (*is_own_skill) (struct map_session_data *sd, uint16 skill_id);
 	void (*clear_existing_cloneskill) (struct map_session_data *sd, bool clear_vars);
+	void (*clear_existing_reproduceskill) (struct map_session_data *sd, bool clear_vars);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/skill.c b/src/map/skill.c
index 7551bbae7..0c92bd6e6 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3681,7 +3681,7 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 				break;
 		}
 
-		int cidx, idx, lv = 0;
+		int cidx, lv = 0;
 		cidx = skill->get_index(copy_skill);
 		switch(can_copy(tsd, copy_skill)) {
 		case 1: // Plagiarism
@@ -3710,15 +3710,7 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 		case 2: // Reproduce
 		{
 			lv = sc ? sc->data[SC__REPRODUCE]->val1 : 1;
-			if (tsd->reproduceskill_id) {
-				idx = skill->get_index(tsd->reproduceskill_id);
-				if (tsd->status.skill[idx].flag == SKILL_FLAG_PLAGIARIZED) {
-					tsd->status.skill[idx].id = 0;
-					tsd->status.skill[idx].lv = 0;
-					tsd->status.skill[idx].flag = 0;
-					clif->deleteskill(tsd, tsd->reproduceskill_id, false);
-				}
-			}
+			pc->clear_existing_reproduceskill(tsd, false);
 			lv = min(lv, skill->get_max(copy_skill));
 
 			tsd->reproduceskill_id = copy_skill;

From e65896278a49125fa60c11a12736f592a2d101ba Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Fri, 24 May 2024 23:22:33 +0200
Subject: [PATCH 06/14] Fix SC_REPRODUCE deleting learned skills and all skills
 that required them by accident

---
 src/map/pc.c    | 23 +++++++++++++++++------
 src/map/skill.c | 12 +++++++++---
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/map/pc.c b/src/map/pc.c
index ee7358627..14c3a4409 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1536,11 +1536,17 @@ static int pc_reg_received(struct map_session_data *sd)
 	if ((i = pc->checkskill(sd,SC_REPRODUCE)) > 0) {
 		sd->reproduceskill_id = pc_readglobalreg(sd,script->add_variable("REPRODUCE_SKILL"));
 		if( sd->reproduceskill_id > 0 && (idx = skill->get_index(sd->reproduceskill_id)) > 0) {
+			int learned_lv = sd->status.skill[idx].lv;
+			bool is_own_skill = pc->is_own_skill(sd, sd->reproduceskill_id);
 			sd->status.skill[idx].id = sd->reproduceskill_id;
 			sd->status.skill[idx].lv = pc_readglobalreg(sd,script->add_variable("REPRODUCE_SKILL_LV"));
 			if( i < sd->status.skill[idx].lv)
 				sd->status.skill[idx].lv = i;
-			sd->status.skill[idx].flag = SKILL_FLAG_PLAGIARIZED;
+
+			if (is_own_skill)
+				sd->status.skill[idx].flag = learned_lv + SKILL_FLAG_REPLACED_LV_0;
+			else
+				sd->status.skill[idx].flag = SKILL_FLAG_PLAGIARIZED;
 		}
 	}
 
@@ -1650,9 +1656,10 @@ static void pc_calc_skilltree_clear(struct map_session_data *sd)
 	nullpo_retv(sd);
 
 	for (i = 0; i < MAX_SKILL_DB; i++) {
-		if (sd->status.skill[i].flag != SKILL_FLAG_PLAGIARIZED && sd->status.skill[i].flag != SKILL_FLAG_PERM_GRANTED
-		    && sd->status.skill[i].id != sd->cloneskill_id) //Don't touch these
-			sd->status.skill[i].id = 0; //First clear skills.
+		if (sd->status.skill[i].flag == SKILL_FLAG_PLAGIARIZED || sd->status.skill[i].flag == SKILL_FLAG_PERM_GRANTED
+		    || sd->status.skill[i].id == sd->cloneskill_id || sd->status.skill[i].id == sd->reproduceskill_id) //Don't touch these
+			continue;
+		sd->status.skill[i].id = 0; //First clear skills.
 		/* permanent skills that must be re-checked */
 		if (sd->status.skill[i].flag == SKILL_FLAG_PERMANENT) {
 			switch (skill->dbs->db[i].nameid) {
@@ -1686,7 +1693,7 @@ static int pc_calc_skilltree(struct map_session_data *sd)
 	pc->calc_skilltree_clear(sd);
 
 	for (int i = 0; i < MAX_SKILL_DB; i++) {
-		if ((sd->status.skill[i].flag >= SKILL_FLAG_REPLACED_LV_0 && sd->status.skill[i].id != sd->cloneskill_id)
+		if ((sd->status.skill[i].flag >= SKILL_FLAG_REPLACED_LV_0 && sd->status.skill[i].id != sd->cloneskill_id && sd->status.skill[i].id != sd->reproduceskill_id)
 		    || sd->status.skill[i].flag == SKILL_FLAG_TEMPORARY) {
 			// Restore original level of skills after deleting earned skills.
 			sd->status.skill[i].lv = (sd->status.skill[i].flag == SKILL_FLAG_TEMPORARY) ? 0 : sd->status.skill[i].flag - SKILL_FLAG_REPLACED_LV_0;
@@ -8871,7 +8878,6 @@ static int pc_jobchange(struct map_session_data *sd, int class, int upper)
 	}
 
 	pc->clear_existing_cloneskill(sd, true);
-
 	pc->clear_existing_reproduceskill(sd, true);
 
 	if ((job & MAPID_UPPERMASK) != (sd->job & MAPID_UPPERMASK)) { //Things to remove when changing class tree.
@@ -12670,6 +12676,11 @@ static void pc_clear_existing_reproduceskill(struct map_session_data *sd, bool c
 			sd->status.skill[idx].lv = 0;
 			sd->status.skill[idx].flag = 0;
 			clif->deleteskill(sd, sd->reproduceskill_id, false);
+		} else if (sd->status.skill[idx].flag >= SKILL_FLAG_REPLACED_LV_0) {
+			sd->status.skill[idx].lv = sd->status.skill[idx].flag - SKILL_FLAG_REPLACED_LV_0;
+			sd->status.skill[idx].flag = SKILL_FLAG_PERMANENT;
+			// CAREFUL! This assumes you will only ever use SKILL_FLAG_REPLACED_LV_0 logic when copying SKILL_FLAG_PERMANENT skills!!!
+			clif->addskill(sd, sd->reproduceskill_id);
 		}
 	}
 
diff --git a/src/map/skill.c b/src/map/skill.c
index 0c92bd6e6..93f66c189 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3683,12 +3683,12 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 
 		int cidx, lv = 0;
 		cidx = skill->get_index(copy_skill);
+		int learned_lv = tsd->status.skill[cidx].lv;
+		bool copying_own_skill = pc->is_own_skill(tsd, copy_skill);
 		switch(can_copy(tsd, copy_skill)) {
 		case 1: // Plagiarism
 		{
 			pc->clear_existing_cloneskill(tsd, false);
-			int learned_lv = tsd->status.skill[cidx].lv;
-			bool copying_own_skill = pc->is_own_skill(tsd, copy_skill);
 
 			lv = min(skill_lv, pc->checkskill(tsd, RG_PLAGIARISM));
 			if (learned_lv > lv)
@@ -3711,7 +3711,10 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 		{
 			lv = sc ? sc->data[SC__REPRODUCE]->val1 : 1;
 			pc->clear_existing_reproduceskill(tsd, false);
+
 			lv = min(lv, skill->get_max(copy_skill));
+			if (learned_lv > lv)
+				break; // unconfirmed, but probably the same behavior as for RG_PLAGIARISM
 
 			tsd->reproduceskill_id = copy_skill;
 			pc_setglobalreg(tsd, script->add_variable("REPRODUCE_SKILL"), copy_skill);
@@ -3719,7 +3722,10 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 
 			tsd->status.skill[cidx].id = copy_skill;
 			tsd->status.skill[cidx].lv = lv;
-			tsd->status.skill[cidx].flag = SKILL_FLAG_PLAGIARIZED;
+			if (copying_own_skill)
+				tsd->status.skill[cidx].flag = learned_lv + SKILL_FLAG_REPLACED_LV_0;
+			else
+				tsd->status.skill[cidx].flag = SKILL_FLAG_PLAGIARIZED;
 			clif->addskill(tsd, copy_skill);
 		}
 		break;

From 7c4cda0de514f9917c859f5160932bc647776c1d Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Sat, 25 May 2024 17:09:03 +0200
Subject: [PATCH 07/14] Add SKILL_FLAG_REPLACED_LV_0 to non-copyable logic of
 can_copy to match SKILL_FLAG_PLAGIARIZED

---
 src/map/skill.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/map/skill.c b/src/map/skill.c
index 93f66c189..67146797a 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1262,7 +1262,8 @@ static int can_copy(struct map_session_data *sd, uint16 skill_id)
 	if (!cidx)
 		return 0;
 
-	if (sd->status.skill[cidx].id && sd->status.skill[cidx].flag == SKILL_FLAG_PLAGIARIZED)
+	if (sd->status.skill[cidx].id != 0 && (sd->status.skill[cidx].flag >= SKILL_FLAG_REPLACED_LV_0
+	                                       || sd->status.skill[cidx].flag == SKILL_FLAG_PLAGIARIZED))
 		return 0;
 
 	// Checks if preserve is active and if skill can be copied by Plagiarism

From 8790b0b4a6a0f0d2862ae7ef84aee779c0e6748e Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Sat, 25 May 2024 18:59:27 +0200
Subject: [PATCH 08/14] Add SKILL_FLAG_PERM_GRANTED to non-copyable logic of
 can_copy for safety reasons as there's no clearly defined behavior for those

---
 src/map/skill.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/map/skill.c b/src/map/skill.c
index 67146797a..ebabd361f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1263,7 +1263,8 @@ static int can_copy(struct map_session_data *sd, uint16 skill_id)
 		return 0;
 
 	if (sd->status.skill[cidx].id != 0 && (sd->status.skill[cidx].flag >= SKILL_FLAG_REPLACED_LV_0
-	                                       || sd->status.skill[cidx].flag == SKILL_FLAG_PLAGIARIZED))
+	                                       || sd->status.skill[cidx].flag == SKILL_FLAG_PLAGIARIZED
+	                                       || sd->status.skill[cidx].flag == SKILL_FLAG_PERM_GRANTED))
 		return 0;
 
 	// Checks if preserve is active and if skill can be copied by Plagiarism

From 18ecdb1098ea4aab5754a5d16a379d1057690519 Mon Sep 17 00:00:00 2001
From: "Guilherme G. Menaldo" <guilherme.menaldo@outlook.com>
Date: Thu, 6 Jun 2024 20:29:27 -0300
Subject: [PATCH 09/14] Add mesnavigation script command

basic command to generate navi tags following client-specific format
---
 doc/script_commands.txt                       | 73 +++++++++++++++++++
 npc/dev/test.txt                              | 29 ++++++++
 src/map/clif.c                                | 36 +++++++++
 src/map/clif.h                                |  3 +
 src/map/script.c                              | 62 ++++++++++++++++
 src/map/script.h                              | 19 ++++-
 src/plugins/HPMHooking/HPMHooking.Defs.inc    |  4 +
 .../HPMHooking_map.HPMHooksCore.inc           |  8 ++
 .../HPMHooking_map.HookingPoints.inc          |  2 +
 .../HPMHooking/HPMHooking_map.Hooks.inc       | 53 ++++++++++++++
 10 files changed, 288 insertions(+), 1 deletion(-)

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index afaa90afc..2c31690d8 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -2612,6 +2612,79 @@ deleted.
 	// This would delete all elements of the array
 	deletearray(.@array);
 
+---------------------------------------
+//=====================================
+1.1 - Message formatting commands (tags)
+//=====================================
+---------------------------------------
+
+*mesnavigation("<label>", "<map>"{, <x>{, <y>{, <show_window>{, <mode>{, <services_flag>{, <monster_id>}}}}}});
+
+Generates and returns a <NAVI> tag with the given parameters. A <NAVI> tag when written to certain windows,
+such as the one from "mes" command, will create a highlighted and clickable text, which when clicked,
+starts the navigation system for the specified values.
+
+It is important to note that for most "<modes>" values, it is expected that your client has proper navigation
+files which includes the target NPC/monster, or they will fail.
+
+If the current client doesn't support NAVI tags, returns a fall back text which generally looks like:
+	<label> (<map_name> <x>, <y>)
+
+Parameters:
+- label: (string, required)
+	The visible and clickable text. (example: "Hat maker")
+
+- map: (string, required)
+	Target map name. (example: "prontera")
+	Note: when service_flag is NAV_WINDOW_SEARCH (-222) this becomes the search string.
+
+- x: (int, optional, defaults to 0)
+	Target map X position
+	Note: does nothing when used with modes NAV_MODE_MAP or NAV_MODE_MOB
+
+- y: (int, optional, defaults to 0)
+	Target map Y position
+	Note: does nothing when used with modes NAV_MODE_MAP or NAV_MODE_MOB
+
+- show_window: (bool, optional, defaults to false)
+	Whether to open the navigation UI (true) or not (false) when clicking the label.
+
+- mode: (int, optional, defaults to NAV_MODE_ALL (0))
+	The kind of navigation being performed. This mainly affects the messages shown by the client when you reach the map.
+	- NAV_MODE_ALL (0): "You have reached your destination"
+	- NAV_MODE_MAP (1): "You have reached the target map"
+	- NAV_MODE_NPC (2): "You have reached the map the NPC is at" / "You have reached the target NPC"
+	- NAV_MODE_MOB (3): "You have reached the map where the monster appears"
+
+	Notes:
+	- NAV_MODE_NPC requires client navigation files to have a NPC in the exact position or an error is shown
+	- NAV_MODE_MOB requires client navigation files to have <monster_id> spawn in the given map or an error is shown.
+
+- services_flag: (int, optional, defaults to NAV_KAFRA_AND_AIRSHIP (101))
+	The kinds of services that may be used when calculating the route.
+
+	The following values may be summed up:
+	- NAV_AIRSHIP_ONLY (1): Include airships
+	- NAV_SCROLL_ONLY (10): Include scrolls
+	- NAV_KAFRA_ONLY (100): Include kafras
+
+	Summed values:
+	- NAV_AIRSHIP_AND_SCROLL (11)
+	- NAV_KAFRA_AND_AIRSHIP (101)
+	- NAV_KAFRA_AND_SCROLL (110)
+	- NAV_ALL (111)
+
+	Special values:
+	- NAV_WINDOW_SEARCH (-222)
+		This is a special value that can't be summed with others and when used,
+		"map" becomes a search string in the navigation UI. And client performs a search
+		with the special keyword "$$DB".
+		It is only known to work together with mode = NAV_MODE_MOB and using monster Sprite Name
+		as "map".
+
+- monster_id: (int, optional, defaults to 0)
+	To be used with mode = NAV_MODE_MOB. The ID of the monster being looked for.
+
 ---------------------------------------
 //=====================================
 1 - End of Basic-Related Commands
diff --git a/npc/dev/test.txt b/npc/dev/test.txt
index c5a766cbb..8c4732851 100644
--- a/npc/dev/test.txt
+++ b/npc/dev/test.txt
@@ -261,6 +261,32 @@ function	script	F_TestGetItemLink_FullWeapon	{
 	return .@pass;
 }
 
+function	script	F_TestMesNavigation_Basic	{
+	.@str$ = mesnavigation("Somewhere", "prt_fild08", 100, 105);
+
+	.@pass = false;
+	if (PACKETVER < 20111010) {
+		.@pass = (.@str$ == "Somewhere (prt_fild08 100, 105)");
+	} else {
+		.@pass = (.@str$ == "<NAVI>Somewhere<INFO>prt_fild08,100,105,</INFO></NAVI>");
+	}
+
+	return .@pass;
+}
+
+function	script	F_TestMesNavigation_Complete	{
+	.@str$ = mesnavigation("Some NPC", "prt_fild08", 175, 370, true, NAV_MODE_ALL, NAV_NONE);
+
+	.@pass = false;
+	if (PACKETVER < 20111010) {
+		.@pass = (.@str$ == "Some NPC (prt_fild08 175, 370)");
+	} else {
+		.@pass = (.@str$ == "<NAVI>Some NPC<INFO>prt_fild08,175,370,0,0,1,0</INFO></NAVI>");
+	}
+
+	return .@pass;
+}
+
 function	script	HerculesSelfTestHelper	{
 	if (.once > 0)
 		return .errors;
@@ -978,6 +1004,9 @@ function	script	HerculesSelfTestHelper	{
 	callsub(OnCheck, "getitemlink: basic weapon tag", F_TestGetItemLink_BaseWeapon(), true);
 	callsub(OnCheck, "getitemlink: complete weapon tag", F_TestGetItemLink_FullWeapon(), true);
 
+	callsub(OnCheck, "mesnavigation: basic destination", F_TestMesNavigation_Basic(), true);
+	callsub(OnCheck, "mesnavigation: all params", F_TestMesNavigation_Complete(), true);
+
 	if (.errors) {
 		consolemes(CONSOLEMES_DEBUG, "Script engine self-test   [ \033[0;31mFAILED\033[0m ]");
 		consolemes(CONSOLEMES_DEBUG, "**** The test was completed with " + .errors + " errors. ****");
diff --git a/src/map/clif.c b/src/map/clif.c
index 1e189c1f0..67554b177 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -26126,6 +26126,41 @@ static void clif_format_itemlink(StringBuf *buf, const struct item *it)
 	#undef get_padded_value
 }
 
+/**
+ * Creates a "navigation" tag (<NAVI>) string into buf based on the given parameters.
+ * The resulting format and feature support is client-specific (newer clients supports more).
+ *
+ * @param buf buffer where the string will be written to
+ * @param label label of the navigation
+ * @param mapname name of the map
+ * @param x x coordinate
+ * @param y y coordinate
+ * @param mode navigation mode
+ * @param services_flag navigation services flag
+ * @param show_window show window flag
+ * @param monster_id monster id
+ */
+static void clif_format_navigation(StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id)
+{
+	nullpo_retv(buf);
+	nullpo_retv(label);
+	nullpo_retv(mapname);
+
+#if PACKETVER >= 20111010
+	StrBuf->Printf(buf, "<NAVI>%s<INFO>%s,%d,%d,", label, mapname, x, y);
+
+	if (mode == 0 && services_flag == NAV_KAFRA_AND_AIRSHIP && !show_window && monster_id == 0) {
+		StrBuf->Printf(buf, "</INFO></NAVI>");
+		return;
+	}
+
+	StrBuf->Printf(buf, "%d,%d,%d,%d</INFO></NAVI>", (int) mode, (int) services_flag, show_window ? 1 : 0, monster_id);
+#else
+	// Unsupported feature, fallback to a basic text
+	StrBuf->Printf(buf, "%s (%s %d, %d)", label, mapname, x, y);
+#endif
+}
+
 /*==========================================
  * Main client packet processing function
  *------------------------------------------*/
@@ -27498,4 +27533,5 @@ void clif_defaults(void)
 	clif->pAdventuterAgencyJoinResult = clif_parse_adventuterAgencyJoinResult;
 
 	clif->format_itemlink = clif_format_itemlink;
+	clif->format_navigation = clif_format_navigation;
 }
diff --git a/src/map/clif.h b/src/map/clif.h
index d77b51abb..2139ddaf5 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -72,6 +72,8 @@ enum macro_report_status;
 enum grade_level;
 enum grade_ui_result;
 enum item_reform_status;
+enum navigation_mode;
+enum navigation_service;
 
 /**
  * Defines
@@ -963,6 +965,7 @@ struct clif_interface {
 	unsigned short (*decrypt_cmd) ( int cmd, struct map_session_data *sd );
 	/* client-specific logic */
 	void (*format_itemlink) (struct StringBuf *buf, const struct item *it);
+	void (*format_navigation) (struct StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
 	/* auth */
 	void (*authok) (struct map_session_data *sd);
 	void (*auth_error) (int fd, int errorCode);
diff --git a/src/map/script.c b/src/map/script.c
index 9f04bf934..ef6ccb479 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -27331,6 +27331,59 @@ static BUILDIN(navigateto)
 #endif
 }
 
+/**
+ * Common function for script commands that generates NAVI tags.
+ */
+static bool script_format_navigation(struct script_state *st, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id)
+{
+	nullpo_retr(false, st);
+	nullpo_retr(false, label);
+	nullpo_retr(false, mapname);
+
+	const char *command_name = script->getfuncname(st);
+
+	if (mode < NAV_MODE_ALL || mode >= NAV_MODE_MAX) {
+		ShowError("script:%s: unknown mode (%u). See valid values for NAV_MODE_* constants\n", command_name, mode);
+		script_pushconststr(st, "");
+		return false;
+	}
+
+	if (monster_id != 0 && mob->db(monster_id) == NULL) {
+		ShowError("script:%s: unknown monster id (%d).\n", command_name, monster_id);
+		script_pushconststr(st, "");
+		return false;
+	}
+
+	StringBuf buf;
+	StrBuf->Init(&buf);
+
+	clif->format_navigation(&buf, label, mapname, x, y, mode, services_flag, show_window, monster_id);
+	script_pushstrcopy(st, StrBuf->Value(&buf));
+
+	StrBuf->Destroy(&buf);
+	return true;
+}
+
+/**
+ * Generates a <NAVI> tag with the given parameters (if supported by the client).
+ * If unsupported, returns a fall back text.
+ *
+ * mesnavigation("<label>", "<map>"{, <x>{, <y>{, <show_window>{, <mode>{, <services_flag>{, <monster_id>}}}}}})
+ */
+static BUILDIN(mesnavigation)
+{
+	const char *label = script_getstr(st, 2);
+	const char *mapname = script_getstr(st, 3);
+	int x = script_hasdata(st, 4) ? script_getnum(st, 4) : 0;
+	int y = script_hasdata(st, 5) ? script_getnum(st, 5) : 0;
+	bool showWindow = script_hasdata(st, 6) ? (script_getnum(st, 6) == 1) : false;
+	enum navigation_mode mode = script_hasdata(st, 7) ? script_getnum(st, 7) : NAV_MODE_ALL;
+	enum navigation_service services = script_hasdata(st, 8) ? script_getnum(st, 8) : NAV_KAFRA_AND_AIRSHIP;
+	int monster_id = script_hasdata(st, 9) ? script_getnum(st, 9) : 0;
+
+	return script->format_navigation(st, label, mapname, x, y, mode, services, showWindow, monster_id);
+}
+
 static bool buildin_rodex_sendmail_sub(struct script_state *st, struct rodex_message *msg)
 {
 	const char *sender_name, *title, *body;
@@ -29253,6 +29306,7 @@ static void script_parse_builtin(void)
 
 		/* Navigation */
 		BUILDIN_DEF(navigateto, "s??????"),
+		BUILDIN_DEF(mesnavigation, "ss??????"),
 
 		/* Clan System */
 		BUILDIN_DEF(clan_join,"i?"),
@@ -29494,6 +29548,12 @@ static void script_hardcoded_constants(void)
 	script->constdb_comment("Maximum Item Options");
 	script->set_constant("MAX_ITEM_OPTIONS", MAX_ITEM_OPTIONS, false, false);
 
+	script->constdb_comment("Navigation mode constants, use with *mesnavigation*");
+	script->set_constant("NAV_MODE_ALL", NAV_MODE_ALL, false, false);
+	script->set_constant("NAV_MODE_MAP", NAV_MODE_MAP, false, false);
+	script->set_constant("NAV_MODE_NPC", NAV_MODE_NPC, false, false);
+	script->set_constant("NAV_MODE_MOB", NAV_MODE_MOB, false, false);
+
 	script->constdb_comment("Navigation constants, use with *navigateto*");
 	script->set_constant("NAV_NONE", NAV_NONE, false, false);
 	script->set_constant("NAV_AIRSHIP_ONLY", NAV_AIRSHIP_ONLY, false, false);
@@ -29503,6 +29563,7 @@ static void script_hardcoded_constants(void)
 	script->set_constant("NAV_KAFRA_AND_AIRSHIP", NAV_KAFRA_AND_AIRSHIP, false, false);
 	script->set_constant("NAV_KAFRA_AND_SCROLL", NAV_KAFRA_AND_SCROLL, false, false);
 	script->set_constant("NAV_ALL", NAV_ALL, false, false);
+	script->set_constant("NAV_WINDOW_SEARCH", NAV_WINDOW_SEARCH, false, false);
 
 	script->constdb_comment("BL types");
 	script->set_constant("BL_PC",BL_PC,false, false);
@@ -30565,6 +30626,7 @@ void script_defaults(void)
 	script->buildin_query_sql_sub = buildin_query_sql_sub;
 	script->buildin_instance_warpall_sub = buildin_instance_warpall_sub;
 	script->buildin_mobuseskill_sub = buildin_mobuseskill_sub;
+	script->format_navigation = script_format_navigation;
 	script->buildin_rodex_sendmail_sub = buildin_rodex_sendmail_sub;
 	script->cleanfloor_sub = script_cleanfloor_sub;
 	script->run_func = run_func;
diff --git a/src/map/script.h b/src/map/script.h
index 6b27d8249..ecb4b252e 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -357,6 +357,19 @@ enum {
 	MF_NOSENDMAIL,
 };
 
+enum navigation_mode {
+	NAV_MODE_ALL     = 0,
+	NAV_MODE_MAP     = 1,
+	NAV_MODE_NPC     = 2,
+	NAV_MODE_MOB     = 3,
+	/**
+	 * 4 is in client accepted range but it is not implemented
+	 * So also marking it as "MAX" so we prevent code from sending bad values.
+	 */
+	NAV_MODE_UNKNOWN = 4,
+	NAV_MODE_MAX     = 4,
+};
+
 enum navigation_service {
 	NAV_NONE               = 0,
 	NAV_AIRSHIP_ONLY       = 1,
@@ -365,7 +378,10 @@ enum navigation_service {
 	NAV_KAFRA_ONLY         = 100,
 	NAV_KAFRA_AND_AIRSHIP  = NAV_KAFRA_ONLY + NAV_AIRSHIP_ONLY, // 101
 	NAV_KAFRA_AND_SCROLL   = NAV_KAFRA_ONLY + NAV_SCROLL_ONLY, // 110
-	NAV_ALL                = NAV_AIRSHIP_ONLY + NAV_SCROLL_ONLY + NAV_KAFRA_ONLY // 111-255
+	NAV_ALL                = NAV_AIRSHIP_ONLY + NAV_SCROLL_ONLY + NAV_KAFRA_ONLY, // 111-255
+
+	/** Special value that simply opens the window with a $$DB search instead of a real navigation */
+	NAV_WINDOW_SEARCH      = -222,
 };
 
 /**
@@ -1080,6 +1096,7 @@ struct script_interface {
 	int (*buildin_query_sql_sub) (struct script_state *st, struct Sql *handle);
 	int (*buildin_instance_warpall_sub) (struct block_list *bl, va_list ap);
 	int (*buildin_mobuseskill_sub) (struct block_list *bl, va_list ap);
+	bool (*format_navigation) (struct script_state *st, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
 	bool (*buildin_rodex_sendmail_sub) (struct script_state *st, struct rodex_message *msg);
 	int (*cleanfloor_sub) (struct block_list *bl, va_list ap);
 	int (*run_func) (struct script_state *st);
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 9f05793b4..5e3cad6b8 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1336,6 +1336,8 @@ typedef unsigned short (*HPMHOOK_pre_clif_decrypt_cmd) (int *cmd, struct map_ses
 typedef unsigned short (*HPMHOOK_post_clif_decrypt_cmd) (unsigned short retVal___, int cmd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_format_itemlink) (struct StringBuf **buf, const struct item **it);
 typedef void (*HPMHOOK_post_clif_format_itemlink) (struct StringBuf *buf, const struct item *it);
+typedef void (*HPMHOOK_pre_clif_format_navigation) (struct StringBuf **buf, const char **label, const char **mapname, int *x, int *y, enum navigation_mode *mode, enum navigation_service *services_flag, bool *show_window, int *monster_id);
+typedef void (*HPMHOOK_post_clif_format_navigation) (struct StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
 typedef void (*HPMHOOK_pre_clif_authok) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_authok) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_auth_error) (int *fd, int *errorCode);
@@ -8152,6 +8154,8 @@ typedef int (*HPMHOOK_pre_script_buildin_instance_warpall_sub) (struct block_lis
 typedef int (*HPMHOOK_post_script_buildin_instance_warpall_sub) (int retVal___, struct block_list *bl, va_list ap);
 typedef int (*HPMHOOK_pre_script_buildin_mobuseskill_sub) (struct block_list **bl, va_list ap);
 typedef int (*HPMHOOK_post_script_buildin_mobuseskill_sub) (int retVal___, struct block_list *bl, va_list ap);
+typedef bool (*HPMHOOK_pre_script_format_navigation) (struct script_state **st, const char **label, const char **mapname, int *x, int *y, enum navigation_mode *mode, enum navigation_service *services_flag, bool *show_window, int *monster_id);
+typedef bool (*HPMHOOK_post_script_format_navigation) (bool retVal___, struct script_state *st, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
 typedef bool (*HPMHOOK_pre_script_buildin_rodex_sendmail_sub) (struct script_state **st, struct rodex_message **msg);
 typedef bool (*HPMHOOK_post_script_buildin_rodex_sendmail_sub) (bool retVal___, struct script_state *st, struct rodex_message *msg);
 typedef int (*HPMHOOK_pre_script_cleanfloor_sub) (struct block_list **bl, va_list ap);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index eaba4419a..887a9edc4 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -694,6 +694,8 @@ struct {
 	struct HPMHookPoint *HP_clif_decrypt_cmd_post;
 	struct HPMHookPoint *HP_clif_format_itemlink_pre;
 	struct HPMHookPoint *HP_clif_format_itemlink_post;
+	struct HPMHookPoint *HP_clif_format_navigation_pre;
+	struct HPMHookPoint *HP_clif_format_navigation_post;
 	struct HPMHookPoint *HP_clif_authok_pre;
 	struct HPMHookPoint *HP_clif_authok_post;
 	struct HPMHookPoint *HP_clif_auth_error_pre;
@@ -6080,6 +6082,8 @@ struct {
 	struct HPMHookPoint *HP_script_buildin_instance_warpall_sub_post;
 	struct HPMHookPoint *HP_script_buildin_mobuseskill_sub_pre;
 	struct HPMHookPoint *HP_script_buildin_mobuseskill_sub_post;
+	struct HPMHookPoint *HP_script_format_navigation_pre;
+	struct HPMHookPoint *HP_script_format_navigation_post;
 	struct HPMHookPoint *HP_script_buildin_rodex_sendmail_sub_pre;
 	struct HPMHookPoint *HP_script_buildin_rodex_sendmail_sub_post;
 	struct HPMHookPoint *HP_script_cleanfloor_sub_pre;
@@ -8271,6 +8275,8 @@ struct {
 	int HP_clif_decrypt_cmd_post;
 	int HP_clif_format_itemlink_pre;
 	int HP_clif_format_itemlink_post;
+	int HP_clif_format_navigation_pre;
+	int HP_clif_format_navigation_post;
 	int HP_clif_authok_pre;
 	int HP_clif_authok_post;
 	int HP_clif_auth_error_pre;
@@ -13657,6 +13663,8 @@ struct {
 	int HP_script_buildin_instance_warpall_sub_post;
 	int HP_script_buildin_mobuseskill_sub_pre;
 	int HP_script_buildin_mobuseskill_sub_post;
+	int HP_script_format_navigation_pre;
+	int HP_script_format_navigation_post;
 	int HP_script_buildin_rodex_sendmail_sub_pre;
 	int HP_script_buildin_rodex_sendmail_sub_post;
 	int HP_script_cleanfloor_sub_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index b6b47879c..54abd9a07 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -372,6 +372,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->parse_cmd, HP_clif_parse_cmd) },
 	{ HP_POP(clif->decrypt_cmd, HP_clif_decrypt_cmd) },
 	{ HP_POP(clif->format_itemlink, HP_clif_format_itemlink) },
+	{ HP_POP(clif->format_navigation, HP_clif_format_navigation) },
 	{ HP_POP(clif->authok, HP_clif_authok) },
 	{ HP_POP(clif->auth_error, HP_clif_auth_error) },
 	{ HP_POP(clif->authrefuse, HP_clif_authrefuse) },
@@ -3113,6 +3114,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(script->buildin_query_sql_sub, HP_script_buildin_query_sql_sub) },
 	{ HP_POP(script->buildin_instance_warpall_sub, HP_script_buildin_instance_warpall_sub) },
 	{ HP_POP(script->buildin_mobuseskill_sub, HP_script_buildin_mobuseskill_sub) },
+	{ HP_POP(script->format_navigation, HP_script_format_navigation) },
 	{ HP_POP(script->buildin_rodex_sendmail_sub, HP_script_buildin_rodex_sendmail_sub) },
 	{ HP_POP(script->cleanfloor_sub, HP_script_cleanfloor_sub) },
 	{ HP_POP(script->run_func, HP_script_run_func) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 9861cbe91..d52e22e8b 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -9033,6 +9033,32 @@ void HP_clif_format_itemlink(struct StringBuf *buf, const struct item *it) {
 	}
 	return;
 }
+void HP_clif_format_navigation(struct StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_format_navigation_pre > 0) {
+		void (*preHookFunc) (struct StringBuf **buf, const char **label, const char **mapname, int *x, int *y, enum navigation_mode *mode, enum navigation_service *services_flag, bool *show_window, int *monster_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_format_navigation_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_format_navigation_pre[hIndex].func;
+			preHookFunc(&buf, &label, &mapname, &x, &y, &mode, &services_flag, &show_window, &monster_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.format_navigation(buf, label, mapname, x, y, mode, services_flag, show_window, monster_id);
+	}
+	if (HPMHooks.count.HP_clif_format_navigation_post > 0) {
+		void (*postHookFunc) (struct StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_format_navigation_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_format_navigation_post[hIndex].func;
+			postHookFunc(buf, label, mapname, x, y, mode, services_flag, show_window, monster_id);
+		}
+	}
+	return;
+}
 void HP_clif_authok(struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_authok_pre > 0) {
@@ -81071,6 +81097,33 @@ int HP_script_buildin_mobuseskill_sub(struct block_list *bl, va_list ap) {
 	}
 	return retVal___;
 }
+bool HP_script_format_navigation(struct script_state *st, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_script_format_navigation_pre > 0) {
+		bool (*preHookFunc) (struct script_state **st, const char **label, const char **mapname, int *x, int *y, enum navigation_mode *mode, enum navigation_service *services_flag, bool *show_window, int *monster_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_format_navigation_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_script_format_navigation_pre[hIndex].func;
+			retVal___ = preHookFunc(&st, &label, &mapname, &x, &y, &mode, &services_flag, &show_window, &monster_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.script.format_navigation(st, label, mapname, x, y, mode, services_flag, show_window, monster_id);
+	}
+	if (HPMHooks.count.HP_script_format_navigation_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct script_state *st, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_format_navigation_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_script_format_navigation_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, st, label, mapname, x, y, mode, services_flag, show_window, monster_id);
+		}
+	}
+	return retVal___;
+}
 bool HP_script_buildin_rodex_sendmail_sub(struct script_state *st, struct rodex_message *msg) {
 	int hIndex = 0;
 	bool retVal___ = false;

From f26053064cc8e7f3763f0ec92837911207c6b1f7 Mon Sep 17 00:00:00 2001
From: "Guilherme G. Menaldo" <guilherme.menaldo@outlook.com>
Date: Thu, 6 Jun 2024 20:41:42 -0300
Subject: [PATCH 10/14] Add mesmobspawn script command

---
 doc/script_commands.txt | 18 +++++++++++++++++
 npc/dev/test.txt        | 43 +++++++++++++++++++++++++++++++++++++++++
 src/map/clif.c          | 12 ++++++++++++
 src/map/script.c        | 26 +++++++++++++++++++++++++
 4 files changed, 99 insertions(+)

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 2c31690d8..acd5bddd0 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -2681,10 +2681,28 @@ Parameters:
 		with the special keyword "$$DB".
 		It is only known to work together with mode = NAV_MODE_MOB and using monster Sprite Name
 		as "map".
+		When using NAV_WINDOW_SEARCH, prefer using mesmobspawn instead.
 
 - monster_id: (int, optional, defaults to 0)
 	To be used with mode = NAV_MODE_MOB. The ID of the monster being looked for.
 
+---------------------------------------
+
+*mesmobspawn(<monster_id>{, "<label>"})
+
+Generates and returns a <NAVI> tag that opens the Navigation UI listing the places where <monster_id> monster spawns.
+
+This will only work if your client navigation files are properly configured with the <monster_id> spawns.
+
+If the current client doesn't support this feature, returns the value of <label>.
+
+Parameters:
+- monster_id: (int, required)
+	The ID of the monster being looked for.
+
+- label: (string, optional, defaults to <monster_id> name)
+	The visible and clickable text. (example: "Target monster")
+
 ---------------------------------------
 //=====================================
 1 - End of Basic-Related Commands
diff --git a/npc/dev/test.txt b/npc/dev/test.txt
index 8c4732851..93db22f62 100644
--- a/npc/dev/test.txt
+++ b/npc/dev/test.txt
@@ -287,6 +287,45 @@ function	script	F_TestMesNavigation_Complete	{
 	return .@pass;
 }
 
+function	script	F_TestMesNavigation_Search	{
+	.@str$ = mesnavigation("Some Monster", "PORING", 0, 0, true, NAV_MODE_MOB, NAV_WINDOW_SEARCH);
+
+	.@pass = false;
+	if (PACKETVER < 20130800) {
+		.@pass = (.@str$ == "Some Monster");
+	} else {
+		.@pass = (.@str$ == "<NAVI>Some Monster<INFO>PORING,0,0,3,-222</INFO></NAVI>");
+	}
+
+	return .@pass;
+}
+
+function	script	F_TestMesMobSpawn_Basic	{
+	.@str$ = mesmobspawn(PORING);
+
+	.@pass = false;
+	if (PACKETVER < 20130800) {
+		.@pass = (.@str$ == "Poring");
+	} else {
+		.@pass = (.@str$ == "<NAVI>Poring<INFO>PORING,0,0,3,-222</INFO></NAVI>");
+	}
+
+	return .@pass;
+}
+
+function	script	F_TestMesMobSpawn_WithLabel	{
+	.@str$ = mesmobspawn(PORING, "Target");
+
+	.@pass = false;
+	if (PACKETVER < 20130800) {
+		.@pass = (.@str$ == "Target");
+	} else {
+		.@pass = (.@str$ == "<NAVI>Target<INFO>PORING,0,0,3,-222</INFO></NAVI>");
+	}
+
+	return .@pass;
+}
+
 function	script	HerculesSelfTestHelper	{
 	if (.once > 0)
 		return .errors;
@@ -1006,6 +1045,10 @@ function	script	HerculesSelfTestHelper	{
 
 	callsub(OnCheck, "mesnavigation: basic destination", F_TestMesNavigation_Basic(), true);
 	callsub(OnCheck, "mesnavigation: all params", F_TestMesNavigation_Complete(), true);
+	callsub(OnCheck, "mesnavigation: monster spawn search", F_TestMesNavigation_Search(), true);
+
+	callsub(OnCheck, "mesmobspawn: basic usage", F_TestMesMobSpawn_Basic(), true);
+	callsub(OnCheck, "mesmobspawn: with label", F_TestMesMobSpawn_WithLabel(), true);
 
 	if (.errors) {
 		consolemes(CONSOLEMES_DEBUG, "Script engine self-test   [ \033[0;31mFAILED\033[0m ]");
diff --git a/src/map/clif.c b/src/map/clif.c
index 67554b177..6d917ea7d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -26146,6 +26146,18 @@ static void clif_format_navigation(StringBuf *buf, const char *label, const char
 	nullpo_retv(label);
 	nullpo_retv(mapname);
 
+	// services_flag == NAV_WINDOW_SEARCH makes a search in <mode> category using the input as "$$DB <mapname>"
+	// It is only known to work for monsters and "mapname" becomes the sprite name
+	if (services_flag == NAV_WINDOW_SEARCH) {
+#if PACKETVER >= 20130800 // Exact date unknown, > 2013-07-10 <= 2013-12-18
+		StrBuf->Printf(buf, "<NAVI>%s<INFO>%s,%d,%d,%d,%d</INFO></NAVI>", label, mapname, x, y, (int) mode, (int) services_flag);
+#else
+		// Unsupported feature, fallback to a basic text
+		StrBuf->Printf(buf, "%s", label);
+#endif
+		return;
+	}
+
 #if PACKETVER >= 20111010
 	StrBuf->Printf(buf, "<NAVI>%s<INFO>%s,%d,%d,", label, mapname, x, y);
 
diff --git a/src/map/script.c b/src/map/script.c
index ef6ccb479..399787e04 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -27384,6 +27384,31 @@ static BUILDIN(mesnavigation)
 	return script->format_navigation(st, label, mapname, x, y, mode, services, showWindow, monster_id);
 }
 
+/**
+ * Generates a <NAVI> tag to link to the list of spawns of <monster_id>.
+ * If the client doesn't support it, returns the label as plain text.
+ *
+ * mesmobspawn(monster_id{, "label"});
+ */
+static BUILDIN(mesmobspawn)
+{
+	int monster_id = script_getnum(st, 2);
+	const char *label = script_hasdata(st, 3) ? script_getstr(st, 3) : NULL;
+
+	struct mob_db *monster = mob->db(monster_id);
+	if (monster == NULL) {
+		ShowError("buildin_mesmobspawn: Non-existent monster id %d.\n", monster_id);
+		script_pushconststr(st, "null");
+		return false;
+	}
+
+	if (label == NULL) {
+		label = monster->name;
+	}
+
+	return script->format_navigation(st, label, monster->sprite, 0, 0, NAV_MODE_MOB, NAV_WINDOW_SEARCH, true, 0);
+}
+
 static bool buildin_rodex_sendmail_sub(struct script_state *st, struct rodex_message *msg)
 {
 	const char *sender_name, *title, *body;
@@ -29307,6 +29332,7 @@ static void script_parse_builtin(void)
 		/* Navigation */
 		BUILDIN_DEF(navigateto, "s??????"),
 		BUILDIN_DEF(mesnavigation, "ss??????"),
+		BUILDIN_DEF(mesmobspawn, "i?"),
 
 		/* Clan System */
 		BUILDIN_DEF(clan_join,"i?"),

From f5e3ee7ba43a500b86e4a47ac88734b1d45a98bd Mon Sep 17 00:00:00 2001
From: "Guilherme G. Menaldo" <guilherme.menaldo@outlook.com>
Date: Sat, 8 Jun 2024 00:41:26 -0300
Subject: [PATCH 11/14] Replace usages of <NAVI> tag with mesnavigation

---
 npc/re/jobs/novice/academy.txt | 144 ++++++++++++++++-----------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index 0e240f62b..447265760 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -466,11 +466,11 @@ izlude,198,213,3	script	Captain Carocc#iz	4_M_REINDEER,5,5,{
 						next();
 						cutin("", 255);
 						mes("[Carocc]");
-						mes("If you need more help with the map, press <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI>here");
+						mesf("If you need more help with the map, press %s here", mesnavigation("[Hun]", "izlude", 122, 207));
 						mes("Yes, the part that says 'Hun'.");
 						next();
 						mes("!- Information -!");
-						mes("^4d4dffThe icon during talk <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> means a link to navigation directions.");
+						mesf("^4d4dffThe icon during talk %s means a link to navigation directions.", mesnavigation("[Hun]", "izlude", 122, 207));
 						cutin("navi01", 4);
 						next();
 						mes("!- Information -!");
@@ -499,11 +499,11 @@ izlude,198,213,3	script	Captain Carocc#iz	4_M_REINDEER,5,5,{
 						mes("You can zoom in with +, zoom out with -. The waypoint from the NPC will be marked on it. ^000000");
 						next();
 						mes("[Carocc]");
-						mes("If you need more help with the map, press <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> here");
+						mesf("If you need more help with the map, press %s here", mesnavigation("[Hun]", "izlude", 122, 207));
 						mes("Yes, the part that says [Hun].");
 						next();
 						mes("!- Information -!");
-						mes("^4d4dff the icon during talk <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> means");
+						mesf("^4d4dff the icon during talk %s means", mesnavigation("[Hun]", "izlude", 122, 207));
 						mes("a link to navigation directions.");
 						cutin("navi01", 4);
 						next();
@@ -533,11 +533,11 @@ izlude,198,213,3	script	Captain Carocc#iz	4_M_REINDEER,5,5,{
 					viewpoint 1, 122, 207, 0, 0x4d4dff;
 					next();
 					mes("[Carocc]");
-					mes("If you need more help with the map, press <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI>here");
+					mesf("If you need more help with the map, press %s here", mesnavigation("[Hun]", "izlude", 122, 207));
 					mes("Yes, the part that says ''Hun''.");
 					next();
 					mes("!- Information -!");
-					mes("^4d4dff the icon during talk <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> means");
+					mesf("^4d4dff the icon during talk %s means", mesnavigation("[Hun]", "izlude", 122, 207));
 					mes("a link to navigation directions.");
 					cutin("navi01", 4);
 					next();
@@ -617,11 +617,11 @@ izlude,198,213,3	script	Captain Carocc#iz	4_M_REINDEER,5,5,{
 							mes("Quest window can be opened by pressing the ^4d4dffAlt + u^000000 key.");
 							next();
 							mes("[Carocc]");
-							mes("If you need more help with the map, press <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> here");
+							mesf("If you need more help with the map, press %s here", mesnavigation("[Hun]", "izlude", 122, 207));
 							mes("Yes, the part that says [Hun].");
 							next();
 							mes("!- Information -!");
-							mes("^4d4dff the icon during talk <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> means");
+							mesf("^4d4dff the icon during talk %s means", mesnavigation("[Hun]", "izlude", 122, 207));
 							mes("a link to navigation directions.");
 							cutin("navi01", 4);
 							next();
@@ -651,11 +651,11 @@ izlude,198,213,3	script	Captain Carocc#iz	4_M_REINDEER,5,5,{
 							mes("You can zoom in with +, zoom out with -. The waypoint from the NPC will be marked on it. ^000000");
 							next();
 							mes("[Carocc]");
-							mes("If you need more help with the map, press <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> here");
+							mesf("If you need more help with the map, press %s here", mesnavigation("[Hun]", "izlude", 122, 207));
 							mes("Yes, the part that says [Hun].");
 							next();
 							mes("!- Information -!");
-							mes("^4d4dff the icon during talk <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> means");
+							mesf("^4d4dff the icon during talk %s means", mesnavigation("[Hun]", "izlude", 122, 207));
 							mes("a link to navigation directions.");
 							cutin("navi01", 4);
 							next();
@@ -691,7 +691,7 @@ izlude,198,213,3	script	Captain Carocc#iz	4_M_REINDEER,5,5,{
 					mes("The Academy has people you could make into lifetime companions.");
 					next();
 					mes("[Carocc]");
-					mes("My friend <NAVI>[Hun]<INFO>izlude,122,207</INFO></NAVI> will be around the academy entrance.");
+					mesf("My friend %s will be around the academy entrance.", mesnavigation("[Hun]", "izlude", 122, 207));
 					mes("If you don't know the way I'll point it out to you again.");
 					viewpoint 1, 122, 207, 1, 0x4d4dff;
 					next();
@@ -961,7 +961,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 							next();
 							mes("[Hun]");
 							mes("If you follow this road up to north, you can see");
-							mes("<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.");
+							mesf("%s.", mesnavigation("[the Academy building]", "iz_ac01", 100, 39));
 							mes("Anybody can enroll, so take advantage of it.");
 							next();
 							emotion(e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN));
@@ -980,7 +980,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 							mes("[Hun]");
 							mes("There's no requirement or payment to enroll so it would be a great help to you.");
 							mes("When you go through this way to the north, you'll find");
-							mes("<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.");
+							mesf("%s.", mesnavigation("[the academy building]", "iz_ac01", 100, 39));
 							next();
 							mes("[Hun]");
 							mes("If there are more adventurers like you, the future will be brighter.");
@@ -1002,7 +1002,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 							next();
 							mes("[Hun]");
 							mes("When you go through this way to the north, you'll find");
-							mes("<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.");
+							mesf("%s.", mesnavigation("[the academy building]", "iz_ac01", 100, 39));
 							mes("What is well, is well- isn't it?");
 							next();
 							emotion(e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN));
@@ -1037,7 +1037,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 						next();
 						mes("[Hun]");
 						mes("If you follow this road up to north, you can see");
-						mes("<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.");
+						mesf("%s.", mesnavigation("[the Academy building]", "iz_ac01", 100, 39));
 						mes("Anybody can enroll, so take advantage of it.");
 						next();
 						emotion(e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN));
@@ -1056,7 +1056,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 						mes("[Hun]");
 						mes("There's no requirement or payment to enroll so it would be a great help to you.");
 						mes("When you go through this way to the north, you'll find");
-						mes("<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.");
+						mesf("%s.", mesnavigation("[the academy building]", "iz_ac01", 100, 39));
 						next();
 						mes("[Hun]");
 						mes("If there are more adventurers like you, the future will be brighter.");
@@ -1078,7 +1078,7 @@ izlude,122,207,3	script	Criatura Academy Staff#0	4_M_KHKYEL,3,3,{
 						next();
 						mes("[Hun]");
 						mes("When you go through this way to the north, you'll find");
-						mes("<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.");
+						mesf("%s.", mesnavigation("[the academy building]", "iz_ac01", 100, 39));
 						mes("What is well, is well- isn't it?");
 						next();
 						emotion(e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN));
@@ -1199,7 +1199,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 1:
 						mes("[Information Staff]");
 						mes("If you are the first time adventurer,");
-						mes("<NAVI>[Criatura Academy]<INFO>iz_ac01,100,39,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Criatura Academy]", "iz_ac01", 100, 39));
 						mes("can offer a lot of info and help.");
 						mes("Do you need additonal directions?");
 						viewpoint 1, 128, 260, 0, 0xFFD269;
@@ -1207,7 +1207,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 						continue;
 					case 2:
 						mes("[Information Staff]");
-						mes("Through the <NAVI>[Wharf]<INFO>izlude,197,205,</INFO></NAVI> in the north east,");
+						mesf("Through the %s in the north east,", mesnavigation("[Wharf]", "izlude", 197, 205));
 						mes("^8B4513Alberta^000000 or ^8B4513the Byalan Island^000000 can be visted.");
 						mes("you can go.");
 						next();
@@ -1220,7 +1220,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 						continue;
 					case 3:
 						mes("[Information Staff]");
-						mes("To the southeast, the <NAVI>[Airship]<INFO>izlude,206,75,</INFO></NAVI>");
+						mesf("To the southeast, the %s", mesnavigation("[Airship]", "izlude", 206, 75));
 						mes("will be connected with the Capital of the republic of Schwarzwald -^8B4513 Yuno^000000, and");
 						mes("The capital of the Arunapeltsdom -^8B4513 Rachel ^000000.");
 						mes("Do you need additional directions?");
@@ -1229,7 +1229,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 						continue;
 					case 4:
 						mes("[Information Staff]");
-						mes("The <NAVI>[Arena]<INFO>izlude,213,161,</INFO></NAVI> located in the east");
+						mesf("The %s located in the east", mesnavigation("[Arena]", "izlude", 213, 161));
 						mes("is for testing your battle ability.");
 						mes("It's an excellent place.");
 						mes("I will mark the location on the mini map.");
@@ -1240,7 +1240,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 5:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Shop]<INFO>izlude,110,182,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Shop]", "izlude", 110, 182));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 108, 179, 4, 0xFFAAFF;
@@ -1248,7 +1248,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 						continue;
 					case 6:
 						mes("[Information Staff]");
-						mes("<NAVI>[Swordman guild]<INFO>izlude,51,172,</INFO></NAVI> is the place to manage the job transfer to a swordman.");
+						mesf("%s is the place to manage the job transfer to a swordman.", mesnavigation("[Swordman guild]", "izlude", 51, 172));
 						mes("I will mark the location of the swordman guild on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 52, 172, 5, 0xFFDA70;
@@ -1257,7 +1257,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 7:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Enchant Association]<INFO>izlude,97,125,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Enchant Association]", "izlude", 97, 125));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 97, 125, 6, 0xFFDA70;
@@ -1266,7 +1266,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 8:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Blacksmith's Workshop]<INFO>izlude,153,126,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Blacksmith's Workshop]", "izlude", 153, 126));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 153, 126, 7, 0xFFAAFF;
@@ -1284,7 +1284,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 1:
 						mes("[Information Staff]");
 						mes("For now, I will mark the location of the");
-						mes("<NAVI>[Eden Group Teleporter]<INFO>izlude,131,148,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Eden Group Teleporter]", "izlude", 131, 148));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 131, 148, 8, 0xFF0A82;
@@ -1293,7 +1293,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 2:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Kafra Employee]<INFO>izlude,128,148,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Kafra Employee]", "izlude", 128, 148));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 128, 148, 9, 0xFFFF54;
@@ -1302,7 +1302,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 3:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Mesmerizer]<INFO>izlude,124,127,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Mesmerizer]", "izlude", 124, 127));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 125, 127, 10, 0xFF0064;
@@ -1311,7 +1311,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 4:
 						mes("[Information Staff]");
 						mes("If you want to visit ^8B4513Jawaii^000000 - the resort place for a couple,");
-						mes("talk to the <NAVI>[Wedding Secretary]<INFO>izlude,180,224,</INFO></NAVI>.");
+						mesf("talk to the %s.", mesnavigation("[Wedding Secretary]", "izlude", 180, 224));
 						mes("Just ask the question about it.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 180, 224, 11, 0xFFFF00;
@@ -1320,7 +1320,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 5:
 						mes("[Information Staff]");
 						mes("If you need to know about the Mercenary Guild, go west and speak to the");
-						mes("<NAVI>[Mercenary Guild Official]<INFO>izlude,47,170,</INFO></NAVI>.");
+						mesf("%s.", mesnavigation("[Mercenary Guild Official]", "izlude", 47, 170));
 						mes("Do you need additional directions?");
 						viewpoint 1, 47, 170, 12, 0xFFDA70;
 						next();
@@ -1328,7 +1328,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 6:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Taming Merchant]<INFO>izlude,118,163,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Taming Merchant]", "izlude", 118, 163));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 118, 163, 13, 0xFF0064;
@@ -1466,7 +1466,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 1:
 						mes("[Information Staff]");
 						mes("If you are the first time adventurer,");
-						mes("<NAVI>[Criatura Academy]<INFO>iz_ac01,100,39,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Criatura Academy]", "iz_ac01", 100, 39));
 						mes("can offer a lot of info and help.");
 						mes("Do you need additonal directions?");
 						viewpoint 1, 128, 260, 0, 0xFFD269;
@@ -1474,7 +1474,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 						continue;
 					case 2:
 						mes("[Information Staff]");
-						mes("Through the <NAVI>[Wharf]<INFO>izlude,197,205,</INFO></NAVI> in the north east,");
+						mesf("Through the %s in the north east,", mesnavigation("[Wharf]", "izlude", 197, 205));
 						mes("^8B4513Alberta^000000 or ^8B4513the Byalan Island^000000 can be visted.");
 						mes("you can go.");
 						next();
@@ -1487,7 +1487,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 						continue;
 					case 3:
 						mes("[Information Staff]");
-						mes("To the southeast, the <NAVI>[Airship]<INFO>izlude,206,75,</INFO></NAVI>");
+						mesf("To the southeast, the %s", mesnavigation("[Airship]", "izlude", 206, 75));
 						mes("will be connected with the Capital of the republic of Schwarzwald -^8B4513 Yuno^000000, and");
 						mes("The capital of the Arunapeltsdom -^8B4513 Rachel ^000000.");
 						mes("Do you need additional directions?");
@@ -1496,7 +1496,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 						continue;
 					case 4:
 						mes("[Information Staff]");
-						mes("The <NAVI>[Arena]<INFO>izlude,213,161,</INFO></NAVI> located in the east");
+						mesf("The %s located in the east", mesnavigation("[Arena]", "izlude", 213, 161));
 						mes("is for testing your battle ability.");
 						mes("It's an excellent place.");
 						mes("I will mark the location on the mini map.");
@@ -1507,7 +1507,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 5:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Shop]<INFO>izlude,110,182,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Shop]", "izlude", 110, 182));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 108, 179, 4, 0xFFAAFF;
@@ -1515,7 +1515,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 						continue;
 					case 6:
 						mes("[Information Staff]");
-						mes("<NAVI>[Swordman guild]<INFO>izlude,51,172,</INFO></NAVI> is the place to manage the job transfer to a swordman.");
+						mesf("%s is the place to manage the job transfer to a swordman.", mesnavigation("[Swordman guild]", "izlude", 51, 172));
 						mes("I will mark the location of the swordman guild on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 52, 172, 5, 0xFFDA70;
@@ -1524,7 +1524,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 7:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Enchant Association]<INFO>izlude,97,125,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Enchant Association]", "izlude", 97, 125));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 97, 125, 6, 0xFFDA70;
@@ -1533,7 +1533,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 8:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Blacksmith's Workshop]<INFO>izlude,153,126,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Blacksmith's Workshop]", "izlude", 153, 126));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 153, 126, 7, 0xFFAAFF;
@@ -1551,7 +1551,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 1:
 						mes("[Information Staff]");
 						mes("For now, I will mark the location of the");
-						mes("<NAVI>[Eden Group Teleporter]<INFO>izlude,131,148,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Eden Group Teleporter]", "izlude", 131, 148));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 131, 148, 8, 0xFF0A82;
@@ -1560,7 +1560,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 2:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Kafra Employee]<INFO>izlude,128,148,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Kafra Employee]", "izlude", 128, 148));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 128, 148, 9, 0xFFFF54;
@@ -1569,7 +1569,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 3:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Mesmerizer]<INFO>izlude,124,127,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Mesmerizer]", "izlude", 124, 127));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 125, 127, 10, 0xFF0064;
@@ -1578,7 +1578,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 4:
 						mes("[Information Staff]");
 						mes("If you want to visit ^8B4513Jawaii^000000 - the resort place for a couple,");
-						mes("talk to the <NAVI>[Wedding Secretary]<INFO>izlude,180,224,</INFO></NAVI>.");
+						mesf("talk to the %s.", mesnavigation("[Wedding Secretary]", "izlude", 180, 224));
 						mes("Just ask the question about it.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 180, 224, 11, 0xFFFF00;
@@ -1587,7 +1587,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 5:
 						mes("[Information Staff]");
 						mes("If you need to know about the Mercenary Guild, go west and speak to the");
-						mes("<NAVI>[Mercenary Guild Official]<INFO>izlude,47,170,</INFO></NAVI>.");
+						mesf("%s.", mesnavigation("[Mercenary Guild Official]", "izlude", 47, 170));
 						mes("Do you need additional directions?");
 						viewpoint 1, 47, 170, 12, 0xFFDA70;
 						next();
@@ -1595,7 +1595,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 					case 6:
 						mes("[Information Staff]");
 						mes("I will mark the location of the");
-						mes("<NAVI>[Taming Merchant]<INFO>izlude,118,163,</INFO></NAVI>");
+						mesf("%s", mesnavigation("[Taming Merchant]", "izlude", 118, 163));
 						mes("on the mini map.");
 						mes("Do you need additional directions?");
 						viewpoint 1, 118, 163, 13, 0xFF0064;
@@ -2726,13 +2726,13 @@ iz_ac01,100,39,5	script	Academy Receptionist#1	4_F_01,{
 					mes("[Receptionist]");
 					mes("Left-Click your mouse on the name of the trainer you are looking for and I will give guide you to them.");
 					next();
-					mes("<NAVI>[Therapist]<INFO>iz_ac01,59,43</INFO></NAVI>, status recovery trainer");
-					mes("<NAVI>[Subino]<INFO>iz_ac01,59,83</INFO></NAVI>, battle trainer");
-					mes("<NAVI>[Mainz]<INFO>iz_ac01,134,47</INFO></NAVI>, abnormal stats trainer");
-					mes("<NAVI>[Dakuwazu]<INFO>iz_ac01,147,47</INFO></NAVI>, Cooking Trainer.");
-					mes("<NAVI>[Han]<INFO>izlude,153,126</INFO></NAVI>, Refining Trainer.");
-					mes("<NAVI>[Mounds]<INFO>izlude,96,125</INFO></NAVI> Enchanting Trainer.");
-					mes("<NAVI>[Cream Puff]<INFO>iz_ac02,143,55</INFO></NAVI>, Class Aptitude Test.");
+					mesf("%s, status recovery trainer", mesnavigation("[Therapist]", "iz_ac01", 59, 43));
+					mesf("%s, battle trainer", mesnavigation("[Subino]", "iz_ac01", 59, 83));
+					mesf("%s, abnormal stats trainer", mesnavigation("[Mainz]", "iz_ac01", 134, 47));
+					mesf("%s, Cooking Trainer.", mesnavigation("[Dakuwazu]", "iz_ac01", 147, 47));
+					mesf("%s, Refining Trainer.", mesnavigation("[Han]", "izlude", 153, 126));
+					mesf("%s Enchanting Trainer.", mesnavigation("[Mounds]", "izlude", 96, 125));
+					mesf("%s, Class Aptitude Test.", mesnavigation("[Cream Puff]", "iz_ac02", 143, 55));
 					next();
 					mes("[Receptionist]");
 					mes("Is that helpful?");
@@ -2756,15 +2756,15 @@ iz_ac01,100,39,5	script	Academy Receptionist#1	4_F_01,{
 					mes("[Receptionist]");
 					mes("Left-Click your mouse on the name of the trainer you are looking for and I will give guide you to them.");
 					next();
-					mes("Swordman Instructor <NAVI>[Adric]<INFO>iz_ac02,62,51</INFO></NAVI>");
-					mes("Acolyte Instructor <NAVI>[Alice]<INFO>iz_ac02,156,169</INFO></NAVI>");
-					mes("Archer Instructor <NAVI>[Marlbron]<INFO>iz_ac02,65,109</INFO></NAVI>");
-					mes("Mage Instructor <NAVI>[Chuck]<INFO>iz_ac02,148,110</INFO></NAVI> ");
-					mes("Thief Instructor <NAVI>[Mayssel]<INFO>iz_ac02,52,136</INFO></NAVI>");
-					mes("Merchant Instructor <NAVI>[Salim]<INFO>iz_ac02,50,169</INFO></NAVI>");
-					mes("Ninja Instructor <NAVI>[Ninja Guide]<INFO>iz_ac02,140,139</INFO></NAVI>");
-					mes("Gunslinger Instructor<NAVI>[Lusa]<INFO>iz_ac02,142,85</INFO></NAVI>");
-					mes("Taekwon Instructor <NAVI>[Arang]<INFO>iz_ac02,70,85</INFO></NAVI>");
+					mesf("Swordman Instructor %s", mesnavigation("[Adric]", "iz_ac02", 62, 51));
+					mesf("Acolyte Instructor %s", mesnavigation("[Alice]", "iz_ac02", 156, 169));
+					mesf("Archer Instructor %s", mesnavigation("[Marlbron]", "iz_ac02", 65, 109));
+					mesf("Mage Instructor %s", mesnavigation("[Chuck]", "iz_ac02", 148, 110));
+					mesf("Thief Instructor %s", mesnavigation("[Mayssel]", "iz_ac02", 52, 136));
+					mesf("Merchant Instructor %s", mesnavigation("[Salim]", "iz_ac02", 50, 169));
+					mesf("Ninja Instructor %s", mesnavigation("[Ninja Guide]", "iz_ac02", 140, 139));
+					mesf("Gunslinger Instructor%s", mesnavigation("[Lusa]", "iz_ac02", 142, 85));
+					mesf("Taekwon Instructor %s", mesnavigation("[Arang]", "iz_ac02", 70, 85));
 					next();
 					mes("[Receptionist]");
 					mes("Is that helpful?");
@@ -7437,7 +7437,7 @@ iz_ac02,142,85,6	script	Lusa#ac	4_F_GUNSLINGER,{
 			}
 			next();
 			mes("[Lusa]");
-			mes("If you need the battle training, visit <NAVI>[Subino]<INFO>iz_ac01,59,83</INFO></NAVI>.");
+			mesf("If you need the battle training, visit %s.", mesnavigation("[Subino]", "iz_ac01", 59, 83));
 			close2();
 			//ConsumespecialItem Inspector_Certificate_
 			cutin("", 255);
@@ -8743,7 +8743,7 @@ iz_ac02,65,109,5	script	Archer Teacher#ac	4_M_ARCHER,{
 						next();
 						mes("[Marlbron]");
 						mes("But he may train you with a lot of useful hunting skills for you.");
-						mes("<NAVI>^4D4DFF[Battle Trainer Subino]^000000<INFO>iz_ac01,59,83,</INFO></NAVI>");
+						mesf("%s", mesnavigation("^4D4DFF[Battle Trainer Subino]^000000", "iz_ac01", 59, 83));
 						mes("You may visit him.");
 						next();
 						if (questprogress(14158) != 2) {
@@ -8833,7 +8833,7 @@ iz_ac02,65,109,5	script	Archer Teacher#ac	4_M_ARCHER,{
 							mes("Are you coming back after more training?");
 							next();
 							mes("[Marlbron]");
-							mes("Visit <NAVI>^4D4DFF[Battle Trainer Subino]^000000<INFO>iz_ac01,59,83,</INFO></NAVI>");
+							mesf("Visit %s", mesnavigation("^4D4DFF[Battle Trainer Subino]^000000", "iz_ac01", 59, 83));
 							mes("at Armory on the 1st floor.");
 							close2();
 							cutin("", 255);
@@ -9583,7 +9583,7 @@ gef_fild07,90,208,6	script	#acmageguide	HIDDEN_NPC,7,7,{
 			next();
 			mes("[Magician's Guild Guide]");
 			mes("Once there,");
-			mes("You should find our <NAVI>^4D4DFF[Magician's Guild Guide]^000000<INFO>geffen,43,123,</INFO></NAVI>.");
+			mesf("You should find our %s.", mesnavigation("^4D4DFF[Magician's Guild Guide]^000000", "geffen", 43, 123));
 			mes("Speak to him, he will continue to guide you to the Magician's Guild!");
 			nov_3_magician = 2;
 			completequest(9264);
@@ -9603,7 +9603,7 @@ gef_fild07,89,208,6	script	Magician's Guild Guide#1	2_F_MAGICMASTER,{
 		next();
 		mes("[Magician's Guild Guide]");
 		mes("Once there,");
-		mes("You should find our <NAVI>^4D4DFF[Magician's Guild Guide]^000000<INFO>geffen,43,123,</INFO></NAVI>.");
+		mesf("You should find our %s.", mesnavigation("^4D4DFF[Magician's Guild Guide]^000000", "geffen", 43, 123));
 		mes("Speak to him, he will continue to guide you to the Magician's Guild!");
 	} else {
 		mes("[Magician's Guild Guide]");
@@ -9635,7 +9635,7 @@ geffen,43,123,6	script	Magician's Guild Guide#2	2_F_MAGICMASTER,{
 		next();
 		mes("[Magician's Guild Guide]");
 		mes("Just go inside, and upstairs a little to find the");
-		mes("<NAVI>^4D4DFF[Mage Guildsman]^000000<INFO>geffen_in,164,124,</INFO></NAVI>");
+		mesf("%s", mesnavigation("^4D4DFF[Mage Guildsman]^000000", "geffen_in", 164, 124));
 		mes("From there, he will assist you in becoming a Mage.");
 		completequest(9265);
 		erasequest(9265);
@@ -9647,7 +9647,7 @@ geffen,43,123,6	script	Magician's Guild Guide#2	2_F_MAGICMASTER,{
 		next();
 		mes("[Magician's Guild Guide]");
 		mes("Just go inside, and upstairs a little to find the");
-		mes("<NAVI>^4D4DFF[Mage Guildsman]^000000<INFO>geffen_in,164,124,</INFO></NAVI>");
+		mesf("%s", mesnavigation("^4D4DFF[Mage Guildsman]^000000", "geffen_in", 164, 124));
 		mes("From there, he will assist you in becoming a Mage.");
 	} else {
 		mes("[Magician's Guild Guide]");
@@ -9718,7 +9718,7 @@ iz_ac02,50,169,3	script	Salim Hamid#ac	1_M_MERCHANT,{
 		next();
 		mes("[Salim Hamid]");
 		mes("Do not go elsewhere, immediately enter the town.");
-		mes("Find the <NAVI>[Forge]<INFO>alberta_in,75 48</INFO></NAVI>.");
+		mesf("Find the %s.", mesnavigation("[Forge]", "alberta_in", 75, 48));
 		next();
 		if (select("Not yet ready.", "I'm Ready!") == 1) {
 			mes("[Salim Hamid]");
@@ -9742,7 +9742,7 @@ iz_ac02,50,169,3	script	Salim Hamid#ac	1_M_MERCHANT,{
 		next();
 		mes("[Salim Hamid]");
 		mes("When you want to test the other battle skills in the Merchant's Manual,");
-		mes("visit <NAVI>[Battle Trainer Subino]<INFO>iz_ac01,59,83</INFO></NAVI> on the 1st floor.");
+		mesf("visit %s on the 1st floor.", mesnavigation("[Battle Trainer Subino]", "iz_ac01", 59, 83));
 		next();
 		mes("[Salim Hamid]");
 		mes("You can fully experience the battle related practice through him.");
@@ -10436,7 +10436,7 @@ iz_ac02,52,136,3	script	Guest Lecturer Mayssel#0	4_F_MAYSEL,{
 					mes("If you want to use the skill like double attack, visit ^4d4dffMr. Subino on the 1st floor^000000.");
 					next();
 					mes("[Mayssel]");
-					mes("<NAVI>[Battle Trainer Subino]<INFO>iz_ac01,59,83</INFO></NAVI> will give you several battle missions.");
+					mesf("%s will give you several battle missions.", mesnavigation("[Battle Trainer Subino]", "iz_ac01", 59, 83));
 					next();
 					mes("[Mayssel]");
 					mes("I hope you experience other skills with battle Quests.");
@@ -10507,7 +10507,7 @@ iz_ac02,52,136,3	script	Guest Lecturer Mayssel#0	4_F_MAYSEL,{
 				cutin("gc_mayssel01", 1);
 				mes("[Mayssel]");
 				mes("What are you curious about?");
-				mes("If you want to know about battle, visit <NAVI>[Battle Trainer Subino]<INFO>iz_ac01_c,59,83</INFO></NAVI>.");
+				mesf("If you want to know about battle, visit %s.", mesnavigation("[Battle Trainer Subino]", "iz_ac01_c", 59, 83));
 				next();
 				switch(select("Change job to Thief.", "Thief Stat Explanation", "Thief Skill Explanation", "Not curious about it.")) {
 				case 1:

From 524df5d5cda6fb8897942170beee640761e3d630 Mon Sep 17 00:00:00 2001
From: "Guilherme G. Menaldo" <guilherme.menaldo@outlook.com>
Date: Sat, 8 Jun 2024 01:50:30 -0300
Subject: [PATCH 12/14] Add mesurl script command

---
 doc/script_commands.txt                       | 27 ++++++++++++++
 npc/dev/test.txt                              | 32 +++++++++++++++++
 src/map/clif.c                                | 35 +++++++++++++++++++
 src/map/clif.h                                |  1 +
 src/map/script.c                              | 24 +++++++++++++
 src/plugins/HPMHooking/HPMHooking.Defs.inc    |  2 ++
 .../HPMHooking_map.HPMHooksCore.inc           |  4 +++
 .../HPMHooking_map.HookingPoints.inc          |  1 +
 .../HPMHooking/HPMHooking_map.Hooks.inc       | 26 ++++++++++++++
 9 files changed, 152 insertions(+)

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index acd5bddd0..388af6085 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -2703,6 +2703,33 @@ Parameters:
 - label: (string, optional, defaults to <monster_id> name)
 	The visible and clickable text. (example: "Target monster")
 
+---------------------------------------
+
+*mesurl("<label>", "url"{, <width>, <height>})
+
+Generates and returns a <URL> tag. When presented in certain places (like with "mes" and "mesf"),
+this will display a clickable text (<label>) which when clicked, opens <url> in the in-game browser
+or default browser (depending on client version).
+
+If the current client doesn't support this feature, returns a basic string in the following format:
+	<label> (<url>)
+
+Parameters:
+- label: (string, required)
+	The visible and clickable text. (example: "My site")
+
+- url: (string, required)
+	The site that will open when <label> is clicked
+
+- width: (int, optional, defaults to -1)
+	The width of the browser window (when using in-game browser).
+	When not provided (or -1), width/height is not specified.
+
+- height: (int, optional, defaults to -1)
+	The height of the browser window (when using in-game browser).
+	When not provided (or -1), width/height is not specified.
+
+
 ---------------------------------------
 //=====================================
 1 - End of Basic-Related Commands
diff --git a/npc/dev/test.txt b/npc/dev/test.txt
index 93db22f62..edfe5cea0 100644
--- a/npc/dev/test.txt
+++ b/npc/dev/test.txt
@@ -326,6 +326,35 @@ function	script	F_TestMesMobSpawn_WithLabel	{
 	return .@pass;
 }
 
+function	script	F_TestMesUrl_Basic	{
+	.@str$ = mesurl("Herc", "https://herc.ws/");
+
+	.@pass = false;
+	if (PACKETVER < 20111010) {
+		.@pass = (.@str$ == "Herc (URL: https://herc.ws/)");
+	} else {
+		.@pass = (.@str$ == "<URL>Herc<INFO>https://herc.ws/</INFO></URL>");
+	}
+
+	return .@pass;
+}
+
+function	script	F_TestMesUrl_Dimensions	{
+	.@str$ = mesurl("Herc", "https://herc.ws/", 800, 600);
+
+	.@pass = false;
+	if (PACKETVER < 20111010) {
+		.@pass = (.@str$ == "Herc (URL: https://herc.ws/)");
+	} else if (PACKETVER < 20181024) {
+		.@pass = (.@str$ == "<URL>Herc<INFO>https://herc.ws/,800,600</INFO></URL>");
+	} else {
+		// dimensions are no longer supported since it now uses users' default browser.
+		.@pass = (.@str$ == "<URL>Herc<INFO>https://herc.ws/</INFO></URL>");
+	}
+
+	return .@pass;
+}
+
 function	script	HerculesSelfTestHelper	{
 	if (.once > 0)
 		return .errors;
@@ -1050,6 +1079,9 @@ function	script	HerculesSelfTestHelper	{
 	callsub(OnCheck, "mesmobspawn: basic usage", F_TestMesMobSpawn_Basic(), true);
 	callsub(OnCheck, "mesmobspawn: with label", F_TestMesMobSpawn_WithLabel(), true);
 
+	callsub(OnCheck, "mesurl: basic usage", F_TestMesUrl_Basic(), true);
+	callsub(OnCheck, "mesurl: with dimensions", F_TestMesUrl_Dimensions(), true);
+
 	if (.errors) {
 		consolemes(CONSOLEMES_DEBUG, "Script engine self-test   [ \033[0;31mFAILED\033[0m ]");
 		consolemes(CONSOLEMES_DEBUG, "**** The test was completed with " + .errors + " errors. ****");
diff --git a/src/map/clif.c b/src/map/clif.c
index 6d917ea7d..2e3a620d7 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -26173,6 +26173,40 @@ static void clif_format_navigation(StringBuf *buf, const char *label, const char
 #endif
 }
 
+/**
+ * Creates a "link" tag (<URL>) string into buf based on the given parameters.
+ * The resulting format and feature support is client-specific.
+ *
+ * Clicking the text generated by this will either open the URL in in-game browser
+ * or in default browser (depending on client version)
+ *
+ * @param buf buffer where the string will be written to
+ * @param label visible label
+ * @param url URL to the site which should be open
+ * @param width browser window width (for in-game browser only)
+ * @param height browser window height (for in-game browser only
+ */
+static void clif_format_url(StringBuf *buf, const char *label, const char *url, int width, int height)
+{
+	nullpo_retv(buf);
+	nullpo_retv(label);
+	nullpo_retv(url);
+
+#if PACKETVER >= 20181024
+	// Executes a ShellExecuteA (Windows API) with "open" and where "url" as file. Opens the default browser
+	StrBuf->Printf(buf, "<URL>%s<INFO>%s</INFO></URL>", label, url);
+#elif PACKETVER >= 20111010
+	// Opens the in-game browser in the given URL and dimensions
+	if (width > 0 && height > 0)
+		StrBuf->Printf(buf, "<URL>%s<INFO>%s,%d,%d</INFO></URL>", label, url, width, height);
+	else
+		StrBuf->Printf(buf, "<URL>%s<INFO>%s</INFO></URL>", label, url);
+#else
+	// Unsupported feature, fallback to a basic text
+	StrBuf->Printf(buf, "%s (URL: %s)", label, url);
+#endif
+}
+
 /*==========================================
  * Main client packet processing function
  *------------------------------------------*/
@@ -27546,4 +27580,5 @@ void clif_defaults(void)
 
 	clif->format_itemlink = clif_format_itemlink;
 	clif->format_navigation = clif_format_navigation;
+	clif->format_url = clif_format_url;
 }
diff --git a/src/map/clif.h b/src/map/clif.h
index 2139ddaf5..e068fb04e 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -966,6 +966,7 @@ struct clif_interface {
 	/* client-specific logic */
 	void (*format_itemlink) (struct StringBuf *buf, const struct item *it);
 	void (*format_navigation) (struct StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
+	void (*format_url) (struct StringBuf *buf, const char *label, const char *url, int width, int height);
 	/* auth */
 	void (*authok) (struct map_session_data *sd);
 	void (*auth_error) (int fd, int errorCode);
diff --git a/src/map/script.c b/src/map/script.c
index 399787e04..cff94015e 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -28520,6 +28520,28 @@ static BUILDIN(setgoldpcmode)
 	return true;
 }
 
+/**
+ * create a <URL> tag
+ *
+ * mesurl("<label>", "url"{, <width>, <height>})
+ */
+static BUILDIN(mesurl)
+{
+	const char *label = script_getstr(st, 2);
+	const char *url = script_getstr(st, 3);
+	int width = script_hasdata(st, 4) ? script_getnum(st, 4) : -1;
+	int height = script_hasdata(st, 5) ? script_getnum(st, 5) : -1;
+
+	StringBuf buf;
+	StrBuf->Init(&buf);
+
+	clif->format_url(&buf, label, url, width, height);
+	script_pushstrcopy(st, StrBuf->Value(&buf));
+
+	StrBuf->Destroy(&buf);
+	return true;
+}
+
 /**
  * Adds a built-in script function.
  *
@@ -29396,6 +29418,8 @@ static void script_parse_builtin(void)
 
 		BUILDIN_DEF(dynamicnpccreateresult, "i"),
 		BUILDIN_DEF(setgoldpcmode, "i?"),
+
+		BUILDIN_DEF(mesurl, "ss??"),
 	};
 	int i, len = ARRAYLENGTH(BUILDIN);
 	RECREATE(script->buildin, char *, script->buildin_count + len); // Pre-alloc to speed up
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 5e3cad6b8..04859652e 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1338,6 +1338,8 @@ typedef void (*HPMHOOK_pre_clif_format_itemlink) (struct StringBuf **buf, const
 typedef void (*HPMHOOK_post_clif_format_itemlink) (struct StringBuf *buf, const struct item *it);
 typedef void (*HPMHOOK_pre_clif_format_navigation) (struct StringBuf **buf, const char **label, const char **mapname, int *x, int *y, enum navigation_mode *mode, enum navigation_service *services_flag, bool *show_window, int *monster_id);
 typedef void (*HPMHOOK_post_clif_format_navigation) (struct StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
+typedef void (*HPMHOOK_pre_clif_format_url) (struct StringBuf **buf, const char **label, const char **url, int *width, int *height);
+typedef void (*HPMHOOK_post_clif_format_url) (struct StringBuf *buf, const char *label, const char *url, int width, int height);
 typedef void (*HPMHOOK_pre_clif_authok) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_authok) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_auth_error) (int *fd, int *errorCode);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 887a9edc4..9bef27b4c 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -696,6 +696,8 @@ struct {
 	struct HPMHookPoint *HP_clif_format_itemlink_post;
 	struct HPMHookPoint *HP_clif_format_navigation_pre;
 	struct HPMHookPoint *HP_clif_format_navigation_post;
+	struct HPMHookPoint *HP_clif_format_url_pre;
+	struct HPMHookPoint *HP_clif_format_url_post;
 	struct HPMHookPoint *HP_clif_authok_pre;
 	struct HPMHookPoint *HP_clif_authok_post;
 	struct HPMHookPoint *HP_clif_auth_error_pre;
@@ -8277,6 +8279,8 @@ struct {
 	int HP_clif_format_itemlink_post;
 	int HP_clif_format_navigation_pre;
 	int HP_clif_format_navigation_post;
+	int HP_clif_format_url_pre;
+	int HP_clif_format_url_post;
 	int HP_clif_authok_pre;
 	int HP_clif_authok_post;
 	int HP_clif_auth_error_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 54abd9a07..d00a42651 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -373,6 +373,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->decrypt_cmd, HP_clif_decrypt_cmd) },
 	{ HP_POP(clif->format_itemlink, HP_clif_format_itemlink) },
 	{ HP_POP(clif->format_navigation, HP_clif_format_navigation) },
+	{ HP_POP(clif->format_url, HP_clif_format_url) },
 	{ HP_POP(clif->authok, HP_clif_authok) },
 	{ HP_POP(clif->auth_error, HP_clif_auth_error) },
 	{ HP_POP(clif->authrefuse, HP_clif_authrefuse) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index d52e22e8b..8e4d25059 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -9059,6 +9059,32 @@ void HP_clif_format_navigation(struct StringBuf *buf, const char *label, const c
 	}
 	return;
 }
+void HP_clif_format_url(struct StringBuf *buf, const char *label, const char *url, int width, int height) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_format_url_pre > 0) {
+		void (*preHookFunc) (struct StringBuf **buf, const char **label, const char **url, int *width, int *height);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_format_url_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_format_url_pre[hIndex].func;
+			preHookFunc(&buf, &label, &url, &width, &height);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.format_url(buf, label, url, width, height);
+	}
+	if (HPMHooks.count.HP_clif_format_url_post > 0) {
+		void (*postHookFunc) (struct StringBuf *buf, const char *label, const char *url, int width, int height);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_format_url_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_format_url_post[hIndex].func;
+			postHookFunc(buf, label, url, width, height);
+		}
+	}
+	return;
+}
 void HP_clif_authok(struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_authok_pre > 0) {

From 2ca5601f3ee04bf6dcd07dad6a3dbc41612042f9 Mon Sep 17 00:00:00 2001
From: "Guilherme G. Menaldo" <guilherme.menaldo@outlook.com>
Date: Sat, 8 Jun 2024 10:43:11 -0300
Subject: [PATCH 13/14] Add mestipbox script command

---
 doc/script_commands.txt                       | 16 +++++++++++
 npc/dev/test.txt                              | 15 ++++++++++
 src/map/clif.c                                | 28 +++++++++++++++++++
 src/map/clif.h                                |  1 +
 src/map/script.c                              | 21 ++++++++++++++
 src/plugins/HPMHooking/HPMHooking.Defs.inc    |  2 ++
 .../HPMHooking_map.HPMHooksCore.inc           |  4 +++
 .../HPMHooking_map.HookingPoints.inc          |  1 +
 .../HPMHooking/HPMHooking_map.Hooks.inc       | 26 +++++++++++++++++
 9 files changed, 114 insertions(+)

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 388af6085..c0b5b58b5 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -2729,6 +2729,22 @@ Parameters:
 	The height of the browser window (when using in-game browser).
 	When not provided (or -1), width/height is not specified.
 
+---------------------------------------
+
+*mestipbox("<label>", <tip_id>)
+
+Generates and returns a <TIPBOX> tag. When presented in certain places (like with "mes" and "mesf"),
+this will display a clickable text (<label>) which when clicked, opens the TipBox UI with the given <tip_id>.
+
+If the current client doesn't support this feature, returns a simple string with "<label>"
+
+Parameters:
+- label: (string, required)
+	The visible and clickable text. (example: "Super Tip")
+
+- tip_id: (int, required)
+	The tip ID (as set in TipBox lua file)
+	If 0, it shows a random tipbox
 
 ---------------------------------------
 //=====================================
diff --git a/npc/dev/test.txt b/npc/dev/test.txt
index edfe5cea0..ed2f41a1b 100644
--- a/npc/dev/test.txt
+++ b/npc/dev/test.txt
@@ -355,6 +355,19 @@ function	script	F_TestMesUrl_Dimensions	{
 	return .@pass;
 }
 
+function	script	F_TestMesTipBox	{
+	.@str$ = mestipbox("Some tip", 1);
+
+	.@pass = false;
+	if (PACKETVER < 20170712) {
+		.@pass = (.@str$ == "Some tip");
+	} else {
+		.@pass = (.@str$ == "<TIPBOX>Some tip<INFO>1</INFO></TIPBOX>");
+	}
+
+	return .@pass;
+}
+
 function	script	HerculesSelfTestHelper	{
 	if (.once > 0)
 		return .errors;
@@ -1082,6 +1095,8 @@ function	script	HerculesSelfTestHelper	{
 	callsub(OnCheck, "mesurl: basic usage", F_TestMesUrl_Basic(), true);
 	callsub(OnCheck, "mesurl: with dimensions", F_TestMesUrl_Dimensions(), true);
 
+	callsub(OnCheck, "mestipbox", F_TestMesTipBox(), true);
+
 	if (.errors) {
 		consolemes(CONSOLEMES_DEBUG, "Script engine self-test   [ \033[0;31mFAILED\033[0m ]");
 		consolemes(CONSOLEMES_DEBUG, "**** The test was completed with " + .errors + " errors. ****");
diff --git a/src/map/clif.c b/src/map/clif.c
index 2e3a620d7..a84ddbe1c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -26207,6 +26207,33 @@ static void clif_format_url(StringBuf *buf, const char *label, const char *url,
 #endif
 }
 
+/**
+ * Creates a "tipbox" tag (<TIPBOX>) string into buf based on the given parameters.
+ * The resulting format and feature support is client-specific.
+ *
+ * Clicking the text generated by this will either open the TipBox with <tip_id> being shown
+ * or just return the label (if not supported)
+ *
+ * @param buf buffer where the string will be written to
+ * @param label visible label
+ * @param tip_id Tip ID
+ */
+static void clif_format_tipbox(StringBuf *buf, const char *label, int tip_id)
+{
+	nullpo_retv(buf);
+	nullpo_retv(label);
+
+// Not completely sure on the date. This is the date when TipBox system was implemented.
+#if PACKETVER >= 20170712
+	StrBuf->Printf(buf, "<TIPBOX>%s<INFO>%d</INFO></TIPBOX>", label, tip_id);
+#else
+	// Unsupported feature, fallback to a basic text
+	StrBuf->Printf(buf, "%s", label);
+#endif
+}
+
+
+
 /*==========================================
  * Main client packet processing function
  *------------------------------------------*/
@@ -27581,4 +27608,5 @@ void clif_defaults(void)
 	clif->format_itemlink = clif_format_itemlink;
 	clif->format_navigation = clif_format_navigation;
 	clif->format_url = clif_format_url;
+	clif->format_tipbox = clif_format_tipbox;
 }
diff --git a/src/map/clif.h b/src/map/clif.h
index e068fb04e..e10b3c3af 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -967,6 +967,7 @@ struct clif_interface {
 	void (*format_itemlink) (struct StringBuf *buf, const struct item *it);
 	void (*format_navigation) (struct StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
 	void (*format_url) (struct StringBuf *buf, const char *label, const char *url, int width, int height);
+	void (*format_tipbox) (struct StringBuf *buf, const char *label, int tip_id);
 	/* auth */
 	void (*authok) (struct map_session_data *sd);
 	void (*auth_error) (int fd, int errorCode);
diff --git a/src/map/script.c b/src/map/script.c
index cff94015e..f11e7d745 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -28542,6 +28542,26 @@ static BUILDIN(mesurl)
 	return true;
 }
 
+/**
+ * create a <TIPBOX> tag
+ *
+ * mestipbox("<label>", <tip_id>)
+ */
+static BUILDIN(mestipbox)
+{
+	const char *label = script_getstr(st, 2);
+	int tip_id = script_getnum(st, 3);
+
+	StringBuf buf;
+	StrBuf->Init(&buf);
+
+	clif->format_tipbox(&buf, label, tip_id);
+	script_pushstrcopy(st, StrBuf->Value(&buf));
+
+	StrBuf->Destroy(&buf);
+	return true;
+}
+
 /**
  * Adds a built-in script function.
  *
@@ -29420,6 +29440,7 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(setgoldpcmode, "i?"),
 
 		BUILDIN_DEF(mesurl, "ss??"),
+		BUILDIN_DEF(mestipbox, "si"),
 	};
 	int i, len = ARRAYLENGTH(BUILDIN);
 	RECREATE(script->buildin, char *, script->buildin_count + len); // Pre-alloc to speed up
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 04859652e..5245c3d6c 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1340,6 +1340,8 @@ typedef void (*HPMHOOK_pre_clif_format_navigation) (struct StringBuf **buf, cons
 typedef void (*HPMHOOK_post_clif_format_navigation) (struct StringBuf *buf, const char *label, const char *mapname, int x, int y, enum navigation_mode mode, enum navigation_service services_flag, bool show_window, int monster_id);
 typedef void (*HPMHOOK_pre_clif_format_url) (struct StringBuf **buf, const char **label, const char **url, int *width, int *height);
 typedef void (*HPMHOOK_post_clif_format_url) (struct StringBuf *buf, const char *label, const char *url, int width, int height);
+typedef void (*HPMHOOK_pre_clif_format_tipbox) (struct StringBuf **buf, const char **label, int *tip_id);
+typedef void (*HPMHOOK_post_clif_format_tipbox) (struct StringBuf *buf, const char *label, int tip_id);
 typedef void (*HPMHOOK_pre_clif_authok) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_authok) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_auth_error) (int *fd, int *errorCode);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 9bef27b4c..67a35edf5 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -698,6 +698,8 @@ struct {
 	struct HPMHookPoint *HP_clif_format_navigation_post;
 	struct HPMHookPoint *HP_clif_format_url_pre;
 	struct HPMHookPoint *HP_clif_format_url_post;
+	struct HPMHookPoint *HP_clif_format_tipbox_pre;
+	struct HPMHookPoint *HP_clif_format_tipbox_post;
 	struct HPMHookPoint *HP_clif_authok_pre;
 	struct HPMHookPoint *HP_clif_authok_post;
 	struct HPMHookPoint *HP_clif_auth_error_pre;
@@ -8281,6 +8283,8 @@ struct {
 	int HP_clif_format_navigation_post;
 	int HP_clif_format_url_pre;
 	int HP_clif_format_url_post;
+	int HP_clif_format_tipbox_pre;
+	int HP_clif_format_tipbox_post;
 	int HP_clif_authok_pre;
 	int HP_clif_authok_post;
 	int HP_clif_auth_error_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index d00a42651..1e9691b21 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -374,6 +374,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->format_itemlink, HP_clif_format_itemlink) },
 	{ HP_POP(clif->format_navigation, HP_clif_format_navigation) },
 	{ HP_POP(clif->format_url, HP_clif_format_url) },
+	{ HP_POP(clif->format_tipbox, HP_clif_format_tipbox) },
 	{ HP_POP(clif->authok, HP_clif_authok) },
 	{ HP_POP(clif->auth_error, HP_clif_auth_error) },
 	{ HP_POP(clif->authrefuse, HP_clif_authrefuse) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 8e4d25059..5889323c1 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -9085,6 +9085,32 @@ void HP_clif_format_url(struct StringBuf *buf, const char *label, const char *ur
 	}
 	return;
 }
+void HP_clif_format_tipbox(struct StringBuf *buf, const char *label, int tip_id) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_format_tipbox_pre > 0) {
+		void (*preHookFunc) (struct StringBuf **buf, const char **label, int *tip_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_format_tipbox_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_format_tipbox_pre[hIndex].func;
+			preHookFunc(&buf, &label, &tip_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.format_tipbox(buf, label, tip_id);
+	}
+	if (HPMHooks.count.HP_clif_format_tipbox_post > 0) {
+		void (*postHookFunc) (struct StringBuf *buf, const char *label, int tip_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_format_tipbox_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_format_tipbox_post[hIndex].func;
+			postHookFunc(buf, label, tip_id);
+		}
+	}
+	return;
+}
 void HP_clif_authok(struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_authok_pre > 0) {

From 5f7eaa48aff82f995e4979d537601d23d8720740 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sun, 30 Jun 2024 23:10:16 +0000
Subject: [PATCH 14/14] Release v2024.06

Signed-off-by: Haru <haru@dotalux.com>
---
 CHANGELOG.md            | 20 ++++++++++++++++++++
 doc/constants_pre-re.md |  2 +-
 doc/constants_re.md     |  2 +-
 src/config/core.h       |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c64bd75b6..42fe35c9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,24 @@ If you are reading this in a text editor, simply ignore this section
 ### Removed
 -->
 
+## [v2024.06] `June 2024`
+
+### Added
+
+- Added the `mesnavigation()` script command, to generate navi tags valid for the current packetver. (#3300)
+- Added the `mesmobspawn()` script command, to generate navi tags valid for the current packetver. (#3300)
+- Added the `mesurl()` script command, to generate clickable URL tags valid for the current packetver. (#3300)
+- Added the `mestipbox()` script command, to generate tipbox tags valid for the current packetver. (#3300)
+
+### Changed
+
+- Refactored the Plagiarism/Reproduce skill tracking logic and removed some code duplication. (part of #3298)
+- Replaced the use of hardcoded `<NAVI>` tags in scripts with `mesnavigation()` calls. (#3300)
+
+### Fixed
+
+- Fixed the copy of one's own skills via Plagiarim or Reproduce causing the skill and its requirements to be deleted. (#3298, issue #3289)
+
 ## [v2024.05] `May 2024`
 
 ### Changed
@@ -3103,6 +3121,8 @@ Note: everything included in this release is part of PR #3198 which consists of
 - New versioning scheme and project changelogs/release notes (#1853)
 
 [Unreleased]: https://github.com/HerculesWS/Hercules/compare/stable...master
+[v2024.06]: https://github.com/HerculesWS/Hercules/compare/v2024.05...v2024.06
+[v2024.05]: https://github.com/HerculesWS/Hercules/compare/v2024.04...v2024.05
 [v2024.04]: https://github.com/HerculesWS/Hercules/compare/v2024.03...v2024.04
 [v2024.03]: https://github.com/HerculesWS/Hercules/compare/v2024.02...v2024.03
 [v2024.02]: https://github.com/HerculesWS/Hercules/compare/v2023.12...v2024.02
diff --git a/doc/constants_pre-re.md b/doc/constants_pre-re.md
index 0c6e9e092..7fc0640c3 100644
--- a/doc/constants_pre-re.md
+++ b/doc/constants_pre-re.md
@@ -4878,7 +4878,7 @@
 ### Server defines
 
 - `PACKETVER`: 20190530
-- `HERCULES_VERSION`: 202405000
+- `HERCULES_VERSION`: 202406000
 - `MAX_LEVEL`: 175
 - `MAX_STORAGE`: 600
 - `MAX_GUILD_STORAGE`: 500
diff --git a/doc/constants_re.md b/doc/constants_re.md
index 90b732950..066e17d10 100644
--- a/doc/constants_re.md
+++ b/doc/constants_re.md
@@ -4878,7 +4878,7 @@
 ### Server defines
 
 - `PACKETVER`: 20190530
-- `HERCULES_VERSION`: 202405000
+- `HERCULES_VERSION`: 202406000
 - `MAX_LEVEL`: 175
 - `MAX_STORAGE`: 600
 - `MAX_GUILD_STORAGE`: 500
diff --git a/src/config/core.h b/src/config/core.h
index 844549af1..6faa3ea1f 100644
--- a/src/config/core.h
+++ b/src/config/core.h
@@ -22,7 +22,7 @@
 #define CONFIG_CORE_H
 
 /// Hercules version. From tag vYYYY.MM(+PPP) -> YYYYMMPPP
-#define HERCULES_VERSION 202405000
+#define HERCULES_VERSION 202406000
 
 /// Max number of items on @autolootid list
 #define AUTOLOOTITEM_SIZE 10