Merge branch 'master' into cell_noskill

1 files changed, 122 insertions, 16 deletions

diff --git a/src/map/script.h b/src/map/script.h
index 549ad3284..511497a66 100644
--- a/src/map/script.h
+++ b/src/map/script.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
@@ -343,7 +343,9 @@ enum {
 	MF_NOAUTOLOOT,
 	MF_NOVIEWID,
 	MF_PAIRSHIP_STARTABLE,
-	MF_PAIRSHIP_ENDABLE
+	MF_PAIRSHIP_ENDABLE,
+	MF_NOSTORAGE,
+	MF_NOGSTORAGE
 };
 
 enum navigation_service {
@@ -431,6 +433,8 @@ enum script_unit_data_types {
 	UDT_STATPOINT,
 	UDT_ROBE,
 	UDT_BODY2,
+	UDT_GROUP,
+	UDT_DAMAGE_TAKEN_RATE,
 	UDT_MAX
 };
 
@@ -456,24 +460,121 @@ enum script_iteminfo_types {
 	ITEMINFO_MATK,
 	ITEMINFO_VIEWSPRITE,
 	ITEMINFO_TRADE,
-
+	ITEMINFO_ELV_MAX,
+	ITEMINFO_DROPEFFECT_MODE,
+	ITEMINFO_DELAY,
+	ITEMINFO_CLASS_BASE_1,
+	ITEMINFO_CLASS_BASE_2,
+	ITEMINFO_CLASS_BASE_3,
+	ITEMINFO_CLASS_UPPER,
+	// ITEMINFO_FLAG_AVAILABLE,
+	ITEMINFO_FLAG_NO_REFINE,
+	ITEMINFO_FLAG_DELAY_CONSUME,
+	ITEMINFO_FLAG_AUTOEQUIP,
+	ITEMINFO_FLAG_AUTO_FAVORITE,
+	ITEMINFO_FLAG_BUYINGSTORE,
+	ITEMINFO_FLAG_BINDONEQUIP,
+	ITEMINFO_FLAG_KEEPAFTERUSE,
+	ITEMINFO_FLAG_FORCE_SERIAL,
+	ITEMINFO_FLAG_NO_OPTIONS,
+	ITEMINFO_FLAG_DROP_ANNOUNCE,
+	ITEMINFO_FLAG_SHOWDROPEFFECT,
+	ITEMINFO_STACK_AMOUNT,
+	ITEMINFO_STACK_FLAG,
+	ITEMINFO_ITEM_USAGE_FLAG,
+	ITEMINFO_ITEM_USAGE_OVERRIDE,
+	ITEMINFO_GM_LV_TRADE_OVERRIDE,
+	ITEMINFO_ID,
+	ITEMINFO_AEGISNAME,
+	ITEMINFO_NAME,
 	ITEMINFO_MAX
 };
 
 /**
+ * Mercenary Info types.
+ */
+enum script_mercinfo_types {
+	MERCINFO_ID = 0,
+	MERCINFO_CLASS,
+	MERCINFO_NAME,
+	MERCINFO_FAITH,
+	MERCINFO_CALLS,
+	MERCINFO_KILLCOUNT,
+	MERCINFO_LIFETIME,
+	MERCINFO_LEVEL,
+	MERCINFO_GID,
+
+	MERCINFO_MAX
+};
+
+/**
+ * Pet Info types.
+ */
+enum script_petinfo_types {
+	PETINFO_ID = 0,
+	PETINFO_CLASS,
+	PETINFO_NAME,
+	PETINFO_INTIMACY,
+	PETINFO_HUNGRY,
+	PETINFO_RENAME,
+	PETINFO_GID,
+	PETINFO_EGGITEM,
+	PETINFO_FOODITEM,
+	PETINFO_ACCESSORYITEM,
+	PETINFO_ACCESSORYFLAG,
+	PETINFO_EVO_EGGID,
+	PETINFO_AUTOFEED,
+
+	PETINFO_MAX
+};
+
+/**
  * Player blocking actions related flags.
  */
 enum pcblock_action_flag {
-	PCBLOCK_NONE     = 0x00,
-	PCBLOCK_MOVE     = 0x01,
-	PCBLOCK_ATTACK   = 0x02,
-	PCBLOCK_SKILL    = 0x04,
-	PCBLOCK_USEITEM  = 0x08,
-	PCBLOCK_CHAT     = 0x10,
-	PCBLOCK_IMMUNE   = 0x20,
-	PCBLOCK_SITSTAND = 0x40,
-	PCBLOCK_COMMANDS = 0x80,
-	PCBLOCK_ALL      = 0xFF,
+	PCBLOCK_NONE     = 0x000,
+	PCBLOCK_MOVE     = 0x001,
+	PCBLOCK_ATTACK   = 0x002,
+	PCBLOCK_SKILL    = 0x004,
+	PCBLOCK_USEITEM  = 0x008,
+	PCBLOCK_CHAT     = 0x010,
+	PCBLOCK_IMMUNE   = 0x020,
+	PCBLOCK_SITSTAND = 0x040,
+	PCBLOCK_COMMANDS = 0x080,
+	PCBLOCK_NPC      = 0x100,
+	PCBLOCK_ALL      = 0x1FF,
+};
+
+/**
+ * Types of Siege (WoE)
+ */
+enum siege_type {
+	SIEGE_TYPE_FE,
+	SIEGE_TYPE_SE,
+	SIEGE_TYPE_TE,
+	SIEGE_TYPE_MAX
+};
+
+/**
+ * Types of MadoGear
+ */
+enum mado_type {
+	MADO_ROBOT = 0x00,
+	// unused  = 0x01,
+	MADO_SUITE = 0x02,
+#ifndef MADO_MAX
+	MADO_MAX
+#endif
+};
+
+/**
+ * Option flags for itemskill() script command.
+ **/
+enum itemskill_flag {
+	ISF_NONE = 0x00,
+	ISF_CHECKCONDITIONS = 0x01, // Check skill conditions and consume them.
+	ISF_INSTANTCAST = 0x02, // Cast skill instantaneously.
+	ISF_CASTONSELF = 0x04, // Forcefully cast skill on invoking character without showing the target selection cursor.
 };
 
 /**
@@ -964,16 +1065,21 @@ struct script_interface {
 	int (*string_dup) (char *str);
 	void (*load_translations) (void);
 	bool (*load_translation_addstring) (const char *file, uint8 lang_id, const char *msgctxt, const struct script_string_buf *msgid, const struct script_string_buf *msgstr);
-	int (*load_translation) (const char *file, uint8 lang_id);
+	int (*load_translation_file) (const char *file, uint8 lang_id);
+	int (*load_translation) (const char *directory, uint8 lang_id);
 	int (*translation_db_destroyer) (union DBKey key, struct DBData *data, va_list ap);
 	void (*clear_translations) (bool reload);
 	int (*parse_cleanup_timer) (int tid, int64 tick, int id, intptr_t data);
 	uint8 (*add_language) (const char *name);
-	const char *(*get_translation_file_name) (const char *file);
+	const char *(*get_translation_dir_name) (const char *directory);
 	void (*parser_clean_leftovers) (void);
 	void (*run_use_script) (struct map_session_data *sd, struct item_data *data, int oid);
 	void (*run_item_equip_script) (struct map_session_data *sd, struct item_data *data, int oid);
 	void (*run_item_unequip_script) (struct map_session_data *sd, struct item_data *data, int oid);
+	void (*run_item_rental_end_script) (struct map_session_data *sd, struct item_data *data, int oid);
+	void (*run_item_rental_start_script) (struct map_session_data *sd, struct item_data *data, int oid);
+	void (*run_item_lapineddukddak_script) (struct map_session_data *sd, struct item_data *data, int oid);
+	bool (*sellitemcurrency_add) (struct npc_data *nd, struct script_state* st, int argIndex);
 };
 
 #ifdef HERCULES_CORE