From edad604582cbe6b17de7f19a958c38710f5cf9ab Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Mon, 22 Jun 2020 03:00:22 +0200
Subject: Add battle flag for rate modifier messages display

---
 conf/map/battle/client.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'conf')

diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index 5601dbc9e..aad4d7652 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -202,3 +202,11 @@ ping_time: 20
 // Drop or not connection after client send disconnect request packet
 // Official is false
 drop_connection_on_quit: false
+
+// When to display the rate modifier messages?
+// 0x0 - Never display rate modifier messages.
+// 0x1 - Display rate modifier messages upon login.
+// 0x2 - Display rate modifier messages upon map change.
+// 0x4 - Display rate modifier messages upon teleporting (regardless of changing maps).
+// Default: 0x1 (Official behavior.)
+display_rate_messages: 0x1
-- 
cgit v1.2.3-70-g09d2


From 527c5a20676780954567d6a791f240933afde7f2 Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Mon, 22 Jun 2020 03:02:19 +0200
Subject: Add battle flag for configuration messages display

---
 conf/map/battle/client.conf | 18 ++++++++++++++++
 src/map/battle.c            |  1 +
 src/map/battle.h            |  1 +
 src/map/clif.c              | 50 ++++++++++++++++++++++++++++-----------------
 4 files changed, 51 insertions(+), 19 deletions(-)

(limited to 'conf')

diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index aad4d7652..722019fa7 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -210,3 +210,21 @@ drop_connection_on_quit: false
 // 0x4 - Display rate modifier messages upon teleporting (regardless of changing maps).
 // Default: 0x1 (Official behavior.)
 display_rate_messages: 0x1
