summaryrefslogtreecommitdiff
path: root/npc
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 /npc
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 'npc')
-rw-r--r--npc/other/item_merge.txt (renamed from npc/re/other/item_merge.txt)6
-rw-r--r--npc/re/scripts.conf1
-rw-r--r--npc/scripts.conf1
3 files changed, 5 insertions, 3 deletions
diff --git a/npc/re/other/item_merge.txt b/npc/other/item_merge.txt
index f823f5c3c..151251edc 100644
--- a/npc/re/other/item_merge.txt
+++ b/npc/other/item_merge.txt
@@ -10,6 +10,7 @@
//= inventory.
//===== Additional Comments: =================================
//= 1.0 First version, currently useless/disabled.
+//= 1.1 Add support for merging items
//============================================================
prontera,146,95,3 script Mergician#pron 1_M_WIZARD,{
@@ -53,11 +54,12 @@ prontera,146,95,3 script Mergician#pron 1_M_WIZARD,{
next;
switch(select("Merrrrge!:Don't follow what he says.")) {
case 1:
-// MergeItem
mes "[Mergician]";
mes "Merge just heard your wish and let it be realised!";
mes "Open your inventory to check the miracle!";
- close;
+ close2;
+ mergeitem();
+ end;
case 2:
mes "[Mergician]";
mes "You jerk!!! You just broke the whole rhythm! Why can't you get my flow and follow me?! Idiot!";
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf
index b498960f1..e0c12c2e5 100644
--- a/npc/re/scripts.conf
+++ b/npc/re/scripts.conf
@@ -93,7 +93,6 @@ npc: npc/re/merchants/ninja_craftsman.txt
// --------------------------- Others ---------------------------
npc: npc/re/other/bulletin_boards.txt
-//npc: npc/re/other/item_merge.txt
npc: npc/re/other/mail.txt
npc: npc/re/other/mercenary_rent.txt
npc: npc/re/other/pvp.txt
diff --git a/npc/scripts.conf b/npc/scripts.conf
index b8f427ca1..fd16b357b 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -200,6 +200,7 @@ npc: npc/other/powernpc.txt
npc: npc/other/pvp.txt
// - Turbo Track Arena
npc: npc/other/turbo_track.txt
+npc: npc/other/item_merge.txt
// --------------------------- Quests ---------------------------
// - Quests-Tutorials for basic classes (1st class quests) ------