From c76f8ded8743966abe10a15a3a03604d76d2d5df Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 24 Nov 2018 05:57:43 +0300
Subject: Add packet ZC_ENCHANT_EQUIPMENT

---
 src/map/clif.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.h b/src/map/clif.h
index 593dc15c1..088e7827e 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1554,6 +1554,7 @@ struct clif_interface {
 	void (*camera_showWindow) (struct map_session_data *sd);
 	void (*camera_change) (struct map_session_data *sd, float range, float rotation, float latitude, enum send_target target);
 	void (*item_preview) (struct map_session_data *sd, int n);
+	void (*enchant_equipment) (struct map_session_data *sd, enum equip_pos pos, int cardSlot, int cardId);
 };
 
 #ifdef HERCULES_CORE
-- 
cgit v1.2.3-70-g09d2


From 2d33d766bd7ea81eb40c15fe45d59ab155b16fde Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 24 Nov 2018 20:40:33 +0300
Subject: Add script command for insert cards into equipped items.

enchantitem(<equip_pos>, <card_slot>, <card_id>)
---
 doc/script_commands.txt | 11 +++++++++++
 src/map/clif.c          |  9 ++++++---
 src/map/clif.h          |  2 +-
 src/map/script.c        | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 4 deletions(-)

(limited to 'src/map/clif.h')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 90d4d77cc..b88ff8809 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -10237,3 +10237,14 @@ Update already opened preview window with item from
 Works for 20181017 RE and main clients or newer.
 
 ---------------------------------------
+
+*enchantitem(<equip_pos>, <card_slot>, <card_id>);
+
+Insert card into equipped item in EQI_* slot.
+card_slot - can be 0 to 3.
+card_id   - any card item id.
+
+returns true if all parameters correct
+false in other case.
+Works for 20160831 main, 20151118 RE, any zero version
+---------------------------------------
diff --git a/src/map/clif.c b/src/map/clif.c
index 00d3d8908..4d298f520 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -21992,17 +21992,20 @@ static void clif_item_preview(struct map_session_data *sd, int n)
 }
 
 // insert cardId into equipped item in pos equipment slot into slot cardSlot.
-static void clif_enchant_equipment(struct map_session_data *sd, enum equip_pos pos, int cardSlot, int cardId)
+static bool clif_enchant_equipment(struct map_session_data *sd, enum equip_pos pos, int cardSlot, int cardId)
 {
 #if PACKETVER_MAIN_NUM >= 20160831 || PACKETVER_RE_NUM >= 20151118 || defined(PACKETVER_ZERO)
-	nullpo_retv(sd);
-	Assert_retv(cardSlot >= 0 && cardSlot <= 3);
+	nullpo_ret(sd);
+	Assert_ret(cardSlot >= 0 && cardSlot < MAX_SLOTS);
 	struct PACKET_ZC_ENCHANT_EQUIPMENT p;
 	p.packetType = HEADER_ZC_ENCHANT_EQUIPMENT;
 	p.wearState = pos;
 	p.cardSlot = cardSlot;
 	p.itemId = cardId;
 	clif->send(&p, sizeof(p), &sd->bl, SELF);
+	return true;
+#else
+	return false;
 #endif
 }
 
diff --git a/src/map/clif.h b/src/map/clif.h
index 088e7827e..2aab4c227 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1554,7 +1554,7 @@ struct clif_interface {
 	void (*camera_showWindow) (struct map_session_data *sd);
 	void (*camera_change) (struct map_session_data *sd, float range, float rotation, float latitude, enum send_target target);
 	void (*item_preview) (struct map_session_data *sd, int n);
-	void (*enchant_equipment) (struct map_session_data *sd, enum equip_pos pos, int cardSlot, int cardId);
+	bool (*enchant_equipment) (struct map_session_data *sd, enum equip_pos pos, int cardSlot, int cardId);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/script.c b/src/map/script.c
index 41f21cd72..4760fd4a0 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -24790,6 +24790,56 @@ static BUILDIN(itempreview)
 	return true;
 }
 
+// insert or remove card into equipped item
+static BUILDIN(enchantitem)
+{
+	struct map_session_data *sd = script_rid2sd(st);
+	if (sd == NULL)
+		return false;
+	const int pos = script_getnum(st, 2);
+	if ((pos < EQI_ACC_L || pos > EQI_HAND_R) && pos != EQI_AMMO) {
+		ShowError("Wrong equip position: %d\n", pos);
+		script->reportfunc(st);
+		script->reportsrc(st);
+		script_pushint(st, false);
+		return true;
+	}
+	const int cardId = script_getnum(st, 4);
+	struct item_data *it = itemdb->exists(cardId);
+	if (it == NULL || it->type != IT_CARD) {
+		ShowError("Item id is not card or not exists: %d\n", cardId);
+		script->reportfunc(st);
+		script->reportsrc(st);
+		script_pushint(st, false);
+		return true;
+	}
+	const int n = sd->equip_index[pos];
+	if (n < 0) {
+		ShowError("Item in equipment slot %d is not equipped\n", pos);
+		script->reportfunc(st);
+		script->reportsrc(st);
+		script_pushint(st, false);
+		return true;
+	}
+	const int cardSlot = script_getnum(st, 3);
+	if (cardSlot < 0 || cardSlot >= MAX_SLOTS) {
+		ShowError("Wrong card slot %d. Must be in range 0-3.\n", cardSlot);
+		script->reportfunc(st);
+		script->reportsrc(st);
+		script_pushint(st, false);
+		return true;
+	}
+	const bool res = clif->enchant_equipment(sd, pc->equip_pos[pos], cardSlot, cardId);
+	if (res) {
+		logs->pick_pc(sd, LOG_TYPE_CARD, -1, &sd->status.inventory[n],sd->inventory_data[n]);
+		sd->status.inventory[n].card[cardSlot] = cardId;
+		logs->pick_pc(sd, LOG_TYPE_CARD,  1, &sd->status.inventory[n],sd->inventory_data[n]);
+		status_calc_pc(sd, SCO_NONE);
+	}
+	script_pushint(st, res);
+	return true;
+}
+
 /**
  * Adds a built-in script function.
  *
@@ -25528,6 +25578,7 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(changecamera, "iii?"),
 
 		BUILDIN_DEF(itempreview, "i"),
+		BUILDIN_DEF(enchantitem, "iii"),
 	};
 	int i, len = ARRAYLENGTH(BUILDIN);
 	RECREATE(script->buildin, char *, script->buildin_count + len); // Pre-alloc to speed up
-- 
cgit v1.2.3-70-g09d2


From a3b66189064b5b7ec2be2caf6d2ae42c5d9a7851 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 26 Nov 2018 07:28:28 +0300
Subject: Add missing enum values into roulette generate ack packet.

---
 src/map/clif.c |  2 +-
 src/map/clif.h | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index 3f45c7aca..d27d659b2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -20083,7 +20083,7 @@ static bool clif_parse_roulette_db(void)
 /**
  *
  **/