+
+// When to display the configuration messages and which? (Note 3)
+//
+// Flags for when to display the configuration messages:
+// 0x000 - Never display configuration messages.
+// 0x001 - Display configuration messages upon login. (Default. Should always be set.)
+// 0x002 - Display configuration messages upon map change.
+// 0x004 - Display configuration messages upon teleporting (regardless of changing maps).
+//
+// Flags for which configuration messages are displayed:
+// 0x010 - Character's party invitation state. (Default.)
+// 0x020 - Character's view equipment state. (Default.)
+// 0x040 - Character's Urgent Call state. (Default.)
+// 0x080 - Character's pet auto-feed state. (Default.)
+// 0x100 - Character's homunculus auto-feed state. (Default.)
+//
+// Default: 0x1F1 (Official behavior.)
+display_config_messages: 0x1F1
diff --git a/src/map/battle.c b/src/map/battle.c
index 7d85bf645..dc2535052 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -7432,6 +7432,7 @@ static const struct battle_data {
 	{ "option_drop_max_loop",               &battle_config.option_drop_max_loop,            10,     1,      100000,         },
 	{ "drop_connection_on_quit",            &battle_config.drop_connection_on_quit,         0,      0,      1,              },
 	{ "display_rate_messages",              &battle_config.display_rate_messages,           1,      0,      7,              },
+	{ "display_config_messages",            &battle_config.display_config_messages,         0x1F1,  0,      0x1F7,          },
 	{ "features/enable_refinery_ui",        &battle_config.enable_refinery_ui,              1,      0,      1,              },
 	{ "features/replace_refine_npcs",       &battle_config.replace_refine_npcs,             1,      0,      1,              },
 	{ "batk_min_limit",                     &battle_config.batk_min,                        0,      0,      INT_MAX,        },
diff --git a/src/map/battle.h b/src/map/battle.h
index a116506dd..5a039a8ed 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -591,6 +591,7 @@ struct Battle_Config {
 
 	int drop_connection_on_quit;
 	int display_rate_messages;
+	int display_config_messages;
 	int enable_refinery_ui;
 	int replace_refine_npcs;
 
diff --git a/src/map/clif.c b/src/map/clif.c
index 4a34b1f0d..3f9cc2659 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10948,25 +10948,6 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd)
 	bool change_map = (sd->state.changemap != 0);
 
 	if (sd->state.changemap != 0) { // Restore information that gets lost on map-change.
-#if PACKETVER >= 20070918
-		clif->partyinvitationstate(sd);
-		clif->equpcheckbox(sd);
-#endif
-
-#if PACKETVER_MAIN_NUM >= 20171025 || PACKETVER_RE_NUM >= 20170920
-		clif->zc_config(sd, CZ_CONFIG_CALL, sd->status.allow_call);
-
-		if (sd->pd != NULL)
-			clif->zc_config(sd, CZ_CONFIG_PET_AUTOFEEDING, sd->pd->pet.autofeed);
-		else
-			clif->zc_config(sd, CZ_CONFIG_PET_AUTOFEEDING, false);
-
-		if (sd->hd != NULL)
-			clif->zc_config(sd, CZ_CONFIG_HOMUNCULUS_AUTOFEEDING, sd->hd->homunculus.autofeed);
-		else
-			clif->zc_config(sd, CZ_CONFIG_HOMUNCULUS_AUTOFEEDING, false);
-#endif
-
 		bool flee_penalty = (battle_config.bg_flee_penalty != 100 || battle_config.gvg_flee_penalty != 100);
 		bool is_gvg = (map_flag_gvg2(sd->state.pmap) || map_flag_gvg2(sd->bl.m));
 		bool is_bg = (map->list[sd->state.pmap].flag.battleground != 0 || map->list[sd->bl.m].flag.battleground != 0);
@@ -11015,6 +10996,37 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd)
 	mail->clear(sd);
 	clif->maptypeproperty2(&sd->bl, SELF);
 
+	if (((battle_config.display_config_messages & 0x1) != 0 && first_time)
+	    || ((battle_config.display_config_messages & 0x2) != 0 && !first_time && change_map)
+	    || (battle_config.display_config_messages & 0x4) != 0) {
+#if PACKETVER >= 20070918
+		if ((battle_config.display_config_messages & 0x10) != 0)
+			clif->partyinvitationstate(sd);
+
+		if ((battle_config.display_config_messages & 0x20) != 0)
+			clif->equpcheckbox(sd);
+#endif
+
+#if PACKETVER_MAIN_NUM >= 20171025 || PACKETVER_RE_NUM >= 20170920
+		if ((battle_config.display_config_messages & 0x40) != 0)
+			clif->zc_config(sd, CZ_CONFIG_CALL, sd->status.allow_call);
+
+		if ((battle_config.display_config_messages & 0x80) != 0) {
+			if (sd->pd != NULL)
+				clif->zc_config(sd, CZ_CONFIG_PET_AUTOFEEDING, sd->pd->pet.autofeed);
+			else
+				clif->zc_config(sd, CZ_CONFIG_PET_AUTOFEEDING, false);
+		}
+
+		if ((battle_config.display_config_messages & 0x100) != 0) {
+			if (sd->hd != NULL)
+				clif->zc_config(sd, CZ_CONFIG_HOMUNCULUS_AUTOFEEDING, sd->hd->homunculus.autofeed);
+			else
+				clif->zc_config(sd, CZ_CONFIG_HOMUNCULUS_AUTOFEEDING, false);
+		}
+#endif
+	}
+
 	if (((battle_config.display_rate_messages & 0x1) != 0 && first_time)
 	    || ((battle_config.display_rate_messages & 0x2) != 0 && !first_time && change_map)
 	    || (battle_config.display_rate_messages & 0x4) != 0) {
-- 
cgit v1.2.3-70-g09d2


From 3dd482367675292233bf034bc8a38b2ab46b0aa3 Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Mon, 22 Jun 2020 03:06:00 +0200
Subject: Extend guild_notice_changemap battle flag with option for login

---
 conf/map/battle/guild.conf | 12 +++++++-----
 src/map/battle.c           |  2 +-
 src/map/clif.c             |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'conf')

diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf
index 781f6555b..204c295c3 100644
--- a/conf/map/battle/guild.conf
+++ b/conf/map/battle/guild.conf
@@ -59,11 +59,13 @@ require_glory_guild: false
 // Default is 3
 max_guild_alliance: 3
 
-// When to re-display the guild notice
-// Upon teleporting (regardless of changing maps): 2 (official)
-// Upon changing maps: 1
-// Do not re-display: 0 (disabled)
-guild_notice_changemap: 2
+// When to display the guild notice?
+// 0x0 - Never display guild notice.
+// 0x1 - Display guild notice upon login.
+// 0x2 - Display guild notice upon map change.
+// 0x4 - Display guild notice upon teleporting (regardless of changing maps).
+// Default: 0x7 (Official behavior.)
+guild_notice_changemap: 0x7
 
 // Can guild members invite/expel members inside guild castles in WoE/GvG? (Note 1)
 // default: false
diff --git a/src/map/battle.c b/src/map/battle.c
index dc2535052..ed5aa4cb9 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -7383,7 +7383,7 @@ static const struct battle_data {
 	{ "packet_obfuscation",                 &battle_config.packet_obfuscation,              1,      0,      3,              },
 	{ "client_accept_chatdori",             &battle_config.client_accept_chatdori,          0,      0,      INT_MAX,        },
 	{ "snovice_call_type",                  &battle_config.snovice_call_type,               0,      0,      1,              },
-	{ "guild_notice_changemap",             &battle_config.guild_notice_changemap,          2,      0,      2,              },
+	{ "guild_notice_changemap",             &battle_config.guild_notice_changemap,          7,      0,      7,              },
 	{ "features/banking",                   &battle_config.feature_banking,                 1,      0,      1,              },
 	{ "features/auction",                   &battle_config.feature_auction,                 0,      0,      2,              },
 	{ "idletime_criteria",                  &battle_config.idletime_criteria,            0x25,      1,      INT_MAX,        },
diff --git a/src/map/clif.c b/src/map/clif.c
index a580d6464..9eba9f4b4 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11030,9 +11030,9 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd)
 
 	if (sd->guild != NULL) {
 		// Show guild notice.
-		if ((battle_config.guild_notice_changemap == 1 && change_map)
-		    || battle_config.guild_notice_changemap == 2
-		    || first_time) {
+		if (((battle_config.guild_notice_changemap & 0x1) != 0 && first_time)
+		    || ((battle_config.guild_notice_changemap & 0x2) != 0 && !first_time && change_map)
+		    || (battle_config.guild_notice_changemap & 0x4) != 0) {
 			clif->guild_notice(sd, sd->guild);
 		}
 
-- 
cgit v1.2.3-70-g09d2


From fa14df7e5ba9f18c74f149fb3bcaee32dfd87f80 Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Mon, 22 Jun 2020 03:11:24 +0200
Subject: Add battle flag for sending party options

---
 conf/map/battle/party.conf | 27 ++++++++++++++++++
 src/map/battle.c           |  1 +
 src/map/battle.h           |  1 +
 src/map/clif.c             | 70 ++++++++++++++++++++++++++++++++++++----------
 4 files changed, 85 insertions(+), 14 deletions(-)

(limited to 'conf')

diff --git a/conf/map/battle/party.conf b/conf/map/battle/party.conf
index e27a709fd..7713d5376 100644
--- a/conf/map/battle/party.conf
+++ b/conf/map/battle/party.conf
@@ -80,3 +80,30 @@ party_even_share_bonus: 0
 // Display party name regardless if player is in a guild.
 // Official servers do not display party name unless the user is in a guild. (Note 1)
 display_party_name: false
+
+// When and how to send the party options? (Note 3)
+//
+// Flags for when to display the party options:
+// 0x00000 - Never send party options.
+// 0x00001 - Send party options upon login. (Default. Should always be set.)
+// 0x00002 - Send party options upon map change.
+// 0x00004 - Send party options upon teleporting (regardless of changing maps).
+// 0x00008 - Send party options upon successfully changing options manually. (Default. Should always be set.)
+// 0x00010 - Send party options upon unsuccessfully changing options manually. (Tried to enable EXP sharing if not allowed.) (Default.)
+// 0x00020 - Send party options upon changing options automatically. (Default. Should always be set.)
+// 0x00040 - Send party options upon joining party. (Default. Should always be set.)
+// 0x00080 - Send party options upon leaving party. (Default.)
+//
+// Flags for how to send the party options:
+// 0x00100 - Send party options to all party members upon unsuccessfully changing options manually. (Tried to enable EXP sharing if not allowed.) (Default.)
+// 0x00200 - Send all party options upon login.
+// 0x00400 - Send all party options upon map change.
+// 0x00800 - Send all party options upon teleporting (regardless of changing maps).
+// 0x01000 - Send all party options upon successfully changing options manually. (Default.)
+// 0x02000 - Send all party options upon unsuccessfully changing options manually. (Tried to enable EXP sharing if not allowed.) (Default.)
+// 0x04000 - Send all party options upon changing options automatically.
+// 0x08000 - Send all party options upon joining party.
+// 0x10000 - Send all party options upon leaving party.
+//
+// Default: 0x31F9 (Official behavior.)
+send_party_options: 0x31F9
diff --git a/src/map/battle.c b/src/map/battle.c
index ed5aa4cb9..e8d8e581f 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -7345,6 +7345,7 @@ static const struct battle_data {
 	{ "searchstore_querydelay",             &battle_config.searchstore_querydelay,         10,      0,      INT_MAX,        },
 	{ "searchstore_maxresults",             &battle_config.searchstore_maxresults,         30,      1,      INT_MAX,        },
 	{ "display_party_name",                 &battle_config.display_party_name,              0,      0,      1,              },
+	{ "send_party_options",                 &battle_config.send_party_options,              0x31F9, 0,      0x1FFFF,        },
 	{ "cashshop_show_points",               &battle_config.cashshop_show_points,            0,      0,      1,              },
 	{ "mail_show_status",                   &battle_config.mail_show_status,                0,      0,      2,              },
 	{ "client_limit_unit_lv",               &battle_config.client_limit_unit_lv,            0,      0,      BL_ALL,         },
diff --git a/src/map/battle.h b/src/map/battle.h
index 5a039a8ed..ceb94321e 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -471,6 +471,7 @@ struct Battle_Config {
 	int searchstore_querydelay;
 	int searchstore_maxresults;
 	int display_party_name;
+	int send_party_options;
 	int cashshop_show_points;
 	int mail_show_status;
 	int client_limit_unit_lv;
diff --git a/src/map/clif.c b/src/map/clif.c
index 8634925f0..a75fc0dc3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7307,13 +7307,48 @@ static void clif_party_inviteack(struct map_session_data *sd, const char *nick,
 ///     0x08 = Member added.
 ///     0x10 = Member removed.
 ///     0x20 = Character logged in.
+///     0x40 = Character changed map.
+///     0x80 = Character teleported.
 static void clif_party_option(struct party_data *p, struct map_session_data *sd, int flag)
 {
+	int conf = battle_config.send_party_options;
+
+	if (((flag & 0x01) != 0 && (conf & 0x10) == 0)
+	    || ((flag & 0x02) != 0 && (conf & 0x08) == 0)
+	    || ((flag & 0x04) != 0 && (conf & 0x20) == 0)
+	    || ((flag & 0x08) != 0 && (conf & 0x40) == 0)
+	    || ((flag & 0x10) != 0 && (conf & 0x80) == 0)
+	    || ((flag & 0x20) != 0 && (conf & 0x01) == 0)
+	    || ((flag & 0x40) != 0 && (conf & 0x02) == 0)
+	    || ((flag & 0x80) != 0 && (conf & 0x04) == 0)) {
+		return;
+	}
+
+	enum send_target target = SELF;
+
+	if (((flag & 0x01) != 0 && (conf & 0x100) != 0)
+	    || ((flag & 0x01) == 0 && (flag & 0x02) != 0)
+	    || (flag & 0x04) != 0) {
+		target = PARTY;
+	}
+
+	int cmd = 0x101;
+
+	if (((flag & 0x01) != 0 && (conf & 0x02000) != 0)
+	    || ((flag & 0x02) != 0 && (conf & 0x01000) != 0)
+	    || ((flag & 0x04) != 0 && (conf & 0x04000) != 0)
+	    || ((flag & 0x08) != 0 && (conf & 0x08000) != 0)
+	    || ((flag & 0x10) != 0 && (conf & 0x10000) != 0)
+	    || ((flag & 0x20) != 0 && (conf & 0x00200) != 0)
+	    || ((flag & 0x40) != 0 && (conf & 0x00400) != 0)
+	    || ((flag & 0x80) != 0 && (conf & 0x00800) != 0)) {
+		cmd = 0x7d8;
+	}
+
 	unsigned char buf[16];
 #if PACKETVER < 20090603
-	const int cmd = 0x101;
-#else
-	const int cmd = 0x7d8;
+	if (cmd == 0x7d8)
+		cmd = 0x101;
 #endif
 
 	nullpo_retv(p);
@@ -7328,14 +7363,13 @@ static void clif_party_option(struct party_data *p, struct map_session_data *sd,
 	if(!sd) return;
 	WBUFW(buf,0)=cmd;
 	WBUFL(buf, 2) = ((flag & 0x10) != 0) ? 0 : (((flag & 0x01) != 0) ? 2 : p->party.exp);
-#if PACKETVER >= 20090603
-	WBUFB(buf, 6) = ((flag & 0x10) != 0) ? 0 : (((p->party.item & 1) != 0) ? 1 : 0);
-	WBUFB(buf, 7) = ((flag & 0x10) != 0) ? 0 : (((p->party.item & 2) != 0) ? 1 : 0);
-#endif
-	if ((flag & 0x01) == 0 && ((flag & 0x04) != 0 || (flag & 0x02) != 0))
-		clif->send(buf,packet_len(cmd),&sd->bl,PARTY);
-	else
-		clif->send(buf,packet_len(cmd),&sd->bl,SELF);
+
+	if (cmd == 0x7d8) {
+		WBUFB(buf, 6) = ((flag & 0x10) != 0) ? 0 : (((p->party.item & 1) != 0) ? 1 : 0);
+		WBUFB(buf, 7) = ((flag & 0x10) != 0) ? 0 : (((p->party.item & 2) != 0) ? 1 : 0);
+	}
+
+	clif->send(buf, packet_len(cmd), &sd->bl, target);
 
 	if ((flag & 0x04) != 0)
 		p->state.option_auto_changed = 0;
@@ -11036,11 +11070,19 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd)
 #endif
 	}
 
-	if (p != NULL && first_time) {
+	if (p != NULL) {
+		int flag;
+
 		if (p->state.option_auto_changed != 0)
-			clif->party_option(p, sd, 0x04);
+			flag = 0x04;
+		else if (first_time)
+			flag = 0x20;
+		else if (change_map)
+			flag = 0x40;
 		else
-			clif->party_option(p, sd, 0x20);
+			flag = 0x80;
+
+		clif->party_option(p, sd, flag);
 	}
 
 	if (((battle_config.display_rate_messages & 0x1) != 0 && first_time)
-- 
cgit v1.2.3-70-g09d2


From f170e3487ec91f5f5a9e17acffc6cd499df373eb Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Mon, 22 Jun 2020 03:13:25 +0200
Subject: Add battle flag for overweight messages display

---
 conf/map/battle/client.conf |  7 +++++++
 src/map/battle.c            |  1 +
 src/map/battle.h            |  1 +
 src/map/clif.c              | 15 +++++++++++----
 4 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'conf')

diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index 722019fa7..f080e8375 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -228,3 +228,10 @@ display_rate_messages: 0x1
 //
 // Default: 0x1F1 (Official behavior.)
 display_config_messages: 0x1F1
+
+// When to display the overweight messages?
+// 0x0 - Never display overweight messages.
+// 0x1 - Display overweight messages upon login. (Default.)
+// 0x2 - Display overweight messages upon map change. (Default.)
+// Default: 0x3 (Official behavior.)
+display_overweight_messages: 0x3
diff --git a/src/map/battle.c b/src/map/battle.c
index e8d8e581f..0ef9c66e8 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -7434,6 +7434,7 @@ static const struct battle_data {
 	{ "drop_connection_on_quit",            &battle_config.drop_connection_on_quit,         0,      0,      1,              },
 	{ "display_rate_messages",              &battle_config.display_rate_messages,           1,      0,      7,              },
 	{ "display_config_messages",            &battle_config.display_config_messages,         0x1F1,  0,      0x1F7,          },
+	{ "display_overweight_messages",        &battle_config.display_overweight_messages,     3,      0,      3,              },
 	{ "features/enable_refinery_ui",        &battle_config.enable_refinery_ui,              1,      0,      1,              },
 	{ "features/replace_refine_npcs",       &battle_config.replace_refine_npcs,             1,      0,      1,              },
 	{ "batk_min_limit",                     &battle_config.batk_min,                        0,      0,      INT_MAX,        },
diff --git a/src/map/battle.h b/src/map/battle.h
index ceb94321e..19cfd2748 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -593,6 +593,7 @@ struct Battle_Config {
 	int drop_connection_on_quit;
 	int display_rate_messages;
 	int display_config_messages;
+	int display_overweight_messages;
 	int enable_refinery_ui;
 	int replace_refine_npcs;
 
diff --git a/src/map/clif.c b/src/map/clif.c
index f7f22f7b0..517b03add 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10787,10 +10787,6 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd)
 	// Check for and delete unavailable/disabled items.
 	pc->checkitem(sd);
 
-	// Send the character's weight to the client.
-	clif->updatestatus(sd, SP_WEIGHT);
-	clif->updatestatus(sd, SP_MAXWEIGHT);
-
 	// Send character's guild info to the client. Call this before clif->spawn() to show guild emblems correctly.
 	if (sd->status.guild_id != 0)
 		guild->send_memberinfoshort(sd, 1);
@@ -10819,6 +10815,17 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd)
 	map->addblock(&sd->bl); // Add the character to the map.
 	clif->spawn(&sd->bl); // Spawn character client side.
 
+	if (((battle_config.display_overweight_messages & 0x1) != 0 && sd->state.connect_new != 0)
+	    || ((battle_config.display_overweight_messages & 0x2) != 0 && sd->state.connect_new == 0 && sd->state.changemap != 0)) {
+		// Send the character's weight to the client. (With displaying overweight messages.)
+		clif->updatestatus(sd, SP_MAXWEIGHT);
+		clif->updatestatus(sd, SP_WEIGHT);
+	} else {
+		// Send the character's weight to the client. (Without displaying overweight messages.)
+		clif->updatestatus(sd, SP_WEIGHT);
+		clif->updatestatus(sd, SP_MAXWEIGHT);
+	}
+
 	struct party_data *p = NULL;
 
 	if (sd->status.party_id != 0)
-- 
cgit v1.2.3-70-g09d2


From ddf679b3808e56309a7352eead2cd1f93c9f99c9 Mon Sep 17 00:00:00 2001
From: Kenpachi Developer <Kenpachi.Developer@gmx.de>
Date: Mon, 22 Jun 2020 04:24:20 +0200
Subject: Add battle flag for tip of the day window display

---
 conf/map/battle/client.conf | 3 +++
 src/map/battle.c            | 1 +
 src/map/battle.h            | 1 +
 src/map/clif.c              | 3 ++-
 4 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index f080e8375..d4c0f3e1a 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -235,3 +235,6 @@ display_config_messages: 0x1F1
 // 0x2 - Display overweight messages upon map change. (Default.)
 // Default: 0x3 (Official behavior.)
 display_overweight_messages: 0x3
+
+// Show tip of the day window upon login?
+show_tip_window: true
diff --git a/src/map/battle.c b/src/map/battle.c
index 0ef9c66e8..4d07a2eb9 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -7435,6 +7435,7 @@ static const struct battle_data {
 	{ "display_rate_messages",              &battle_config.display_rate_messages,           1,      0,      7,              },
 	{ "display_config_messages",            &battle_config.display_config_messages,         0x1F1,  0,      0x1F7,          },
 	{ "display_overweight_messages",        &battle_config.display_overweight_messages,     3,      0,      3,              },
+	{ "show_tip_window",                    &battle_config.show_tip_window,                 1,      0,      1,              },
 	{ "features/enable_refinery_ui",        &battle_config.enable_refinery_ui,              1,      0,      1,              },
 	{ "features/replace_refine_npcs",       &battle_config.replace_refine_npcs,             1,      0,      1,              },
 	{ "batk_min_limit",                     &battle_config.batk_min,                        0,      0,      INT_MAX,        },
diff --git a/src/map/battle.h b/src/map/battle.h
index 19cfd2748..2e4209925 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -594,6 +594,7 @@ struct Battle_Config {
 	int display_rate_messages;
 	int display_config_messages;
 	int display_overweight_messages;
+	int show_tip_window;
 	int enable_refinery_ui;
 	int replace_refine_npcs;
 
diff --git a/src/map/clif.c b/src/map/clif.c
index 60dd18807..3f1690aa0 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11066,7 +11066,8 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd)
 		map->foreachpc(clif->friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 1);
 
 #if PACKETVER >= 20171122
-		clif->open_ui_send(sd, ZC_TIPBOX_UI);
+		if (battle_config.show_tip_window != 0)
+			clif->open_ui_send(sd, ZC_TIPBOX_UI);
 #endif
 
 		// Run OnPCLoginEvent labels.
-- 
cgit v1.2.3-70-g09d2