From ef1096cf9c466b6e73a62eb9abf3693307efef6b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 12 Oct 2020 10:41:52 +0000 Subject: [PATCH] Updated Black Marketeer and Merchant of Mammon. Contributed by CostyKiller. --- .../dist/game/data/multisell/310920001.xml | 78 +++++++++++++++++++ .../dist/game/data/multisell/310920002.xml | 12 +++ .../dist/game/data/multisell/310920003.xml | 10 +++ .../{310922001.xml => 337390001.xml} | 40 +++++----- .../{310922002.xml => 337390002.xml} | 38 ++++----- .../BlackMarketeerOfMammon/31092-02.html | 2 +- .../BlackMarketeerOfMammon/31092-03.html | 2 +- .../BlackMarketeerOfMammon/31092-05.html | 7 -- .../others/BlackMarketeerOfMammon/31092.html | 5 +- .../BlackMarketeerOfMammon.java | 2 +- .../scripts/ai/others/Mammons/33739-02.html | 8 +- 11 files changed, 150 insertions(+), 54 deletions(-) create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920001.xml create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920002.xml create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920003.xml rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/{310922001.xml => 337390001.xml} (97%) rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/{310922002.xml => 337390002.xml} (97%) delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920001.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920001.xml new file mode 100644 index 0000000000..aa0ce01f53 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920001.xml @@ -0,0 +1,78 @@ + + + + 31092 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920002.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920002.xml new file mode 100644 index 0000000000..5d7d14a517 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920002.xml @@ -0,0 +1,12 @@ + + + + 31092 + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920003.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920003.xml new file mode 100644 index 0000000000..ccebaec99a --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310920003.xml @@ -0,0 +1,10 @@ + + + + 31092 + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310922001.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/337390001.xml similarity index 97% rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310922001.xml rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/337390001.xml index 858790d165..7f3c41a64c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310922001.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/337390001.xml @@ -1,21 +1,21 @@ - - - - 33739 - - - - - - - - - - - - - - - - + + + + 33739 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310922002.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/337390002.xml similarity index 97% rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310922002.xml rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/337390002.xml index 40d08db21e..ee6802e471 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/310922002.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/multisell/337390002.xml @@ -1,20 +1,20 @@ - - - - 33739 - - - - - - - - - - - - - - - + + + + 33739 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html index 599222436c..88b49edba3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html @@ -1,4 +1,4 @@ -Black Marketeer of Mammon:
+Black Marketeer of Mammon:
[Exchange failure]
You've entered an invalid value. Please input a correct amount.
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html index 75b268b1b1..bbddc8b915 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html @@ -1,4 +1,4 @@ -Black Marketeer of Mammon:
+Black Marketeer of Mammon:
[Exchange failure]
You don't have enough of the item that you're trying to exchange.
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html deleted file mode 100644 index 94c3c1f430..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html +++ /dev/null @@ -1,7 +0,0 @@ -Black Marketeer of Mammon:
-Do you have a Guard Agathion Fragment? Then you've come to the right place. I use those fragments to create Agathion Charms containing the power of Masia's, Paulina's or Tersi's Guard.
-Also, I make exchanges with Book of Growth: Guard Agathion which helps with the growth of the Guard Agathion. You'll need Angel's Breath to exchange and it's sold a Merchant of Mammon.
- - - - \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html index b0dcb94306..60655f7231 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092.html @@ -1,5 +1,8 @@ Black Marketeer of Mammon:
The LordHush!
-TraditioThe government is out to get me, so I am forced to do business in the shadows.
+The government is out to get me, so I am forced to do business in the shadows.
+ + + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java index c2d47b4e25..5ccab2e8c6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java @@ -45,7 +45,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI public String onAdvEvent(String event, Npc npc, PlayerInstance player) { String htmltext = event; - if (event.equals("31092-01.html") || event.equals("31092-05.html")) + if (event.equals("31092-01.html")) { return event; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Mammons/33739-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Mammons/33739-02.html index 5595b99dc6..2224a22a8c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Mammons/33739-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Mammons/33739-02.html @@ -1,7 +1,7 @@ -Black Marketeer of Mammon:
+Merchant of Mammon:
Do you have a Guard Agathion Fragment? Then you've come to the right place. I use those fragments to create Agathion Charms containing the power of Masia's, Paulina's or Tersi's Guard.
Also, I make exchanges with Book of Growth: Guard Agathion which helps with the growth of the Guard Agathion. You'll need Angel's Breath to exchange and it's sold a Merchant of Mammon.
- - - + + + \ No newline at end of file