-static void clif_roulette_generate_ack(struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, int bonusItemID)
+static void clif_roulette_generate_ack(struct map_session_data *sd, enum GENERATE_ROULETTE_ACK result, short stage, short prizeIdx, int bonusItemID)
 {
 #if PACKETVER >= 20140612
 	struct packet_roulette_generate_ack p;
diff --git a/src/map/clif.h b/src/map/clif.h
index 2aab4c227..7f3dc204d 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -493,10 +493,14 @@ enum RECV_ROULETTE_ITEM_ACK {
 };
 
 enum GENERATE_ROULETTE_ACK {
-	GENERATE_ROULETTE_SUCCESS =  0x0,
-	GENERATE_ROULETTE_FAILED =  0x1,
-	GENERATE_ROULETTE_NO_ENOUGH_POINT =  0x2,
-	GENERATE_ROULETTE_LOSING =  0x3,
+	GENERATE_ROULETTE_SUCCESS = 0x0,
+	GENERATE_ROULETTE_FAILED  = 0x1,
+	GENERATE_ROULETTE_NO_ENOUGH_POINT = 0x2,
+	GENERATE_ROULETTE_LOSING  = 0x3,
+	GENERATE_ROULETTE_NO_ENOUGH_INVENTORY_SPACE = 0x4,
+#if PACKETVER >= 20141001
+	GENERATE_ROULETTE_CANT_PLAY = 0x5,
+#endif
 };
 
 enum OPEN_ROULETTE_ACK{
@@ -1219,7 +1223,7 @@ struct clif_interface {
 	void (*npc_market_purchase_ack) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char response);
 	/* */
 	bool (*parse_roulette_db) (void);
-	void (*roulette_generate_ack) (struct map_session_data *sd, unsigned char result, short stage, short prizeIdx, int bonusItemID);
+	void (*roulette_generate_ack) (struct map_session_data *sd, enum GENERATE_ROULETTE_ACK result, short stage, short prizeIdx, int bonusItemID);
 	/* Merge Items */
 	void (*openmergeitem) (int fd, struct map_session_data *sd);
 	void (*cancelmergeitem) (int fd, struct map_session_data *sd);
-- 
cgit v1.2.3-70-g09d2


From cde8cf6b18c124f5453451276c9978141271e6d3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 26 Nov 2018 07:58:45 +0300
Subject: Use enum OPEN_ROULETTE_ACK in roulette open ack packet.

---
 src/map/clif.c | 2 +-
 src/map/clif.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index d27d659b2..da8ba3a95 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -19824,7 +19824,7 @@ static void clif_parse_RouletteOpen(int fd, struct map_session_data *sd)
 	}
 
 	p.PacketType = 0xa1a;
-	p.Result = 0;
+	p.Result = OPEN_ROULETTE_SUCCESS;
 	p.Serial = 0;
 	p.Step = sd->roulette.stage - 1;
 	p.Idx = (char)sd->roulette.prizeIdx;
diff --git a/src/map/clif.h b/src/map/clif.h
index 7f3dc204d..c8db1a0fd 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -503,7 +503,7 @@ enum GENERATE_ROULETTE_ACK {
 #endif
 };
 
-enum OPEN_ROULETTE_ACK{
+enum OPEN_ROULETTE_ACK {
 	OPEN_ROULETTE_SUCCESS =  0x0,
 	OPEN_ROULETTE_FAILED =  0x1,
 };
-- 
cgit v1.2.3-70-g09d2


From 5c29241d2d4bc43184faeedd7c1ffe3af8753fc9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 27 Nov 2018 04:38:34 +0300
Subject: Add packet ZC_SERVICE_MESSAGE_COLOR

---
 src/map/clif.c           | 29 +++++++++++++++++++++++++++++
 src/map/clif.h           |  1 +
 src/map/packets_struct.h | 10 ++++++++++
 3 files changed, 40 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index 82ced2d24..df7b3839b 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8971,6 +8971,34 @@ static void clif_messagecolor(struct block_list *bl, uint32 color, const char *m
 	clif->send(buf, WBUFW(buf,2), bl, AREA_CHAT_WOC);
 }
 
+// Message without owner, not logged in chat
+static void clif_serviceMessageColor(struct map_session_data *sd, uint32 color, const char *msg)
+{
+#if PACKETVER_MAIN_NUM >= 20170830 || PACKETVER_RE_NUM >= 20170830 || defined(PACKETVER_ZERO)
+	nullpo_retv(sd);
+	nullpo_retv(msg);
+
+	int msg_len = (int)strlen(msg) + 1;
+
+	if (msg_len > 512) {
+		ShowWarning("clif_serviceMessageColor: Truncating too long message '%s' (len=%d).\n", msg, msg_len);
+		msg_len = 512;
+	}
+
+	const int len = sizeof(struct PACKET_ZC_SERVICE_MESSAGE_COLOR) + msg_len;
+	const int fd = sd->fd;
+	WFIFOHEAD(fd, len);
+	struct PACKET_ZC_SERVICE_MESSAGE_COLOR *p = WFIFOP(fd, 0);
+
+	p->packetType = HEADER_ZC_SERVICE_MESSAGE_COLOR;
+	p->packetLength = len;
+	p->color = RGB2BGR(color);
+	safestrncpy(p->message, msg, msg_len);
+
+	WFIFOSET(fd, len);
+#endif
+}
+
 /**
  * Notifies the client that the storage window is still open
  *
@@ -22592,6 +22620,7 @@ void clif_defaults(void)
 	clif->broadcast2 = clif_broadcast2;
 	clif->messagecolor_self = clif_messagecolor_self;
 	clif->messagecolor = clif_messagecolor;
+	clif->serviceMessageColor = clif_serviceMessageColor;
 	clif->disp_overhead = clif_disp_overhead;
 	clif->notify_playerchat = clif_notify_playerchat;
 	clif->msgtable_skill = clif_msgtable_skill;
diff --git a/src/map/clif.h b/src/map/clif.h
index c8db1a0fd..be127a54f 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -972,6 +972,7 @@ struct clif_interface {
 	void (*broadcast2) (struct block_list *bl, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target);
 	void (*messagecolor_self) (int fd, uint32 color, const char *msg);
 	void (*messagecolor) (struct block_list* bl, uint32 color, const char* msg);
+	void (*serviceMessageColor) (struct map_session_data *sd, uint32 color, const char *msg);
 	void (*disp_overhead) (struct block_list *bl, const char *mes, enum send_target target, struct block_list *target_bl);
 	void (*notify_playerchat) (struct block_list *bl, const char *mes);
 	void (*msgtable) (struct map_session_data* sd, enum clif_messages msg_id);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 1f4df6fc9..5c9a60465 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2960,6 +2960,16 @@ struct PACKET_ZC_ENCHANT_EQUIPMENT {
 DEFINE_PACKET_HEADER(ZC_ENCHANT_EQUIPMENT, 0x0a3f);
 #endif  // PACKETVER_MAIN_NUM >= 20160831 || PACKETVER_RE_NUM >= 20151118 || defined(PACKETVER_ZERO)
 
+#if PACKETVER_MAIN_NUM >= 20170830 || PACKETVER_RE_NUM >= 20170830 || defined(PACKETVER_ZERO)
+struct PACKET_ZC_SERVICE_MESSAGE_COLOR {
+	int16 packetType;
+	int16 packetLength;
+	int32 color;
+	char message[];
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_SERVICE_MESSAGE_COLOR, 0x0adb);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2


From 63f57fa5c3944ba7759f84361dd42391709f21c8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 28 Nov 2018 22:06:11 +0300
Subject: Remove typedef from clr_type.

---
 src/map/clif.c |  8 ++++----
 src/map/clif.h | 10 +++++-----
 src/map/pc.c   |  6 +++---
 src/map/pc.h   |  6 +++---
 src/map/unit.c |  8 ++++----
 src/map/unit.h |  8 ++++----
 6 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index 9f56e0136..e76e9f852 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -890,7 +890,7 @@ static void clif_clearflooritem(struct flooritem_data *fitem, int fd)
 ///     2 = logged out
 ///     3 = teleport
 ///     4 = trickdead
-static void clif_clearunit_single(int id, clr_type type, int fd)
+static void clif_clearunit_single(int id, enum clr_type type, int fd)
 {
 	WFIFOHEAD(fd, packet_len(0x80));
 	WFIFOW(fd,0) = 0x80;
@@ -907,7 +907,7 @@ static void clif_clearunit_single(int id, clr_type type, int fd)
 ///     2 = logged out
 ///     3 = teleport
 ///     4 = trickdead
-static void clif_clearunit_area(struct block_list *bl, clr_type type)
+static void clif_clearunit_area(struct block_list *bl, enum clr_type type)
 {
 	unsigned char buf[8];
 
@@ -936,12 +936,12 @@ static void clif_clearunit_area(struct block_list *bl, clr_type type)
 static int clif_clearunit_delayed_sub(int tid, int64 tick, int id, intptr_t data)
 {
 	struct block_list *bl = (struct block_list *)data;
-	clif->clearunit_area(bl, (clr_type) id);
+	clif->clearunit_area(bl, (enum clr_type) id);
 	ers_free(clif->delay_clearunit_ers,bl);
 	return 0;
 }
 
-static void clif_clearunit_delayed(struct block_list *bl, clr_type type, int64 tick)
+static void clif_clearunit_delayed(struct block_list *bl, enum clr_type type, int64 tick)
 {
 	struct block_list *tbl;
 
diff --git a/src/map/clif.h b/src/map/clif.h
index be127a54f..446abe8e3 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -237,13 +237,13 @@ typedef enum emotion_type {
 	E_MAX
 } emotion_type;
 
-typedef enum clr_type {
+enum clr_type {
 	CLR_OUTSIGHT = 0,
 	CLR_DEAD,
 	CLR_RESPAWN,
 	CLR_TELEPORT,
 	CLR_TRICKDEAD,
-} clr_type;
+};
 
 enum map_property { // clif_map_property
 	MAPPROPERTY_NOTHING       = 0,
@@ -756,9 +756,9 @@ struct clif_interface {
 	void (*package_announce) (struct map_session_data *sd, int nameid, int containerid);
 	void (*item_drop_announce) (struct map_session_data *sd, int nameid, char *monsterName);
 	/* unit-related */
-	void (*clearunit_single) (int id, clr_type type, int fd);
-	void (*clearunit_area) (struct block_list* bl, clr_type type);
-	void (*clearunit_delayed) (struct block_list* bl, clr_type type, int64 tick);
+	void (*clearunit_single) (int id, enum clr_type type, int fd);
+	void (*clearunit_area) (struct block_list* bl, enum clr_type type);
+	void (*clearunit_delayed) (struct block_list* bl, enum clr_type type, int64 tick);
 	void (*walkok) (struct map_session_data *sd);
 	void (*move) (struct unit_data *ud);
 	void (*move2) (struct block_list *bl, struct view_data *vd, struct unit_data *ud);
diff --git a/src/map/pc.c b/src/map/pc.c
index 0a2508f29..d9e297e84 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5707,7 +5707,7 @@ static int pc_steal_coin(struct map_session_data *sd, struct block_list *target,
  * 1 - Invalid map index.
  * 2 - Map not in this map-server, and failed to locate alternate map-server.
  *------------------------------------------*/
-static int pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, int y, clr_type clrtype)
+static int pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, int y, enum clr_type clrtype)
 {
 	int16 m;
 
@@ -5947,7 +5947,7 @@ static int pc_setpos(struct map_session_data *sd, unsigned short map_index, int
  *   0 = fail or FIXME success (from pc->setpos)
  *   x(1|2) = fail
  *------------------------------------------*/
-static int pc_randomwarp(struct map_session_data *sd, clr_type type)
+static int pc_randomwarp(struct map_session_data *sd, enum clr_type type)
 {
 	int x,y,i=0;
 	int16 m;
@@ -7946,7 +7946,7 @@ static int pc_skillheal2_bonus(struct map_session_data *sd, uint16 skill_id)
 	return bonus;
 }
 
-static void pc_respawn(struct map_session_data *sd, clr_type clrtype)
+static void pc_respawn(struct map_session_data *sd, enum clr_type clrtype)
 {
 	if( !pc_isdead(sd) )
 		return; // not applicable
diff --git a/src/map/pc.h b/src/map/pc.h
index 8302279b1..cca15e829 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -905,7 +905,7 @@ END_ZEROED_BLOCK; /* End */
 
 	int (*setrestartvalue) (struct map_session_data *sd,int type);
 	int (*makesavestatus) (struct map_session_data *sd);
-	void (*respawn) (struct map_session_data* sd, clr_type clrtype);
+	void (*respawn) (struct map_session_data* sd, enum clr_type clrtype);
 	int (*setnewpc) (struct map_session_data *sd, int account_id, int char_id, int login_id1, unsigned int client_tick, int sex, int fd);
 	bool (*authok) (struct map_session_data *sd, int login_id2, time_t expiration_time, int group_id, const struct mmo_charstatus *st, bool changing_mapservers);
 	void (*authfail) (struct map_session_data *sd);
@@ -927,9 +927,9 @@ END_ZEROED_BLOCK; /* End */
 	int (*calc_skilltree_normalize_job) (struct map_session_data *sd);
 	int (*clean_skilltree) (struct map_session_data *sd);
 
-	int (*setpos) (struct map_session_data* sd, unsigned short map_index, int x, int y, clr_type clrtype);
+	int (*setpos) (struct map_session_data* sd, unsigned short map_index, int x, int y, enum clr_type clrtype);
 	int (*setsavepoint) (struct map_session_data *sd, short map_index, int x, int y);
-	int (*randomwarp) (struct map_session_data *sd,clr_type type);
+	int (*randomwarp) (struct map_session_data *sd, enum clr_type type);
 	int (*memo) (struct map_session_data* sd, int pos);
 
 	int (*checkadditem) (struct map_session_data *sd,int nameid,int amount);
diff --git a/src/map/unit.c b/src/map/unit.c
index ee856cb76..68e6aeec1 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -918,7 +918,7 @@ static int unit_blown(struct block_list *bl, int dx, int dy, int count, int flag
 //Warps a unit/ud to a given map/position.
 //In the case of players, pc->setpos is used.
 //it respects the no warp flags, so it is safe to call this without doing nowarpto/nowarp checks.
-static int unit_warp(struct block_list *bl, short m, short x, short y, clr_type type)
+static int unit_warp(struct block_list *bl, short m, short x, short y, enum clr_type type)
 {
 	struct unit_data *ud;
 	nullpo_ret(bl);
@@ -2419,7 +2419,7 @@ static int unit_changeviewsize(struct block_list *bl, short size)
  * Otherwise it is assumed bl is being warped.
  * On-Kill specific stuff is not performed here, look at status->damage for that.
  *------------------------------------------*/
-static int unit_remove_map(struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func)
+static int unit_remove_map(struct block_list *bl, enum clr_type clrtype, const char *file, int line, const char *func)
 {
 	struct unit_data *ud = unit->bl2ud(bl);
 	struct status_change *sc = status->get_sc(bl);
@@ -2665,7 +2665,7 @@ static int unit_remove_map(struct block_list *bl, clr_type clrtype, const char *
 	return 1;
 }
 
-static void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype)
+static void unit_remove_map_pc(struct map_session_data *sd, enum clr_type clrtype)
 {
 	nullpo_retv(sd);
 	unit->remove_map(&sd->bl,clrtype,ALC_MARK);
@@ -2697,7 +2697,7 @@ static void unit_free_pc(struct map_session_data *sd)
  * Function to free all related resources to the bl
  * if unit is on map, it is removed using the clrtype specified
  *------------------------------------------*/
-static int unit_free(struct block_list *bl, clr_type clrtype)
+static int unit_free(struct block_list *bl, enum clr_type clrtype)
 {
 	struct unit_data *ud = unit->bl2ud( bl );
 	nullpo_ret(bl);
diff --git a/src/map/unit.h b/src/map/unit.h
index 0c1c2405c..5c01cdc2e 100644
--- a/src/map/unit.h
+++ b/src/map/unit.h
@@ -116,7 +116,7 @@ struct unit_interface {
 	int (*setdir) (struct block_list *bl, unsigned char dir);
 	uint8 (*getdir) (struct block_list *bl);
 	int (*blown) (struct block_list *bl, int dx, int dy, int count, int flag);
-	int (*warp) (struct block_list *bl, short m, short x, short y, clr_type type);
+	int (*warp) (struct block_list *bl, short m, short x, short y, enum clr_type type);
 	int (*stop_walking) (struct block_list *bl, int type);
 	int (*skilluse_id) (struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv);
 	int (*step_timer) (int tid, int64 tick, int id, intptr_t data);
@@ -142,10 +142,10 @@ struct unit_interface {
 	int (*counttargeted) (struct block_list *bl);
 	int (*fixdamage) (struct block_list *src, struct block_list *target, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2);
 	int (*changeviewsize) (struct block_list *bl, short size);
-	int (*remove_map) (struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func);
-	void (*remove_map_pc) (struct map_session_data *sd, clr_type clrtype);
+	int (*remove_map) (struct block_list *bl, enum clr_type clrtype, const char *file, int line, const char *func);
+	void (*remove_map_pc) (struct map_session_data *sd, enum clr_type clrtype);
 	void (*free_pc) (struct map_session_data *sd);
-	int (*free) (struct block_list *bl, clr_type clrtype);
+	int (*free) (struct block_list *bl, enum clr_type clrtype);
 };
 
 #ifdef HERCULES_CORE
-- 
cgit v1.2.3-70-g09d2


From 22c267cd1256902d24417cbc0cd5689bc7bad60d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 1 Dec 2018 19:47:45 +0300
Subject: Add packet CZ_START_USE_SKILL

---
 src/map/clif.c           | 99 ++++++++++++++++++++++++++++--------------------
 src/map/clif.h           |  2 +
 src/map/packets.h        |  4 ++
 src/map/packets_struct.h | 10 +++++
 4 files changed, 74 insertions(+), 41 deletions(-)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index e76e9f852..a01b9f7c1 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11999,33 +11999,24 @@ static void clif_parse_UseSkillToPos_mercenary(struct mercenary_data *md, struct
 		unit->skilluse_pos(&md->bl, x, y, skill_id, skill_lv);
 }
 
-static void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
-/// Request to use a targeted skill.
-/// 0113 <skill lv>.W <skill id>.W <target id>.L (CZ_USE_SKILL)
-/// 0438 <skill lv>.W <skill id>.W <target id>.L (CZ_USE_SKILL2)
-/// There are various variants of this packet, some of them have padding between fields.
-static void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
+static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill_id, int skill_lv, int target_id) __attribute__((nonnull (2)));
+static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill_id, int skill_lv, int target_id)
 {
-	uint16 skill_id, skill_lv;
-	int tmp, target_id;
 	int64 tick = timer->gettick();
 
-	skill_lv = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0]);
-	skill_id = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[1]);
-	target_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[2]);
-
-	if( skill_lv < 1 ) skill_lv = 1; //No clue, I have seen the client do this with guild skills :/ [Skotlex]
+	if (skill_lv < 1)
+		skill_lv = 1; //No clue, I have seen the client do this with guild skills :/ [Skotlex]
 
-	tmp = skill->get_inf(skill_id);
-	if (tmp&INF_GROUND_SKILL || !tmp)
+	int tmp = skill->get_inf(skill_id);
+	if (tmp & INF_GROUND_SKILL || !tmp)
 		return; //Using a ground/passive skill on a target? WRONG.
 
-	if( skill_id >= HM_SKILLBASE && skill_id < HM_SKILLBASE + MAX_HOMUNSKILL ) {
+	if (skill_id >= HM_SKILLBASE && skill_id < HM_SKILLBASE + MAX_HOMUNSKILL) {
 		clif->pUseSkillToId_homun(sd->hd, sd, tick, skill_id, skill_lv, target_id);
 		return;
 	}
 
-	if( skill_id >= MC_SKILLBASE && skill_id < MC_SKILLBASE + MAX_MERCSKILL ) {
+	if (skill_id >= MC_SKILLBASE && skill_id < MC_SKILLBASE + MAX_MERCSKILL) {
 		clif->pUseSkillToId_mercenary(sd->md, sd, tick, skill_id, skill_lv, target_id);
 		return;
 	}
@@ -12042,51 +12033,52 @@ static void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 		return;
 	}
 
-	if( pc_cant_act(sd)
-	&& skill_id != RK_REFRESH
-	&& !(skill_id == SR_GENTLETOUCH_CURE && (sd->sc.opt1 == OPT1_STONE || sd->sc.opt1 == OPT1_FREEZE || sd->sc.opt1 == OPT1_STUN))
-	&& (sd->state.storage_flag != STORAGE_FLAG_CLOSED && !(tmp&INF_SELF_SKILL)) // SELF skills can be used with the storage open, issue: 8027
-	)
+	if (pc_cant_act(sd)
+		&& skill_id != RK_REFRESH
+		&& !(skill_id == SR_GENTLETOUCH_CURE && (sd->sc.opt1 == OPT1_STONE || sd->sc.opt1 == OPT1_FREEZE || sd->sc.opt1 == OPT1_STUN))
+		&& (sd->state.storage_flag != STORAGE_FLAG_CLOSED && !(tmp&INF_SELF_SKILL)) // SELF skills can be used with the storage open, issue: 8027
+	) {
 		return;
+	}
 
-	if( pc_issit(sd) )
+	if (pc_issit(sd))
 		return;
 
-	if( skill->not_ok(skill_id, sd) )
+	if (skill->not_ok(skill_id, sd))
 		return;
 
-	if( sd->bl.id != target_id && tmp&INF_SELF_SKILL )
+	if (sd->bl.id != target_id && tmp & INF_SELF_SKILL)
 		target_id = sd->bl.id; // never trust the client
 
-	if( target_id < 0 && -target_id == sd->bl.id ) // for disguises [Valaris]
+	if (target_id < 0 && -target_id == sd->bl.id) // for disguises [Valaris]
 		target_id = sd->bl.id;
 
-	if( sd->ud.skilltimer != INVALID_TIMER ) {
-		if( skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST )
+	if (sd->ud.skilltimer != INVALID_TIMER) {
+		if (skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST)
 			return;
-	} else if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 ) {
-		if( sd->skillitem != skill_id ) {
+	} else if (DIFF_TICK(tick, sd->ud.canact_tick) < 0) {
+		if (sd->skillitem != skill_id) {
 			clif->skill_fail(sd, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0, 0);
 			return;
 		}
 	}
 
-	if( sd->sc.option&OPTION_COSTUME )
+	if (sd->sc.option & OPTION_COSTUME)
 		return;
 
-	if( sd->sc.data[SC_BASILICA] && (skill_id != HP_BASILICA || sd->sc.data[SC_BASILICA]->val4 != sd->bl.id) )
+	if (sd->sc.data[SC_BASILICA] && (skill_id != HP_BASILICA || sd->sc.data[SC_BASILICA]->val4 != sd->bl.id))
 		return; // On basilica only caster can use Basilica again to stop it.
 
-	if( sd->menuskill_id ) {
-		if( sd->menuskill_id == SA_TAMINGMONSTER ) {
+	if (sd->menuskill_id) {
+		if (sd->menuskill_id == SA_TAMINGMONSTER) {
 			clif_menuskill_clear(sd); //Cancel pet capture.
-		} else if( sd->menuskill_id != SA_AUTOSPELL )
+		} else if (sd->menuskill_id != SA_AUTOSPELL)
 			return; //Can't use skills while a menu is open.
 	}
-	if( sd->skillitem == skill_id ) {
-		if( skill_lv != sd->skillitemlv )
+	if (sd->skillitem == skill_id) {
+		if (skill_lv != sd->skillitemlv)
 			skill_lv = sd->skillitemlv;
-		if( !(tmp&INF_SELF_SKILL) )
+		if (!(tmp&INF_SELF_SKILL))
 			pc->delinvincibletimer(sd); // Target skills through items cancel invincibility. [Inkfish]
 		unit->skilluse_id(&sd->bl, target_id, skill_id, skill_lv);
 		return;
@@ -12095,22 +12087,45 @@ static void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 	sd->skillitem = sd->skillitemlv = 0;
 
 	if (skill_id >= GD_SKILLBASE && skill_id < GD_MAX) {
-		if( sd->state.gmaster_flag )
+		if (sd->state.gmaster_flag)
 			skill_lv = guild->checkskill(sd->guild, skill_id);
 		else
 			skill_lv = 0;
 	} else {
 		tmp = pc->checkskill(sd, skill_id);
-		if( skill_lv > tmp )
+		if (skill_lv > tmp)
 			skill_lv = tmp;
 	}
 
 	pc->delinvincibletimer(sd);
 
-	if( skill_lv )
+	if (skill_lv)
 		unit->skilluse_id(&sd->bl, target_id, skill_id, skill_lv);
 }
 
+static void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
+/// Request to use a targeted skill.
+/// 0113 <skill lv>.W <skill id>.W <target id>.L (CZ_USE_SKILL)
+/// 0438 <skill lv>.W <skill id>.W <target id>.L (CZ_USE_SKILL2)
+/// There are various variants of this packet, some of them have padding between fields.
+static void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
+{
+	clif->useSkillToIdReal(fd,
+		sd,
+		RFIFOW(fd, packet_db[RFIFOW(fd, 0)].pos[1]),
+		RFIFOW(fd, packet_db[RFIFOW(fd, 0)].pos[0]),
+		RFIFOL(fd, packet_db[RFIFOW(fd, 0)].pos[2]));
+}
+
+static void clif_parse_startUseSkillToId(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
+static void clif_parse_startUseSkillToId(int fd, struct map_session_data *sd)
+{
+#if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002 || PACKETVER_ZERO_NUM >= 20181010
+	const struct PACKET_CZ_START_USE_SKILL *p = RFIFOP(fd, 0);
+	clif->useSkillToIdReal(fd, sd, p->skillId, p->skillLv, p->targetId);
+#endif
+}
+
 /*==========================================
  * Client tells server he'd like to use AoE skill id 'skill_id' of level 'skill_lv' on 'x','y' location
  *------------------------------------------*/
@@ -22947,6 +22962,8 @@ void clif_defaults(void)
 	clif->pUseSkillToId = clif_parse_UseSkillToId;
 	clif->pUseSkillToId_homun = clif_parse_UseSkillToId_homun;
 	clif->pUseSkillToId_mercenary = clif_parse_UseSkillToId_mercenary;
+	clif->pStartUseSkillToId = clif_parse_startUseSkillToId;
+	clif->useSkillToIdReal = clif_useSkillToIdReal;
 	clif->pUseSkillToPos = clif_parse_UseSkillToPos;
 	clif->pUseSkillToPosSub = clif_parse_UseSkillToPosSub;
 	clif->pUseSkillToPos_homun = clif_parse_UseSkillToPos_homun;
diff --git a/src/map/clif.h b/src/map/clif.h
index 446abe8e3..faf752528 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1290,7 +1290,9 @@ struct clif_interface {
 	void (*pChangeCart) (int fd,struct map_session_data *sd);
 	void (*pStatusUp) (int fd,struct map_session_data *sd);
 	void (*pSkillUp) (int fd,struct map_session_data *sd);
+	void (*useSkillToIdReal) (int fd, struct map_session_data *sd, int skill_id, int skill_lv, int target_id);
 	void (*pUseSkillToId) (int fd, struct map_session_data *sd);
+	void (*pStartUseSkillToId) (int fd, struct map_session_data *sd);
 	void (*pUseSkillToId_homun) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id);
 	void (*pUseSkillToId_mercenary) (struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id);
 	void (*pUseSkillToPos) (int fd, struct map_session_data *sd);
diff --git a/src/map/packets.h b/src/map/packets.h
index 7dbd26a31..4fcb263a2 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1905,4 +1905,8 @@ packet(0x96e,clif->ackmergeitems);
 	packet(0x0a49,clif->pPrivateAirshipRequest); // CZ_PRIVATE_AIRSHIP_REQUEST
 #endif
 
+#if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002 || PACKETVER_ZERO_NUM >= 20181010
+	packet(0x0b10,clif->pStartUseSkillToId);
+#endif
+
 #endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 0542021ec..69df71791 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2965,6 +2965,16 @@ struct PACKET_ZC_SERVICE_MESSAGE_COLOR {
 DEFINE_PACKET_HEADER(ZC_SERVICE_MESSAGE_COLOR, 0x0adb);
 #endif
 
+#if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002 || PACKETVER_ZERO_NUM >= 20181010
+struct PACKET_CZ_START_USE_SKILL {
+	int16 packetType;
+	int16 skillId;
+	int16 skillLv;
+	uint32 targetId;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_START_USE_SKILL, 0x0b10);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2


From d50e10c533cb43d94abf27c7fbb8b5e6c73ce01f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 1 Dec 2018 20:03:46 +0300
Subject: Add packet CZ_STOP_USE_SKILL

---
 src/map/clif.c           | 12 ++++++++++++
 src/map/clif.h           |  1 +
 src/map/packets.h        |  1 +
 src/map/packets_struct.h |  6 ++++++
 4 files changed, 20 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index a01b9f7c1..362264226 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12126,6 +12126,17 @@ static void clif_parse_startUseSkillToId(int fd, struct map_session_data *sd)
 #endif
 }
 
+static void clif_parse_stopUseSkillToId(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
+static void clif_parse_stopUseSkillToId(int fd, struct map_session_data *sd)
+{
+#if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002 || PACKETVER_ZERO_NUM >= 20181010
+	const struct PACKET_CZ_STOP_USE_SKILL *p = RFIFOP(fd, 0);
+	if (p->skillId != GC_ROLLINGCUTTER) {
+		ShowWarning("Packet CZ_STOP_USE_SKILL usage for unknown skill: %d\n", p->skillId);
+	}
+#endif
+}
+
 /*==========================================
  * Client tells server he'd like to use AoE skill id 'skill_id' of level 'skill_lv' on 'x','y' location
  *------------------------------------------*/
@@ -22963,6 +22974,7 @@ void clif_defaults(void)
 	clif->pUseSkillToId_homun = clif_parse_UseSkillToId_homun;
 	clif->pUseSkillToId_mercenary = clif_parse_UseSkillToId_mercenary;
 	clif->pStartUseSkillToId = clif_parse_startUseSkillToId;
+	clif->pStopUseSkillToId = clif_parse_stopUseSkillToId;
 	clif->useSkillToIdReal = clif_useSkillToIdReal;
 	clif->pUseSkillToPos = clif_parse_UseSkillToPos;
 	clif->pUseSkillToPosSub = clif_parse_UseSkillToPosSub;
diff --git a/src/map/clif.h b/src/map/clif.h
index faf752528..147dcfee3 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1293,6 +1293,7 @@ struct clif_interface {
 	void (*useSkillToIdReal) (int fd, struct map_session_data *sd, int skill_id, int skill_lv, int target_id);
 	void (*pUseSkillToId) (int fd, struct map_session_data *sd);
 	void (*pStartUseSkillToId) (int fd, struct map_session_data *sd);
+	void (*pStopUseSkillToId) (int fd, struct map_session_data *sd);
 	void (*pUseSkillToId_homun) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id);
 	void (*pUseSkillToId_mercenary) (struct mercenary_data *md, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id);
 	void (*pUseSkillToPos) (int fd, struct map_session_data *sd);
diff --git a/src/map/packets.h b/src/map/packets.h
index 4fcb263a2..507c8362d 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1907,6 +1907,7 @@ packet(0x96e,clif->ackmergeitems);
 
 #if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002 || PACKETVER_ZERO_NUM >= 20181010
 	packet(0x0b10,clif->pStartUseSkillToId);
+	packet(0x0b11,clif->pStopUseSkillToId);
 #endif
 
 #endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 69df71791..f6b1a61fb 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2973,6 +2973,12 @@ struct PACKET_CZ_START_USE_SKILL {
 	uint32 targetId;
 } __attribute__((packed));
 DEFINE_PACKET_HEADER(CZ_START_USE_SKILL, 0x0b10);
+
+struct PACKET_CZ_STOP_USE_SKILL {
+	int16 packetType;
+	int16 skillId;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_STOP_USE_SKILL, 0x0b11);
 #endif
 
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
-- 
cgit v1.2.3-70-g09d2


From c34b4fbb432350c3632800b53a143a8f54ab7dbc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 13 Dec 2018 20:21:44 +0300
Subject: Add packt ZC_INVENTORY_EXPANSION_INFO

---
 src/common/mmo.h         | 11 +++++++++++
 src/map/clif.c           | 15 +++++++++++++++
 src/map/clif.h           |  1 +
 src/map/packets_struct.h |  8 ++++++++
 src/map/pc.c             |  2 ++
 src/map/pc.h             |  1 +
 6 files changed, 38 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/common/mmo.h b/src/common/mmo.h
index 9bcf82cc7..8b6bef431 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -165,7 +165,18 @@
 #endif
 #define MAX_CARTS (MAX_BASE_CARTS + MAX_CARTDECORATION_CARTS)
 
+#ifndef MAX_INVENTORY
 #define MAX_INVENTORY 100
+#endif
+
+#ifndef FIXED_INVENTORY_SIZE
+#define FIXED_INVENTORY_SIZE 100
+#endif
+
+#if FIXED_INVENTORY_SIZE > MAX_INVENTORY
+#error FIXED_INVENTORY_SIZE must be same or smaller than MAX_INVENTORY
+#endif
+
 //Max number of characters per account. Note that changing this setting alone is not enough if the client is not hexed to support more characters as well.
 #if PACKETVER >= 20100413
 #ifndef MAX_CHARS
diff --git a/src/map/clif.c b/src/map/clif.c
index 45f029487..e1e06d890 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3064,6 +3064,20 @@ static void clif_cartItems(struct map_session_data *sd, enum inventory_type type
 	}
 }
 
+static void clif_inventoryExpansionInfo(struct map_session_data *sd)
+{
+#if PACKETVER_ZERO_NUM >= 20181212
+	nullpo_retv(sd);
+
+	const int fd = sd->fd;
+	WFIFOHEAD(fd, sizeof(struct PACKET_ZC_INVENTORY_EXPANSION_INFO));
+	struct PACKET_ZC_INVENTORY_EXPANSION_INFO *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_INVENTORY_EXPANSION_INFO;
+	p->expansionSize = sd->inventorySize - FIXED_INVENTORY_SIZE;
+	WFIFOSET(fd, sizeof(struct PACKET_ZC_INVENTORY_EXPANSION_INFO));
+#endif
+}
+
 /// Removes cart (ZC_CARTOFF).
 /// 012b
 /// Client behavior:
@@ -22529,6 +22543,7 @@ void clif_defaults(void)
 	clif->equipItems = clif_equipItems;
 	clif->cartList = clif_cartList;
 	clif->cartItems = clif_cartItems;
+	clif->inventoryExpansionInfo = clif_inventoryExpansionInfo;
 	clif->favorite_item = clif_favorite_item;
 	clif->clearcart = clif_clearcart;
 	clif->item_identify_list = clif_item_identify_list;
diff --git a/src/map/clif.h b/src/map/clif.h
index 147dcfee3..de1d2b593 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -851,6 +851,7 @@ struct clif_interface {
 	void (*equipItems) (struct map_session_data *sd, enum inventory_type type);
 	void (*cartList) (struct map_session_data *sd);
 	void (*cartItems) (struct map_session_data *sd, enum inventory_type type);
+	void (*inventoryExpansionInfo) (struct map_session_data *sd);
 	void (*favorite_item) (struct map_session_data* sd, unsigned short index);
 	void (*clearcart) (int fd);
 	void (*item_identify_list) (struct map_session_data *sd);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index f6b1a61fb..78ed1a83b 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2981,6 +2981,14 @@ struct PACKET_CZ_STOP_USE_SKILL {
 DEFINE_PACKET_HEADER(CZ_STOP_USE_SKILL, 0x0b11);
 #endif
 
+#if PACKETVER_ZERO_NUM >= 20181212
+struct PACKET_ZC_INVENTORY_EXPANSION_INFO {
+	int16 packetType;
+	int16 expansionSize;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_INVENTORY_EXPANSION_INFO, 0x0b18);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
diff --git a/src/map/pc.c b/src/map/pc.c
index d9e297e84..39358adf4 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -773,6 +773,7 @@ static int pc_setnewpc(struct map_session_data *sd, int account_id, int char_id,
 	sd->battle_status.speed = sd->base_status.speed = DEFAULT_WALK_SPEED;
 	sd->state.warp_clean = 1;
 	sd->catch_target_class = -1;
+	sd->inventorySize = 100;
 	return 0;
 }
 
@@ -1380,6 +1381,7 @@ static bool pc_authok(struct map_session_data *sd, int login_id2, time_t expirat
 		pc->setpos(sd,sd->status.last_point.map,0,0,CLR_OUTSIGHT);
 	}
 
+	clif->inventoryExpansionInfo(sd);
 	clif->overweight_percent(sd);
 	clif->authok(sd);
 
diff --git a/src/map/pc.h b/src/map/pc.h
index cca15e829..20b995519 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -260,6 +260,7 @@ struct map_session_data {
 
 	struct mmo_charstatus status;
 	struct item_data *inventory_data[MAX_INVENTORY]; // direct pointers to itemdb entries (faster than doing item_id lookups)
+	int inventorySize;
 	struct storage_data storage; ///< Account Storage
 	enum pc_checkitem_types itemcheck;
 	short equip_index[EQI_MAX];
-- 
cgit v1.2.3-70-g09d2


From aee153a9a56ab05464779082a711adc95fb28663 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 13 Dec 2018 20:43:45 +0300
Subject: Add packet ZC_ACK_INVENTORY_EXPAND

---
 src/map/clif.c           | 16 ++++++++++++++++
 src/map/clif.h           |  9 +++++++++
 src/map/packets_struct.h |  9 +++++++++
 3 files changed, 34 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index e1e06d890..34bdb4a2a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3078,6 +3078,21 @@ static void clif_inventoryExpansionInfo(struct map_session_data *sd)
 #endif
 }
 
+static void clif_inventoryExpandAck(struct map_session_data *sd, enum expand_inventory result, int itemId)
+{
+#if PACKETVER_ZERO_NUM >= 20181212
+	nullpo_retv(sd);
+
+	const int fd = sd->fd;
+	WFIFOHEAD(fd, sizeof(struct PACKET_ZC_ACK_INVENTORY_EXPAND));
+	struct PACKET_ZC_ACK_INVENTORY_EXPAND *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_ACK_INVENTORY_EXPAND;
+	p->result = result;
+	p->itemId = itemId;
+	WFIFOSET(fd, sizeof(struct PACKET_ZC_ACK_INVENTORY_EXPAND));
+#endif
+}
+
 /// Removes cart (ZC_CARTOFF).
 /// 012b
 /// Client behavior:
@@ -22544,6 +22559,7 @@ void clif_defaults(void)
 	clif->cartList = clif_cartList;
 	clif->cartItems = clif_cartItems;
 	clif->inventoryExpansionInfo = clif_inventoryExpansionInfo;
+	clif->inventoryExpandAck = clif_inventoryExpandAck;
 	clif->favorite_item = clif_favorite_item;
 	clif->clearcart = clif_clearcart;
 	clif->item_identify_list = clif_item_identify_list;
diff --git a/src/map/clif.h b/src/map/clif.h
index de1d2b593..2c3e7499b 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -677,6 +677,14 @@ enum memorial_dungeon_command {
 	COMMAND_MEMORIALDUNGEON_DESTROY_FORCE = 0x3,
 };
 
+enum expand_inventory {
+	EXPAND_INVENTORY_ASK_CONFIRMATION = 0,
+	EXPAND_INVENTORY_FAILED = 1,
+	EXPAND_INVENTORY_OTHER_WORK = 2,
+	EXPAND_INVENTORY_MISSING_ITEM = 3,
+	EXPAND_INVENTORY_MAX_SIZE = 4
+};
+
 /**
  * Clif.c Interface
  **/
@@ -852,6 +860,7 @@ struct clif_interface {
 	void (*cartList) (struct map_session_data *sd);
 	void (*cartItems) (struct map_session_data *sd, enum inventory_type type);
 	void (*inventoryExpansionInfo) (struct map_session_data *sd);
+	void (*inventoryExpandAck) (struct map_session_data *sd, enum expand_inventory result, int itemId);
 	void (*favorite_item) (struct map_session_data* sd, unsigned short index);
 	void (*clearcart) (int fd);
 	void (*item_identify_list) (struct map_session_data *sd);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 78ed1a83b..663e6cbbf 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2989,6 +2989,15 @@ struct PACKET_ZC_INVENTORY_EXPANSION_INFO {
 DEFINE_PACKET_HEADER(ZC_INVENTORY_EXPANSION_INFO, 0x0b18);
 #endif
 
+#if PACKETVER_ZERO_NUM >= 20181212
+struct PACKET_ZC_ACK_INVENTORY_EXPAND {
+	int16 packetType;
+	uint8 result;
+	uint32 itemId;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_ACK_INVENTORY_EXPAND, 0x0b15);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2


From 52fab52108281d215c61d7fbdb82438c043a10f5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 13 Dec 2018 21:04:58 +0300
Subject: Add packet ZC_ACK_INVENTORY_EXPAND_RESULT

---
 src/map/clif.c           | 15 +++++++++++++++
 src/map/clif.h           |  9 +++++++++
 src/map/packets_struct.h |  8 ++++++++
 3 files changed, 32 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index 34bdb4a2a..863321422 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3093,6 +3093,20 @@ static void clif_inventoryExpandAck(struct map_session_data *sd, enum expand_inv
 #endif
 }
 
+static void clif_inventoryExpandResult(struct map_session_data *sd, enum expand_inventory_result result)
+{
+#if PACKETVER_ZERO_NUM >= 20181212
+	nullpo_retv(sd);
+
+	const int fd = sd->fd;
+	WFIFOHEAD(fd, sizeof(struct PACKET_ZC_ACK_INVENTORY_EXPAND_RESULT));
+	struct PACKET_ZC_ACK_INVENTORY_EXPAND_RESULT *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_ACK_INVENTORY_EXPAND_RESULT;
+	p->result = result;
+	WFIFOSET(fd, sizeof(struct PACKET_ZC_ACK_INVENTORY_EXPAND_RESULT));
+#endif
+}
+
 /// Removes cart (ZC_CARTOFF).
 /// 012b
 /// Client behavior:
@@ -22560,6 +22574,7 @@ void clif_defaults(void)
 	clif->cartItems = clif_cartItems;
 	clif->inventoryExpansionInfo = clif_inventoryExpansionInfo;
 	clif->inventoryExpandAck = clif_inventoryExpandAck;
+	clif->inventoryExpandResult = clif_inventoryExpandResult;
 	clif->favorite_item = clif_favorite_item;
 	clif->clearcart = clif_clearcart;
 	clif->item_identify_list = clif_item_identify_list;
diff --git a/src/map/clif.h b/src/map/clif.h
index 2c3e7499b..c4be2c7ee 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -685,6 +685,14 @@ enum expand_inventory {
 	EXPAND_INVENTORY_MAX_SIZE = 4
 };
 
+enum expand_inventory_result {
+	EXPAND_INVENTORY_RESULT_SUCCESS = 0,
+	EXPAND_INVENTORY_RESULT_FAILED = 1,
+	EXPAND_INVENTORY_RESULT_OTHER_WORK = 2,
+	EXPAND_INVENTORY_RESULT_MISSING_ITEM = 3,
+	EXPAND_INVENTORY_RESULT_MAX_SIZE = 4
+};
+
 /**
  * Clif.c Interface
  **/
@@ -861,6 +869,7 @@ struct clif_interface {
 	void (*cartItems) (struct map_session_data *sd, enum inventory_type type);
 	void (*inventoryExpansionInfo) (struct map_session_data *sd);
 	void (*inventoryExpandAck) (struct map_session_data *sd, enum expand_inventory result, int itemId);
+	void (*inventoryExpandResult) (struct map_session_data *sd, enum expand_inventory_result result);
 	void (*favorite_item) (struct map_session_data* sd, unsigned short index);
 	void (*clearcart) (int fd);
 	void (*item_identify_list) (struct map_session_data *sd);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 663e6cbbf..e7fbdb7bd 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2998,6 +2998,14 @@ struct PACKET_ZC_ACK_INVENTORY_EXPAND {
 DEFINE_PACKET_HEADER(ZC_ACK_INVENTORY_EXPAND, 0x0b15);
 #endif
 
+#if PACKETVER_ZERO_NUM >= 20181212
+struct PACKET_ZC_ACK_INVENTORY_EXPAND_RESULT {
+	int16 packetType;
+	uint8 result;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_ACK_INVENTORY_EXPAND_RESULT, 0x0b17);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2


From 60a03815c37f04485c048bb3e4f37960b6ba18cb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 13 Dec 2018 21:33:08 +0300
Subject: Add packet CZ_INVENTORY_EXPAND

---
 src/map/clif.c           | 17 +++++++++++++++++
 src/map/clif.h           |  1 +
 src/map/packets.h        |  4 ++++
 src/map/packets_struct.h |  7 +++++++
 4 files changed, 29 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index 863321422..10f6f0bdc 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3107,6 +3107,22 @@ static void clif_inventoryExpandResult(struct map_session_data *sd, enum expand_
 #endif
 }
 
+static void clif_parse_inventoryExpansion(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
+static void clif_parse_inventoryExpansion(int fd, struct map_session_data *sd)
+{
+#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
+	char evname[EVENT_NAME_LENGTH];
+	struct event_data *ev = NULL;
+
+	safestrncpy(evname, "inventory_expansion::OnInvExpandRequest", EVENT_NAME_LENGTH);
+	if ((ev = strdb_get(npc->ev_db, evname))) {
+		script->run_npc(ev->nd->u.scr.script, ev->pos, sd->bl.id, ev->nd->bl.id);
+	} else {
+		ShowError("clif_parse_inventoryExpansion: event '%s' not found, operation failed.\n", evname);
+	}
+#endif
+}
+
 /// Removes cart (ZC_CARTOFF).
 /// 012b
 /// Client behavior:
@@ -22575,6 +22591,7 @@ void clif_defaults(void)
 	clif->inventoryExpansionInfo = clif_inventoryExpansionInfo;
 	clif->inventoryExpandAck = clif_inventoryExpandAck;
 	clif->inventoryExpandResult = clif_inventoryExpandResult;
+	clif->pInventoryExpansion = clif_parse_inventoryExpansion;
 	clif->favorite_item = clif_favorite_item;
 	clif->clearcart = clif_clearcart;
 	clif->item_identify_list = clif_item_identify_list;
diff --git a/src/map/clif.h b/src/map/clif.h
index c4be2c7ee..7993429a1 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -870,6 +870,7 @@ struct clif_interface {
 	void (*inventoryExpansionInfo) (struct map_session_data *sd);
 	void (*inventoryExpandAck) (struct map_session_data *sd, enum expand_inventory result, int itemId);
 	void (*inventoryExpandResult) (struct map_session_data *sd, enum expand_inventory_result result);
+	void (*pInventoryExpansion) (int fd, struct map_session_data *sd);
 	void (*favorite_item) (struct map_session_data* sd, unsigned short index);
 	void (*clearcart) (int fd);
 	void (*item_identify_list) (struct map_session_data *sd);
diff --git a/src/map/packets.h b/src/map/packets.h
index 507c8362d..4e81b3bf3 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1910,4 +1910,8 @@ packet(0x96e,clif->ackmergeitems);
 	packet(0x0b11,clif->pStopUseSkillToId);
 #endif
 
+#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
+	packet(0x0b14,clif->pInventoryExpansion);
+#endif
+
 #endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index e7fbdb7bd..ad67091dc 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3006,6 +3006,13 @@ struct PACKET_ZC_ACK_INVENTORY_EXPAND_RESULT {
 DEFINE_PACKET_HEADER(ZC_ACK_INVENTORY_EXPAND_RESULT, 0x0b17);
 #endif
 
+#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
+struct PACKET_CZ_INVENTORY_EXPAND {
+	int16 packetType;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_INVENTORY_EXPAND, 0x0b14);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2


From 392c598c6ee3ce9e10eec9e44d6c2f93d4dae232 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 14 Dec 2018 00:16:13 +0300
Subject: Add packet CZ_INVENTORY_EXPAND_CONFIRMED

---
 src/map/clif.c           | 17 +++++++++++++++++
 src/map/clif.h           |  1 +
 src/map/packets.h        |  1 +
 src/map/packets_struct.h |  7 +++++++
 4 files changed, 26 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index 10f6f0bdc..a9fc3be74 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3123,6 +3123,22 @@ static void clif_parse_inventoryExpansion(int fd, struct map_session_data *sd)
 #endif
 }
 
+static void clif_parse_inventoryExpansionConfirmed(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
+static void clif_parse_inventoryExpansionConfirmed(int fd, struct map_session_data *sd)
+{
+#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
+	char evname[EVENT_NAME_LENGTH];
+	struct event_data *ev = NULL;
+
+	safestrncpy(evname, "inventory_expansion::OnInvExpandConfirmed", EVENT_NAME_LENGTH);
+	if ((ev = strdb_get(npc->ev_db, evname))) {
+		script->run_npc(ev->nd->u.scr.script, ev->pos, sd->bl.id, ev->nd->bl.id);
+	} else {
+		ShowError("clif_parse_inventoryExpansionConfirmed: event '%s' not found, operation failed.\n", evname);
+	}
+#endif
+}
+
 /// Removes cart (ZC_CARTOFF).
 /// 012b
 /// Client behavior:
@@ -22592,6 +22608,7 @@ void clif_defaults(void)
 	clif->inventoryExpandAck = clif_inventoryExpandAck;
 	clif->inventoryExpandResult = clif_inventoryExpandResult;
 	clif->pInventoryExpansion = clif_parse_inventoryExpansion;
+	clif->pInventoryExpansionConfirmed = clif_parse_inventoryExpansionConfirmed;
 	clif->favorite_item = clif_favorite_item;
 	clif->clearcart = clif_clearcart;
 	clif->item_identify_list = clif_item_identify_list;
diff --git a/src/map/clif.h b/src/map/clif.h
index 7993429a1..6e743e57f 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -871,6 +871,7 @@ struct clif_interface {
 	void (*inventoryExpandAck) (struct map_session_data *sd, enum expand_inventory result, int itemId);
 	void (*inventoryExpandResult) (struct map_session_data *sd, enum expand_inventory_result result);
 	void (*pInventoryExpansion) (int fd, struct map_session_data *sd);
+	void (*pInventoryExpansionConfirmed) (int fd, struct map_session_data *sd);
 	void (*favorite_item) (struct map_session_data* sd, unsigned short index);
 	void (*clearcart) (int fd);
 	void (*item_identify_list) (struct map_session_data *sd);
diff --git a/src/map/packets.h b/src/map/packets.h
index 4e81b3bf3..bad3aa915 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1912,6 +1912,7 @@ packet(0x96e,clif->ackmergeitems);
 
 #if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
 	packet(0x0b14,clif->pInventoryExpansion);
+	packet(0x0b16,clif->pInventoryExpansionConfirmed);
 #endif
 
 #endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index ad67091dc..ea385963c 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3013,6 +3013,13 @@ struct PACKET_CZ_INVENTORY_EXPAND {
 DEFINE_PACKET_HEADER(CZ_INVENTORY_EXPAND, 0x0b14);
 #endif
 
+#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
+struct PACKET_CZ_INVENTORY_EXPAND_CONFIRMED {
+	int16 packetType;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_INVENTORY_EXPAND_CONFIRMED, 0x0b16);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2


From 1a26402c3bd986d0bba0435bfbd62e32abf07302 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 14 Dec 2018 00:40:16 +0300
Subject: Add packet CZ_INVENTORY_EXPAND_REJECTED

---
 src/map/clif.c           | 17 +++++++++++++++++
 src/map/clif.h           |  1 +
 src/map/packets.h        |  1 +
 src/map/packets_struct.h |  7 +++++++
 4 files changed, 26 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index a9fc3be74..659ff920e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3139,6 +3139,22 @@ static void clif_parse_inventoryExpansionConfirmed(int fd, struct map_session_da
 #endif
 }
 
+static void clif_parse_inventoryExpansionRejected(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
+static void clif_parse_inventoryExpansionRejected(int fd, struct map_session_data *sd)
+{
+#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
+	char evname[EVENT_NAME_LENGTH];
+	struct event_data *ev = NULL;
+
+	safestrncpy(evname, "inventory_expansion::OnInvExpandRejected", EVENT_NAME_LENGTH);
+	if ((ev = strdb_get(npc->ev_db, evname))) {
+		script->run_npc(ev->nd->u.scr.script, ev->pos, sd->bl.id, ev->nd->bl.id);
+	} else {
+		ShowError("clif_parse_inventoryExpansionRejected: event '%s' not found, operation failed.\n", evname);
+	}
+#endif
+}
+
 /// Removes cart (ZC_CARTOFF).
 /// 012b
 /// Client behavior:
@@ -22609,6 +22625,7 @@ void clif_defaults(void)
 	clif->inventoryExpandResult = clif_inventoryExpandResult;
 	clif->pInventoryExpansion = clif_parse_inventoryExpansion;
 	clif->pInventoryExpansionConfirmed = clif_parse_inventoryExpansionConfirmed;
+	clif->pInventoryExpansionRejected = clif_parse_inventoryExpansionRejected;
 	clif->favorite_item = clif_favorite_item;
 	clif->clearcart = clif_clearcart;
 	clif->item_identify_list = clif_item_identify_list;
diff --git a/src/map/clif.h b/src/map/clif.h
index 6e743e57f..47766b33d 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -872,6 +872,7 @@ struct clif_interface {
 	void (*inventoryExpandResult) (struct map_session_data *sd, enum expand_inventory_result result);
 	void (*pInventoryExpansion) (int fd, struct map_session_data *sd);
 	void (*pInventoryExpansionConfirmed) (int fd, struct map_session_data *sd);
+	void (*pInventoryExpansionRejected) (int fd, struct map_session_data *sd);
 	void (*favorite_item) (struct map_session_data* sd, unsigned short index);
 	void (*clearcart) (int fd);
 	void (*item_identify_list) (struct map_session_data *sd);
diff --git a/src/map/packets.h b/src/map/packets.h
index bad3aa915..4ce7ee916 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1913,6 +1913,7 @@ packet(0x96e,clif->ackmergeitems);
 #if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
 	packet(0x0b14,clif->pInventoryExpansion);
 	packet(0x0b16,clif->pInventoryExpansionConfirmed);
+	packet(0x0b19,clif->pInventoryExpansionRejected);
 #endif
 
 #endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index ea385963c..c075d8674 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3020,6 +3020,13 @@ struct PACKET_CZ_INVENTORY_EXPAND_CONFIRMED {
 DEFINE_PACKET_HEADER(CZ_INVENTORY_EXPAND_CONFIRMED, 0x0b16);
 #endif
 
+#if PACKETVER_MAIN_NUM >= 20181031 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20181114
+struct PACKET_CZ_INVENTORY_EXPAND_REJECTED {
+	int16 packetType;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_INVENTORY_EXPAND_REJECTED, 0x0b19);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2


From 59eb8ed011d447ba91c085590c11e2681773d2a0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 14 Dec 2018 23:51:48 +0300
Subject: Add packet CZ_REQ_REMAINTIME (with empty handler)

---
 src/map/clif.c           | 7 +++++++
 src/map/clif.h           | 1 +
 src/map/packets.h        | 1 +
 src/map/packets_struct.h | 5 +++++
 4 files changed, 14 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index a81b967d1..b0698fefd 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3173,6 +3173,12 @@ static void clif_parse_inventoryExpansionRejected(int fd, struct map_session_dat
 #endif
 }
 
+// CZ_REQ_REMAINTIME
+static void clif_parse_reqRemainTime(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
+static void clif_parse_reqRemainTime(int fd, struct map_session_data *sd)
+{
+}
+
 /// Removes cart (ZC_CARTOFF).
 /// 012b
 /// Client behavior:
@@ -23362,4 +23368,5 @@ void clif_defaults(void)
 	clif->petEvolutionResult = clif_pet_evolution_result;
 
 	clif->pMemorialDungeonCommand = clif_parse_memorial_dungeon_command;
+	clif->pReqRemainTime = clif_parse_reqRemainTime;
 }
diff --git a/src/map/clif.h b/src/map/clif.h
index 47766b33d..568c312cf 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1585,6 +1585,7 @@ struct clif_interface {
 	void (*camera_change) (struct map_session_data *sd, float range, float rotation, float latitude, enum send_target target);
 	void (*item_preview) (struct map_session_data *sd, int n);
 	bool (*enchant_equipment) (struct map_session_data *sd, enum equip_pos pos, int cardSlot, int cardId);
+	void (*pReqRemainTime) (int fd, struct map_session_data *sd);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/packets.h b/src/map/packets.h
index 4ce7ee916..8e392cc63 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -147,6 +147,7 @@ packet(0x01ba,clif->pGMShift,2);
 packet(0x01bb,clif->pGMShift,2);
 packet(0x01bc,clif->pGMRecall,2);
 packet(0x01bd,clif->pGMRecall,2);
+packet(0x01c0,clif->pReqRemainTime);
 packet(0x01ce,clif->pAutoSpell,2);
 packet(0x01d5,clif->pNpcStringInput,2,4,8);
 packet(0x01df,clif->pGMReqAccountName,2);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 1283f8494..26e6343d7 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3029,6 +3029,11 @@ struct PACKET_CZ_INVENTORY_EXPAND_REJECTED {
 DEFINE_PACKET_HEADER(CZ_INVENTORY_EXPAND_REJECTED, 0x0b19);
 #endif
 
+struct PACKET_CZ_REQ_REMAINTIME {
+	int16 packetType;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_REQ_REMAINTIME, 0x01c0);
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
-- 
cgit v1.2.3-70-g09d2


From 912bbffb23c385178b3d831b58deb76103bac322 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 16 Dec 2018 05:14:33 +0300
Subject: Add packet CZ_CAMERA_INFO

This will allow use client command:
 /viewpointvalue - show/hide camera information
 /setcamera range rotation latitude - same with @camerainfo
---
 src/map/clif.c           | 16 ++++++++++++++++
 src/map/clif.h           |  1 +
 src/map/packets.h        |  5 +++++
 src/map/packets_struct.h | 11 +++++++++++
 4 files changed, 33 insertions(+)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.c b/src/map/clif.c
index e9c69257b..fd3c01168 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -22148,6 +22148,21 @@ static void clif_camera_change(struct map_session_data *sd, float range, float r
 #endif
 }
 
+static void clif_parse_cameraInfo(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
+static void clif_parse_cameraInfo(int fd, struct map_session_data *sd)
+{
+#if PACKETVER >= 20160525
+	const struct PACKET_CZ_CAMERA_INFO *const p = RFIFOP(fd, 0);
+	char command[100];
+	if (p->action == 1) {
+		sprintf(command, "%ccamerainfo", atcommand->at_symbol);
+	} else {
+		sprintf(command, "%ccamerainfo %15f %15f %15f", atcommand->at_symbol, p->range, p->rotation, p->latitude);
+	}
+	atcommand->exec(fd, sd, command, true);
+#endif
+}
+
 // show item preview in already opened preview window
 static void clif_item_preview(struct map_session_data *sd, int n)
 {
@@ -23361,6 +23376,7 @@ void clif_defaults(void)
 
 	clif->camera_showWindow = clif_camera_showWindow;
 	clif->camera_change = clif_camera_change;
+	clif->pCameraInfo = clif_parse_cameraInfo;
 	clif->item_preview = clif_item_preview;
 	clif->enchant_equipment = clif_enchant_equipment;
 
diff --git a/src/map/clif.h b/src/map/clif.h
index 568c312cf..170e9639d 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1583,6 +1583,7 @@ struct clif_interface {
 	void (*pMemorialDungeonCommand) (int fd, struct map_session_data *sd);
 	void (*camera_showWindow) (struct map_session_data *sd);
 	void (*camera_change) (struct map_session_data *sd, float range, float rotation, float latitude, enum send_target target);
+	void (*pCameraInfo) (int fd, struct map_session_data *sd);
 	void (*item_preview) (struct map_session_data *sd, int n);
 	bool (*enchant_equipment) (struct map_session_data *sd, enum equip_pos pos, int cardSlot, int cardId);
 	void (*pReqRemainTime) (int fd, struct map_session_data *sd);
diff --git a/src/map/packets.h b/src/map/packets.h
index 8e392cc63..81b861f78 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1789,6 +1789,11 @@ packet(0x96e,clif->ackmergeitems);
 // changed packet sizes
 #endif
 
+// all 2016-05-25
+#if PACKETVER >= 20160525
+	packet(0x0a77,clif->pCameraInfo); // CZ_CAMERA_INFO
+#endif
+
 // 2017-02-28aRagexeRE
 #if PACKETVER >= 20170228
 // new packets
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 8fbe64e5f..95bf65b6d 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2907,6 +2907,17 @@ struct PACKET_ZC_CAMERA_INFO {
 DEFINE_PACKET_HEADER(ZC_CAMERA_INFO, 0x0a78);
 #endif
 
+#if PACKETVER >= 20160525
+struct PACKET_CZ_CAMERA_INFO {
+	int16 packetType;
+	int8 action;
+	float range;
+	float rotation;
+	float latitude;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(CZ_CAMERA_INFO, 0x0a77);
+#endif
+
 #if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031
 // PACKET_ZC_AUTOSPELLLIST2
 struct PACKET_ZC_AUTOSPELLLIST {
-- 
cgit v1.2.3-70-g09d2


From ad608a2b826a792834531bfe54ae6b5a12692f50 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 16 Dec 2018 08:53:22 +0300
Subject: Add missing values into enum cz_ui_types

---
 src/map/clif.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/map/clif.h')

diff --git a/src/map/clif.h b/src/map/clif.h
index 170e9639d..91a91b5d3 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -587,8 +587,8 @@ enum zc_ui_types {
 **/
 enum cz_ui_types {
 	CZ_STYLIST_UI = 1,
-	//unknown  = 2,
-	//unknown  = 3,
+	CZ_MACRO_REGISTER_UI = 2,
+	CZ_MACRO_DETECTOR_UI = 3,
 	CZ_ATTENDANCE_UI = 5
 };
 
-- 
cgit v1.2.3-70-g09d2