Merge branch 'master' into configure_newopt

1 files changed, 47 insertions, 19 deletions

diff --git a/src/map/npc.h b/src/map/npc.h
index ed5f4138d..1585a2bc8 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -2,8 +2,8 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2018  Hercules Dev Team
- * Copyright (C)  Athena Dev Teams
+ * Copyright (C) 2012-2020 Hercules Dev Team
+ * Copyright (C) Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,8 @@ struct hplugin_data_store;
 struct itemlist; // map/itemdb.h
 struct view_data;
 
+enum market_buy_result;
+
 enum npc_parse_options {
 	NPO_NONE  = 0x0,
 	NPO_ONINIT  = 0x1,
@@ -41,10 +43,12 @@ enum npc_parse_options {
 };
 
 enum npc_shop_types {
-	NST_ZENY,/* default */
-	NST_CASH,/* official npc cash shop */
-	NST_MARKET,/* official npc market type */
+	NST_ZENY,   /* default */
+	NST_CASH,   /* official npc cash shop */
+	NST_MARKET, /* official npc market type */
 	NST_CUSTOM,
+	NST_BARTER, /* official npc barter type */
+	NST_EXPANDED_BARTER, /* official npc expanded barter type */
 	/* */
 	NST_MAX,
 };
@@ -56,15 +60,26 @@ struct npc_label_list {
 	char name[NAME_LENGTH];
 	int pos;
 };
+
+struct npc_barter_currency {
+	int nameid;
+	int refine;
+	int amount;
+};
+
 struct npc_item_list {
 	int nameid;
-	unsigned int value;
-	unsigned int qty;
+	unsigned int value;  // price or barter currency item id
+	int value2;  // barter currency item amount / expanded barter currency size
+	int qty;
+	struct npc_barter_currency *currency;
 };
+
 struct npc_shop_data {
 	unsigned char type;/* what am i */
 	struct npc_item_list *item;/* list */
 	unsigned int items;/* total */
+	int shop_last_index;  // only for NST_EXPANDED_BARTER
 };
 struct npc_parse;
 struct npc_data {
@@ -73,14 +88,14 @@ struct npc_data {
 	struct view_data vd;
 	unsigned int option;
 	struct npc_data *master_nd;
-	short class_;
+	int class_;
 	short speed;
 	char name[NAME_LENGTH+1];// display name
 	char exname[NAME_LENGTH+1];// unique npc name
 	int chat_id;
 	int touching_id;
 	int64 next_walktime;
-	uint8 dir;
+	enum unit_dir dir;
 	uint8 area_size;
 
 	int clan_id;
@@ -125,6 +140,7 @@ struct npc_data {
 			int spawn_timer;
 		} tomb;
 	} u;
+	VECTOR_DECL(struct questinfo) qi_data;
 	struct hplugin_data_store *hdata; ///< HPM Plugin Data Store
 };
 
@@ -144,7 +160,7 @@ enum actor_classes {
 #define MAX_NPC_CLASS 1000
 // New NPC range
 #define MAX_NPC_CLASS2_START 10001
-#define MAX_NPC_CLASS2_END 10310
+#define MAX_NPC_CLASS2_END 10344
 
 //Script NPC events.
 enum npce_event {
@@ -254,8 +270,9 @@ struct npc_interface {
 	int (*unload_ev) (union DBKey key, struct DBData *data, va_list ap);
 	int (*unload_ev_label) (union DBKey key, struct DBData *data, va_list ap);
 	int (*unload_dup_sub) (struct npc_data *nd, va_list args);
-	void (*unload_duplicates) (struct npc_data *nd);
-	int (*unload) (struct npc_data *nd, bool single);
+	void (*unload_duplicates) (struct npc_data *nd, bool unload_mobs);
+	int (*unload_mob) (struct mob_data *md, va_list args);
+	int (*unload) (struct npc_data *nd, bool single, bool unload_mobs);
 	void (*clearsrcfile) (void);
 	void (*addsrcfile) (const char *name);
 	void (*delsrcfile) (const char *name);
@@ -264,7 +281,7 @@ struct npc_interface {
 	void (*parsename) (struct npc_data *nd, const char *name, const char *start, const char *buffer, const char *filepath);
 	int (*parseview) (const char *w4, const char *start, const char *buffer, const char *filepath);
 	bool (*viewisid) (const char *viewid);
-	struct npc_data *(*create_npc) (enum npc_subtype subtype, int m, int x, int y, uint8 dir, int16 class_);
+	struct npc_data *(*create_npc) (enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_);
 	struct npc_data* (*add_warp) (char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y);
 	const char *(*parse_warp) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval);
 	const char *(*parse_shop) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval);
@@ -284,7 +301,7 @@ struct npc_interface {
 	void (*unsetcells) (struct npc_data *nd);
 	void (*movenpc) (struct npc_data *nd, int16 x, int16 y);
 	void (*setdisplayname) (struct npc_data *nd, const char *newname);
-	void (*setclass) (struct npc_data *nd, short class_);
+	void (*setclass) (struct npc_data *nd, int class_);
 	int (*do_atcmd_event) (struct map_session_data *sd, const char *command, const char *message, const char *eventname);
 	const char *(*parse_function) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval);
 	void (*parse_mob2) (struct spawn_data *mobspawn);
@@ -297,7 +314,7 @@ struct npc_interface {
 	int (*path_db_clear_sub) (union DBKey key, struct DBData *data, va_list args);
 	int (*ev_label_db_clear_sub) (union DBKey key, struct DBData *data, va_list args);
 	int (*reload) (void);
-	bool (*unloadfile) (const char *filepath);
+	bool (*unloadfile) (const char *filepath, bool unload_mobs);
 	void (*do_clear_npc) (void);
 	void (*debug_warps_sub) (struct npc_data *nd);
 	void (*debug_warps) (void);
@@ -305,14 +322,25 @@ struct npc_interface {
 	void (*trader_count_funds) (struct npc_data *nd, struct map_session_data *sd);
 	bool (*trader_pay) (struct npc_data *nd, struct map_session_data *sd, int price, int points);
 	void (*trader_update) (int master);
-	int (*market_buylist) (struct map_session_data *sd, struct itemlist *item_list);
+	enum market_buy_result (*market_buylist) (struct map_session_data *sd, struct itemlist *item_list);
+	int (*barter_buylist) (struct map_session_data *sd, struct barteritemlist *item_list);
+	int (*expanded_barter_buylist) (struct map_session_data *sd, struct barteritemlist *item_list);
 	bool (*trader_open) (struct map_session_data *sd, struct npc_data *nd);
 	void (*market_fromsql) (void);
-	void (*market_tosql) (struct npc_data *nd, unsigned short index);
-	void (*market_delfromsql) (struct npc_data *nd, unsigned short index);
-	void (*market_delfromsql_sub) (const char *npcname, unsigned short index);
+	void (*market_tosql) (struct npc_data *nd, int index);
+	void (*market_delfromsql) (struct npc_data *nd, int index);
+	void (*market_delfromsql_sub) (const char *npcname, int index);
+	void (*barter_fromsql) (void);
+	void (*barter_tosql) (struct npc_data *nd, int index);
+	void (*barter_delfromsql) (struct npc_data *nd, int index);
+	void (*barter_delfromsql_sub) (const char *npcname, int itemId, int itemId2, int amount2);
+	void (*expanded_barter_fromsql) (void);
+	void (*expanded_barter_tosql) (struct npc_data *nd, int index);
+	void (*expanded_barter_delfromsql) (struct npc_data *nd, int index);
+	void (*expanded_barter_delfromsql_sub) (const char *npcname, int itemId, int zeny, int currencyCount, struct npc_barter_currency* currency);
 	bool (*db_checkid) (const int id);
 	void (*refresh) (struct npc_data* nd);
+	void (*questinfo_clear) (struct npc_data *nd);
 	/**
 	 * For the Secure NPC Timeout option (check config/Secure.h) [RR]
 	 **/