Warning when using setmapflag for zone

[SombraRO]

Describe the bug

When using the setmapflag command for zone that has the mapflag adjust_skill_damage, Warning occurs when using the reloadscript command

Script:

setmapflag("pvp_n_1-1", mf_zone, "MyZone");

Zone:

{
	name: "MyZone"
	
	mapflags: ("adjust_skill_damage	MG_FIREBOLT	200")
}

The effect is applied correctly, however when using reloadscript this problem occurs.

Expected behavior

The correct one would not occur Warning when using reloadscript because setmapflag was run without errors

Screenshots
Error using @reloadscript

System specs (please complete the following information):

• OS: [windows 10]
• Hercules Version [v2018.12.16 ]
• Mode: [renewal and pre-renewal]
• Packet version: [20181017]
• Client type: [main]

Plugins used or source modifications
None

Additional context
None

[SombraRO]

@4144 @Helianthella

[bWolfie]

Bump.

[AnnieRuru]

 db/re/map_zone_db.conf | 5 +++++
 src/map/map.c          | 6 ++++--
 src/map/npc.c          | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 42391a6f0..a82f8b5b9 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -518,5 +518,10 @@ zones: (
 	disabled_items: {
 		Greed_Scroll: true
 	}
+},
+{
+	name: "MyZone"
+	
+	mapflags: ("adjust_skill_damage	MG_FIREBOLT	200")
 }
 )
diff --git a/src/map/map.c b/src/map/map.c
index 7d2cc87d4..0b7834441 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3706,6 +3706,7 @@ static void do_final_maps(void)
 
 static void map_zonedb_reload(void)
 {
+ShowDebug("1\n");
 	// first, reset maps to their initial zones:
 	for (int i = 0; i < map->count; i++) {
 		map->zone_remove_all(i);
@@ -3720,12 +3721,13 @@ static void map_zonedb_reload(void)
 
 		map->list[i].prev_zone = map->list[i].zone;
 	}
-
+ShowDebug("2\n");
 	// now it's safe to remove the zones:
 	map->zone_db_clear();
-
+ShowDebug("3\n");
 	// then reload everything from scratch:
 	map->zone_db = strdb_alloc(DB_OPT_DUP_KEY | DB_OPT_RELEASE_DATA, MAP_ZONE_NAME_LENGTH);
+ShowDebug("4\n");
 	map->read_zone_db();
 }
 
diff --git a/src/map/npc.c b/src/map/npc.c
index 61341744d..66a2e942e 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -4717,7 +4717,7 @@ static const char *npc_parse_mapflag(const char *w1, const char *w2, const char
 				break;
 			}
 		}
-
+ShowDebug( "asd = %s\n", modifier );
 		if( modifier[0] == '\0' ) {
 			ShowWarning("npc_parse_mapflag: Missing 5th param for 'adjust_skill_damage' flag! removing flag from %s in file '%s', line '%d'.\n", map->list[m].name, filepath, strline(buffer,start-buffer));
 			if (retval) *retval = EXIT_FAILURE;

display as

[Debug]: 1
[Debug]: asd =
[Warning]: npc_parse_mapflag: Missing 5th param for 'adjust_skill_damage' flag!
removing flag from prontera in file '', line '1'.
[Debug]: 2
[Debug]: 3
[Debug]: 4
[Status]: Done reading '16' zones in 'db/re/map_zone_db.conf'.
[Debug]: asd = 200

in other words, "@reloadscript` actually works, nothing wrong with the reloadmapzone stuff

the problem lies on the adjust_skill_damage mapflag

prontera	mapflag	adjust_skill_damage	MG_FIREBOLT	200

prontera is w1, mapflag is w2 .... MG_FIREBOLT<TAB>200 is w4
that 200 is actually part of w4

Hercules/src/map/npc.c

Lines 4703 to 4722 in e78a3b5

	} else if (!strcmpi(w3,"adjust_skill_damage")) {
	int skill_id, k;
	char skill_name[MAP_ZONE_MAPFLAG_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH];
	size_t len = w4 ? strlen(w4) : 0;
	modifier[0] = '\0';
	if( w4 )
	memcpy(skill_name, w4, MAP_ZONE_MAPFLAG_LENGTH);
	for(k = 0; k < len; k++) {
	if( skill_name[k] == '\t' ) {
	memcpy(modifier, &skill_name[k+1], len - k);
	skill_name[k] = '\0';
	break;
	}
	}
	if( modifier[0] == '\0' ) {
	ShowWarning("npc_parse_mapflag: Missing 5th param for 'adjust_skill_damage' flag! removing flag from %s in file '%s', line '%d'.\n", map->list[m].name, filepath, strline(buffer,start-buffer));

something must be wrong here
maybe the check condition has to be rewrite

[bWolfie]

thank you annie