summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorIbrahim Hossam <ibrahem.h.basyone@gmail.com>2015-07-06 21:38:11 +0200
committerIbrahim Hossam <ibrahem.h.basyone@gmail.com>2015-07-08 03:26:34 +0200
commit856b6f1feb25ca74d716a4c22fff650e0ff065a0 (patch)
treec3035ea753ff2c79c1e969056a120998e4f2dd2c /src/map/script.c
parent0177783215ae97d08109f7af91a20b78b6a0df90 (diff)
downloadhercules-856b6f1feb25ca74d716a4c22fff650e0ff065a0.tar.gz
hercules-856b6f1feb25ca74d716a4c22fff650e0ff065a0.tar.bz2
hercules-856b6f1feb25ca74d716a4c22fff650e0ff065a0.tar.xz
hercules-856b6f1feb25ca74d716a4c22fff650e0ff065a0.zip
Update Unique ID system to match official now it cover all cash items include stackable ones.
Implement ForceSerial option in Package Item Database to force serial for any item. Implement ForceSerial option in item database to force serial for any item. Implement Merge Client interface to merge stackable items with serial numbers ( check npc/other/item_merge.txt ).
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 47ac151ed..f2fce3a8f 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19691,6 +19691,17 @@ BUILDIN(showscript) {
return true;
}
+BUILDIN(mergeitem)
+{
+ struct map_session_data *sd = script->rid2sd(st);
+
+ if (sd == NULL)
+ return true;
+
+ clif->openmergeitem(sd->fd, sd);
+
+ return true;
+}
/** place holder for the translation macro **/
BUILDIN(_) {
return true;
@@ -20329,6 +20340,7 @@ void script_parse_builtin(void) {
BUILDIN_DEF(channelmes, "ss"),
BUILDIN_DEF(showscript, "s?"),
+ BUILDIN_DEF(mergeitem,""),
BUILDIN_DEF(_,"s"),
};
int i, len = ARRAYLENGTH(BUILDIN);