From a49525738096a28d2c2738548de58ef9682219fc Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 13 Dec 2020 22:58:28 +0000
Subject: [PATCH] Removal of Mammons AI.
---
.../scripts/ai/others/Mammons/31126-01.html | 3 -
.../scripts/ai/others/Mammons/31126-02.html | 5 -
.../scripts/ai/others/Mammons/31126-03.html | 3 -
.../scripts/ai/others/Mammons/31126-04.html | 6 -
.../scripts/ai/others/Mammons/31126-05.html | 8 --
.../scripts/ai/others/Mammons/31126-06.html | 8 --
.../data/scripts/ai/others/Mammons/31126.html | 18 ---
.../data/scripts/ai/others/Mammons/33511.html | 6 -
.../scripts/ai/others/Mammons/33739-01.html | 6 -
.../scripts/ai/others/Mammons/33739-02.html | 7 -
.../data/scripts/ai/others/Mammons/33739.html | 10 --
.../scripts/ai/others/Mammons/Mammons.java | 135 ------------------
.../dist/game/data/spawns/Aden/TownOfAden.xml | 2 +
.../game/data/spawns/Giran/TownOfGiran.xml | 2 +
.../dist/game/data/spawns/Rune/TownOfRune.xml | 2 +
15 files changed, 6 insertions(+), 215 deletions(-)
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-01.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-02.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-03.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-04.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-05.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-06.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33511.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739-01.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739-02.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739.html
delete mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/Mammons.java
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-01.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-01.html
deleted file mode 100644
index 708934ed09..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-01.html
+++ /dev/null
@@ -1,3 +0,0 @@
-Blacksmith of Mammon:
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-02.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-02.html
deleted file mode 100644
index fd613c2d90..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-02.html
+++ /dev/null
@@ -1,5 +0,0 @@
-Blacksmith of Mammon:
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-03.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-03.html
deleted file mode 100644
index dd8e55c9d7..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-03.html
+++ /dev/null
@@ -1,3 +0,0 @@
-Blacksmith of Mammon:
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-04.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-04.html
deleted file mode 100644
index 1f7f37f36d..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-04.html
+++ /dev/null
@@ -1,6 +0,0 @@
-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. Special abilities don't transfer. And if you transfer enchantments, the new weapon will not be enchanted.
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-05.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-05.html
deleted file mode 100644
index dd6f552fd7..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-05.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Blacksmith of Mammon:
-I will exchange the weapon for another type of the same grade. For example, you can exchange a mithril dagger for a two-handed claymore of the same grade. But, I have to warn you.
-First, weapons with special abilities cannot be exchanged.
-Second, when exchanging a weapon that has been enchanted the exchanged weapon will have the same enchantment.
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-06.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-06.html
deleted file mode 100644
index 965b8089cb..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126-06.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Blacksmith of Mammon:
-Do you know about the Foundation Items? Even we blacksmiths see them only infrequently.
-These uncommon items are brought into being by a power than goes beyond mere chance. We Dwarves say that it is the blessing of Maphr.
-That perfect craftsmanship is beyond the Human race's capacity.
-It is not, however, beyond mine. Bring me Mammon's Varnish Enhancer, which is sold by the Merchant of Mammon. Then I will use techniques known only to me to transform the item into something accessible to mortals.
-Be sure to select a helmet among the rare items that provides you with a useful power. Don't worry if you make the wrong choice, though. You will have another chance to make a selection.
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126.html
deleted file mode 100644
index 76f124ec7e..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/31126.html
+++ /dev/null
@@ -1,18 +0,0 @@
-Blacksmith of Mammon:
-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/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33511.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33511.html
deleted file mode 100644
index 83614f3e77..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33511.html
+++ /dev/null
@@ -1,6 +0,0 @@
-Priest of Mammon:
-The door to the Necropolis and Catacombs is closed. I heard that the monsters inside were cleaned out by the Goddess of Destruction but... hmm... I don't know.
-No matter, both the Dawn and Dusk were caught horribly unprepared by Shilen's resurrection. Haha... Because of this, I started taking on the work normally done by the priests of Dawn and Dusk.
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739-01.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739-01.html
deleted file mode 100644
index 189f62c320..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739-01.html
+++ /dev/null
@@ -1,6 +0,0 @@
-Merchant of Mammon:
-Elcyum is a mineral found by the Gray Pillar dwarves in the deepest part of the Spine Mountains.
-Its energies increase an item's upgrade chances. It can also be exchanged for a Giant's Augmenting Stone that provides advanced augmentation.
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739-02.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739-02.html
deleted file mode 100644
index 2224a22a8c..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739-02.html
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739.html
deleted file mode 100644
index a0439c3a0c..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/33739.html
+++ /dev/null
@@ -1,10 +0,0 @@
-Merchant of Mammon:
-May Mammon's blessings be upon you!
-Have you heard about Elcyum? This material is in great demand on the continent. It is used for avariety of purposes, although it's not easy to obtain. Bye the way, I want to remind you that i am an honest law-abiding trader and pay taxes regularly. So take a careful look at the price before buying, so that later there are no misunderstandings, Hehe...
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/Mammons.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/Mammons.java
deleted file mode 100644
index 7e279f4dda..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/Mammons/Mammons.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package ai.others.Mammons;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.network.NpcStringId;
-import org.l2jmobius.gameserver.util.Broadcast;
-
-import ai.AbstractNpcAI;
-
-/**
- * Mammons AI.
- * @author St3eT
- */
-public class Mammons extends AbstractNpcAI
-{
- // NPCs
- private static final int[] MAMMONS =
- {
- 31126, // Blacksmith of Mammon
- 33739, // Priest of Mammon
- 33511, // Merchant of Mammon
- };
- // Locations
- private static final Location[] BLACKSMITH_LOC =
- {
- new Location(146873, 29448, -2264, 0), // Aden
- new Location(81266, 150091, -3528, 891), // Giran
- new Location(42825, -41337, -2184), // Rune
- };
- private static final Location[] MERCHANT_LOC =
- {
- new Location(146872, 29569, -2264, 0), // Aden
- new Location(81272, 150041, -3528, 891), // Giran
- new Location(42803, -41283, -2184, 37972), // Rune
- };
- private static final Location[] PRIEST_LOC =
- {
- new Location(146882, 29665, -2264, 0), // Aden
- new Location(81284, 150155, -3528, 891), // Giran
- new Location(42784, -41236, -2192, 37972), // Rune
- };
- // Misc
- private static final NpcStringId[] RANDOM_SAY =
- {
- NpcStringId.I_BRING_YOU_WONDROUS_GIFTS,
- NpcStringId.I_HAVE_SOME_EXCELLENT_WEAPONS_TO_SHOW_YOU,
- NpcStringId.I_VE_BEEN_SO_BUSY_LATELY_IN_ADDITION_TO_PLANNING_MY_TRIP,
- };
- private static final int TELEPORT_DELAY = 3600000; // 60min
- private static final List _mammons = new ArrayList<>();
-
- private Mammons()
- {
- addStartNpc(MAMMONS);
- addTalkId(MAMMONS);
- addFirstTalkId(MAMMONS);
-
- onAdvEvent("RESPAWN_MAMMONS", null, null);
- startQuestTimer("RESPAWN_MAMMONS", TELEPORT_DELAY, null, null, true);
- }
-
- @Override
- public String onAdvEvent(String event, Npc npc, PlayerInstance player)
- {
- String htmltext = null;
- switch (event)
- {
- case "31126.html":
- case "31126-01.html":
- case "31126-02.html":
- case "31126-03.html":
- case "31126-04.html":
- case "31126-05.html":
- case "31126-06.html":
- case "33739-01.html":
- case "33739-02.html":
- {
- htmltext = event;
- break;
- }
- case "RESPAWN_MAMMONS":
- {
- if (!_mammons.isEmpty())
- {
- _mammons.stream().filter(Objects::nonNull).forEach(Npc::deleteMe);
- _mammons.clear();
- }
- final int town = getRandom(3);
- final Npc blacksmith = addSpawn(MAMMONS[0], BLACKSMITH_LOC[town]);
- final Npc merchant = addSpawn(MAMMONS[1], MERCHANT_LOC[town]);
- final Npc priest = addSpawn(MAMMONS[2], PRIEST_LOC[town]);
- _mammons.addAll(Arrays.asList(blacksmith, merchant, priest));
- if (blacksmith != null)
- {
- blacksmith.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(RANDOM_SAY));
- if (Config.ANNOUNCE_MAMMON_SPAWN)
- {
- Broadcast.toAllOnlinePlayers("Mammon's has been spawned in Town of " + blacksmith.getCastle().getName() + ".", false);
- }
- }
- break;
- }
- }
- return htmltext;
- }
-
- public static void main(String[] args)
- {
- new Mammons();
- }
-}
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Aden/TownOfAden.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Aden/TownOfAden.xml
index 2208b72092..6123d742fd 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Aden/TownOfAden.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Aden/TownOfAden.xml
@@ -119,6 +119,8 @@
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Giran/TownOfGiran.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Giran/TownOfGiran.xml
index b13168b48e..b6b9a3458d 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Giran/TownOfGiran.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Giran/TownOfGiran.xml
@@ -126,6 +126,8 @@
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Rune/TownOfRune.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Rune/TownOfRune.xml
index 8c79021db9..df4ec17638 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Rune/TownOfRune.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Rune/TownOfRune.xml
@@ -149,6 +149,8 @@
+
+
\ No newline at end of file