From e9043b8ba451c696106ff183b7b2a5e4d9f558bc Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 23 Feb 2016 19:55:37 +0000
Subject: [PATCH] Mammon rework. Contributed by hlwrave.
---
.../dist/game/data/html/merchant/32347-1.htm | 13 +-
.../dist/game/data/html/merchant/32347-2.htm | 8 +
trunk/dist/game/data/html/merchant/32347.htm | 18 +-
trunk/dist/game/data/multisell/3007.xml | 46 ++++
trunk/dist/game/data/multisell/3023.xml | 87 +++++++
trunk/dist/game/data/multisell/3024.xml | 87 +++++++
trunk/dist/game/data/multisell/3025.xml | 11 +
trunk/dist/game/data/multisell/623.xml | 244 ++++++++++++++++++
.../ai/npc/BlackMarketeerOfMammon/31092.html | 7 +-
.../data/scripts/ai/npc/Mammons/31126-07.html | 6 +
.../data/scripts/ai/npc/Mammons/31126.html | 21 +-
.../data/scripts/ai/npc/Mammons/33739.html | 13 +-
.../data/scripts/ai/npc/Mammons/Mammons.java | 1 +
.../game/data/stats/items/26400-26499.xml | 15 +-
14 files changed, 536 insertions(+), 41 deletions(-)
create mode 100644 trunk/dist/game/data/html/merchant/32347-2.htm
create mode 100644 trunk/dist/game/data/multisell/3007.xml
create mode 100644 trunk/dist/game/data/multisell/3023.xml
create mode 100644 trunk/dist/game/data/multisell/3024.xml
create mode 100644 trunk/dist/game/data/multisell/3025.xml
create mode 100644 trunk/dist/game/data/multisell/623.xml
create mode 100644 trunk/dist/game/data/scripts/ai/npc/Mammons/31126-07.html
diff --git a/trunk/dist/game/data/html/merchant/32347-1.htm b/trunk/dist/game/data/html/merchant/32347-1.htm
index fb7193de18..770d64008f 100644
--- a/trunk/dist/game/data/html/merchant/32347-1.htm
+++ b/trunk/dist/game/data/html/merchant/32347-1.htm
@@ -1,10 +1,5 @@
-
-Shhadai:
-The Ancient Text of the Demon is an old tome regarded as an unholy scripture by the Demons of Hellbound. It was created through the power of darkness and
-contains a mysterious energy, which can be very useful -- if you can obtain it, of course.
-You can find the Hidden First Page, the Hidden Second Page
-and the Fragment of a Contract with the Demon by reading this book. However, it will turn to dust if you try to use physical strength on it,
-so you must be careful.
-If you bring it to me, I can put it to good use -- it will be utterly useless to you, in case you had other ideas. But give it to me and I will exchange it
-for an item of greater value for you.
+Shhadai:
+The Ancient Text of the Demon is an old tome regarded as an unholy scripture by the Demons of Hellbound. It was created through the power of darkness and contains a mysterious energy, which can be very useful -- if you can obtain it, of course.
+You can find the Hidden First Page, the Hidden Second Page and the Fragment of a Contract with the Demon by reading this book. However, it will turn to dust if you try to use physical strength on it, so you must be careful.
+If you bring it to me, I can put it to good use -- it will be utterly useless to you, in case you had other ideas. But give it to me and I will exchange it for an item of greater value for you.
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/merchant/32347-2.htm b/trunk/dist/game/data/html/merchant/32347-2.htm
new file mode 100644
index 0000000000..596c6d5d5f
--- /dev/null
+++ b/trunk/dist/game/data/html/merchant/32347-2.htm
@@ -0,0 +1,8 @@
+Shhadai:
+The La Vie En Rose's Radiant Brooch activates 5 jewel slots, but it can't be made that easily. I need 30 Shiny Gemstone Fragments and 1 Radiant Gemstone Fragment.
+Bring me any Jewel Box or a Lv. 1 Jewel, and I'll give you a Radiant Gemstone Fragment.
+You can get Shiny Gemstone Fragments from Shadai's Jewelry Box at a low rate.
+If you bring all the ingredients, I'll make a La Vie En Rose's Radiant Brooch for you.
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/merchant/32347.htm b/trunk/dist/game/data/html/merchant/32347.htm
index a1ffbc240b..8e953479b9 100644
--- a/trunk/dist/game/data/html/merchant/32347.htm
+++ b/trunk/dist/game/data/html/merchant/32347.htm
@@ -1,11 +1,11 @@
Shadai:
-Greetings, traveler! I am Shadai of Hellbound, the legendary Dwarven blacksmith. Ah, I know I may look a bit shabby, but you mustn't judge a sword by its
-sheath! Ha ha ha! You are a lucky fellow, my friend, to have bumped into me. Interested in turning that luck into wealth? I'll make you a deal:
-if you get me an item I need, I'll use my skills to craft you something.
-
-
-
-
-
-
+Greetings, traveler! I am Shadai, the legendary blacksmith of Hellbound. I ran aw - left for Heine when Hellbound turned all scary and stuff, but I still deal in materials from there. So what do you say? Give me your things, and I'll turn them into valuables. Wanna open trade?
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/multisell/3007.xml b/trunk/dist/game/data/multisell/3007.xml
new file mode 100644
index 0000000000..6298f99806
--- /dev/null
+++ b/trunk/dist/game/data/multisell/3007.xml
@@ -0,0 +1,46 @@
+
+
+
+ 33739
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/multisell/3023.xml b/trunk/dist/game/data/multisell/3023.xml
new file mode 100644
index 0000000000..6e1f8af036
--- /dev/null
+++ b/trunk/dist/game/data/multisell/3023.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/multisell/3024.xml b/trunk/dist/game/data/multisell/3024.xml
new file mode 100644
index 0000000000..a5a45bb224
--- /dev/null
+++ b/trunk/dist/game/data/multisell/3024.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/multisell/3025.xml b/trunk/dist/game/data/multisell/3025.xml
new file mode 100644
index 0000000000..08d496321c
--- /dev/null
+++ b/trunk/dist/game/data/multisell/3025.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/multisell/623.xml b/trunk/dist/game/data/multisell/623.xml
new file mode 100644
index 0000000000..09f326daeb
--- /dev/null
+++ b/trunk/dist/game/data/multisell/623.xml
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092.html b/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092.html
index 62c7a0473a..500a56b75f 100644
--- a/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092.html
+++ b/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092.html
@@ -1,11 +1,10 @@
Black Marketeer of Mammon:
-The Lords of Dawn and the Revolutionary Troops of Dusk use Ancient Adena as their currency, following in the old empire's tradition.
+The Lords of Dawn and the Revolutionary Troops of Dusk use ancient adena as their currency, following in the old empire's tradition.
Tradition and customs are important but they are so old... If you were to go to the market with that money in this day and age, you couldn't buy a thing.
Do you have any ancient adena that you don't know what to do with? If you do, I'll exchange them for adena.
Also, if your weapon has a special ability that you do not want, I can remove that, too. I dont't know why you would want to take off a special ability that's been bestowed on your weapon, but we'll do anything for adena.
I have also obtained some rare goods, so stop by some time - these items aren't easy to obtain!
-
-
-
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Mammons/31126-07.html b/trunk/dist/game/data/scripts/ai/npc/Mammons/31126-07.html
new file mode 100644
index 0000000000..d647f050bc
--- /dev/null
+++ b/trunk/dist/game/data/scripts/ai/npc/Mammons/31126-07.html
@@ -0,0 +1,6 @@
+Blacksmith of Mammon:
+I'll exchange the weapon that you've been using for a weapon that is one level stronger. Pay me the difference in Ancient Adena.
+There's something you should know. Soul Crystal effects don't transfer. And if you exchange enchanted weapons, the new weapon will not be enchanted.
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Mammons/31126.html b/trunk/dist/game/data/scripts/ai/npc/Mammons/31126.html
index c876f03a0b..c26334d918 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Mammons/31126.html
+++ b/trunk/dist/game/data/scripts/ai/npc/Mammons/31126.html
@@ -2,16 +2,15 @@
May Mammon bless you! I, the Blacksmith of Mammon, have come to offer you arms of the highest quality.
I shall mend your weapons and armor with skills that no novice blacksmith could ever hope to imitate.
Yet there are a few things I must tell you. Although we Dwarves of Mammon didn't deal in coins of the outside world before, we have changed with the times and now accept them. Also remember that you can only remove seals from A-grade items with village blacksmiths now. Lastly, I can change the status of Bound items for you, if you provide an Unbind Scroll for me.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Mammons/33739.html b/trunk/dist/game/data/scripts/ai/npc/Mammons/33739.html
index 3d2d6ecdc8..60c7cffeed 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Mammons/33739.html
+++ b/trunk/dist/game/data/scripts/ai/npc/Mammons/33739.html
@@ -1,9 +1,8 @@
Merchant of Mammon:
-May Mammon's blessings be upon you! Mammon's guild is here to present our special collection of rare items.
-Before you start shopping, there's a few things you should know. While we dealt only in Ancient Adena in the past, now we take Adena like any other merchant. Also, you must bring a Blank Scroll if you plan to purchase an Enchant Scroll. If you bring us Soul Crystal Fragments, we can make them into whole Soul Crystals. We also have Elcyum upgrade items. And don't forget to check out our Augmenting Stones!.
-Remember, local tax rates apply!
-
-
-
-
+May Mammon's blessings be upon you! Mammon's Guild is here to showcase our rare item collection.
+Before you start shopping, there are a few things you should know. While we dealt only in Ancient Adena in the past, now we take Adena like any other merchant. Also, you must bring a Blank Scroll if you plan to purchase an Enchant Scroll. If you bring us Soul Crystal Fragments, we can make them into whole Soul Crystals. We also have Elcyum to upgrade items and special Talismans.
+Remember, local tax rates apply!
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java b/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java
index d121720216..42ba256a39 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java
@@ -98,6 +98,7 @@ final class Mammons extends AbstractNpcAI
case "31126-04.html":
case "31126-05.html":
case "31126-06.html":
+ case "31126-07.html":
case "33739-01.html":
{
htmltext = event;
diff --git a/trunk/dist/game/data/stats/items/26400-26499.xml b/trunk/dist/game/data/stats/items/26400-26499.xml
index ce65fef686..8ebebd4988 100644
--- a/trunk/dist/game/data/stats/items/26400-26499.xml
+++ b/trunk/dist/game/data/stats/items/26400-26499.xml
@@ -1037,8 +1037,9 @@
-
+
+
@@ -1254,9 +1255,12 @@
+
+
+
@@ -1264,9 +1268,12 @@
+
+
+
@@ -1274,9 +1281,12 @@
+
+
+
@@ -1284,9 +1294,12 @@
+
+
+