diff options
| author | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-07-08 03:39:36 +0200 |
| commit | 041e0625b543215e8b319fc4ef32fa24cd199656 (patch) | |
| tree | 4f36abbb84364ad48c53f1f8bc6db007b01a20f6 /npc | |
| parent | 5fd40de233d3a897284f771338cbf8e657182261 (diff) | |
| parent | 856b6f1feb25ca74d716a4c22fff650e0ff065a0 (diff) | |
| download | hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.gz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.bz2 hercules-041e0625b543215e8b319fc4ef32fa24cd199656.tar.xz hercules-041e0625b543215e8b319fc4ef32fa24cd199656.zip | |
Merge pull request #586 from hemagx/master
Update UID system to match official and Implement Merger
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.conf | 1 | ||||
| -rw-r--r-- | npc/scripts.conf | 1 |
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) ------ |