summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2015-07-08 03:39:36 +0200
committerHaruna <haru@dotalux.com>2015-07-08 03:39:36 +0200
commit041e0625b543215e8b319fc4ef32fa24cd199656 (patch)
tree4f36abbb84364ad48c53f1f8bc6db007b01a20f6 /npc/re
parent5fd40de233d3a897284f771338cbf8e657182261 (diff)
parent856b6f1feb25ca74d716a4c22fff650e0ff065a0 (diff)
downloadhercules-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/re')
-rw-r--r--npc/re/other/item_merge.txt69
-rw-r--r--npc/re/scripts.conf1
2 files changed, 0 insertions, 70 deletions
diff --git a/npc/re/other/item_merge.txt b/npc/re/other/item_merge.txt
deleted file mode 100644
index f823f5c3c..000000000
--- a/npc/re/other/item_merge.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-//===== Hercules Script ======================================
-//= Mergician
-//===== By: ==================================================
-//= Euphy
-//===== Current Version: =====================================
-//= 1.0
-//===== Description: =========================================
-//= [Official Conversion]
-//= Merges items taking up multiple slots in a player's
-//= inventory.
-//===== Additional Comments: =================================
-//= 1.0 First version, currently useless/disabled.
-//============================================================
-
-prontera,146,95,3 script Mergician#pron 1_M_WIZARD,{
- if (checkweight(1301,1) == 0) {
- mes "- Wait a second !! -";
- mes "- You are carrying too many items -";
- mes "- or too much weight to proceed. -";
- mes "- Come back after -";
- mes "- arranging your inventory. -";
- close;
- }
- mes "[Mergician]";
- mes "Do you believe in the miracle of Merge god?? If so, repeat my spell loudly as I pronunce it!!!";
- mes "Merge Merge, Merrrrge!!!";
- next;
- switch(select("What is the miracle of Merge?:Merrrrge!!!!:Abandon...")) {
- case 1:
- mes "[Mergician]";
- mes "There is an order which rules the world and keeps the world to go well.";
- next;
- mes "[Mergician]";
- mes "But there has been a bad factor which totally jeopardised this rule!!";
- next;
- mes "[Mergician]";
- mes "Those things which are separated even if they are composed by the same material!!";
- next;
- mes "[Mergician]";
- mes "Have you never experienced this bad incident??";
- mes "The fact that I had ^3131FFthe same potion, but appearing more than twice in your inventory!!^000000 So unpleasant!!!";
- next;
- mes "[Mergician]";
- mes "Believe in Mergism. That is the truth.";
- mes "Then I can help you be happy and content.";
- close;
- case 2:
- mes "[Mergician]";
- mes "This is the total holy ritual to pray to the Great God, Merge! and I am borrowing the power for a while!!";
- next;
- mes "[Mergician]";
- mes "And if you eagerly want to be blessed by Merge, be humble and shout out loud! Merge Merge, Merrrrge!!!";
- 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;
- case 2:
- mes "[Mergician]";
- mes "You jerk!!! You just broke the whole rhythm! Why can't you get my flow and follow me?! Idiot!";
- close;
- }
- case 3:
- close;
- }
-}
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