From 31c9bf49e85df4df948732e23d85be224fddf134 Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Thu, 20 Mar 2014 17:44:16 +0000
Subject: [PATCH] BETA: Minor cleanup of htmls that are no longer in use since
 [10229] 	* And also fixing minor typo in merchant htmls since [10252] 
 * Reported by: lion

---
 .../dist/game/data/html/fortress/merchant-1.htm          | 9 ---------
 .../dist/game/data/html/fortress/merchant-10.htm         | 3 ---
 .../dist/game/data/html/fortress/merchant-2.htm          | 9 ---------
 .../dist/game/data/html/fortress/merchant-3.htm          | 5 -----
 .../dist/game/data/html/fortress/merchant-4.htm          | 7 -------
 .../dist/game/data/html/fortress/merchant-5.htm          | 7 -------
 .../dist/game/data/html/fortress/merchant-6.htm          | 7 -------
 .../dist/game/data/html/fortress/merchant-7.htm          | 3 ---
 .../dist/game/data/html/fortress/merchant-8.htm          | 3 ---
 .../dist/game/data/html/fortress/merchant-9.htm          | 3 ---
 .../dist/game/data/html/fortress/merchant-noclan.htm     | 3 ---
 .../dist/game/data/html/fortress/merchant.htm            | 6 ------
 .../dist/game/data/html/merchant/31256-1.htm             | 4 ++--
 13 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-1.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-10.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-2.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-3.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-4.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-5.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-6.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-7.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-8.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-9.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-noclan.htm
 delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/fortress/merchant.htm

diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-1.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-1.htm
deleted file mode 100644
index 36b17442e8..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-1.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>
-I'll tell you why. You may be surprised to learn that I am a member of the Tactics Corps. You see this fortress? Places just like it used to protect the people of this land from Monsters and foreign armies. And now? Greedy, grasping fools have occupied the fortress, using its might to extort money from the area residents... So I'm guarding this area, searching for someone worthy to defeat that band of bandits and occupy the fortress on behalf of the citizens here.<br>
-You seem a likely candidate... What do you say? You could hire our mercenaries, and with our help I'm sure you'd be able to capture the fortress. Do you want to try?<br>
-<br>
-<a action="bypass -h npc_%objectId%_fort_register">Register fortress siege warfare.</a><br>
-<a action="bypass -h npc_%objectId%_fort_unregister">Cancel registration.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 3">Ask about fortress siege warfare.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 2">"Tell me more about the fortress."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-10.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-10.htm
deleted file mode 100644
index ae79146055..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-10.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>
-This battle is not some streetgang fight; it is a serious business, with rules and traditions. I don't know your intentions, but I think you'd best bring your senior officer here immediately.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-2.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-2.htm
deleted file mode 100644
index 7982fa3d34..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-2.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>
-Listen carefully. My lord does not trust the clan currently in possession of this fortress -- you can see the effort and expense he has gone to to assemble this mercenary force as a counterweight. Were you to expel the current owners and capture the fortress, I am sure he would be most grateful. (Of course, that probably won't last long -- it's not called a "3-day reign" for nothing...)<br>
-<br>
-Oh, forgive my muttering -- just talking to myself, you know. In any event, let me explain a little about the two types of fortresses.<br>
-<br>
-Territorial fortresses are built within a territory to defend against monster attacks, while border fortresses are established along the boundary between two territories. If you have a map, take a look for yourself and you'll see what I mean. Blue flags indicate territorial fortresses, whereas red flags indicate border fortresses.<br>
-<br>
-<a action="bypass -h npc_%objectId%_Chat 4">Ask him how to conquer a fortress.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-3.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-3.htm
deleted file mode 100644
index 8bf75f1469..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-3.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>
-We don't have any clients at the moment, so we're searching for opportunities. If someone needs us, we can be ready in less than an hour. How about your clan? A mere 250,000 Adena secures our services!<br>
-<br>
-<a action="bypass -h npc_%objectId%_Chat 0">Back.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-4.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-4.htm
deleted file mode 100644
index 4d34c5bace..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-4.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>
-Knowing a fortress' layout can help you turn the battle to your advantage. Each fortress is essentially a residential area consisting of a large central command post surrounded by several barracks.<br>
-<br>
-There are 5 types of barracks: defense barracks, archer barracks, support barracks, officer's barracks and a control center. The number of barracks varies depending on the size of the fortress. Each barracks has a commander who must be defeated in order for you to conquer that barracks. Note that the control center must have a Warsmith or a Maestro in order to handle the machinery.<br>
-<br>
-<a action="bypass -h npc_%objectId%_Chat 5">"What happens if I conquer the barracks?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-5.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-5.htm
deleted file mode 100644
index e3b54a696c..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-5.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>
-If you conquer all of the barracks, weakening your opponents' defensive system, the command gate will open. Entering the command post, you will find a Flag of Combat on the first floor that symbolizes the authority of the fort. You can end the battle by hanging it from the flag pole on the very highest floor.<br>
-<br>
-Be warned, though, that you must conquer the fortress within 10 minutes or all of the barracks' functions will return to normal.<br>
-<br>
-<a action="bypass -h npc_%objectId%_Chat 6">"As a mercenary, what do you..."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-6.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-6.htm
deleted file mode 100644
index 1b65984547..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-6.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>
-Uh-huh. I occasionally earn a few Adena as mercenary... A single mission earns me 250,000 Adena. Not a particularly expensive fee, considering that I put my life on the line!<br>
-<br>
-But I get your point. If there is an enemy clan controlling the fortress, I'll escort our mercenary captain there. He can open the central command gate, so be sure to guard him carefully!<br>
-<br>
-<a action="bypass -h npc_%objectId%_Chat 0">Back</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-7.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-7.htm
deleted file mode 100644
index 13f541e295..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-7.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>
-All right, then! Let's show these villains who's boss by combining our power. Allow me to call my associates...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-8.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-8.htm
deleted file mode 100644
index a21ef99d4c..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-8.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>
-I'm afraid that there's nothing we can do to help right now. Please come back after you've had a chance to freshen up.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-9.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-9.htm
deleted file mode 100644
index d4a4fae37c..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-9.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>
-Who are you? You seem to have listened to some very inaccurate rumors about me... Ha!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-noclan.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-noclan.htm
deleted file mode 100644
index 756d667275..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant-noclan.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>
-Whoa -- no need to be suspicious of me, friend. It's a nice day and I'm just out taking a walk to get a breath of fresh air. Don't mind me!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant.htm
deleted file mode 100644
index c74c04d745..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/merchant.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>
-Are you curious why I'm here in front of this fortress owned by the <font color="LEVEL">%clanname%</font> clan selling my wares, instead of in a nice, safe village?<br>
-<br>
-<a action="bypass -h npc_%objectId%_multisell 90001000">"No. Please show me items I can use on the battlefield."</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">"Yes, I'm a little curious."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31256-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31256-1.htm
index 9ce84fa88e..1a70193f9b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31256-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/31256-1.htm
@@ -2,7 +2,7 @@
 What are you looking for?<br>
 <a action="bypass -h npc_%objectId%_Buy 3125600">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3125601">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3125603">Buy Fighter Common Items.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3125604">Buy Wizard Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3125602">Buy Fighter Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3125603">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file
-- 
GitLab