From daa2a71a0168667b0e793a7ac65b987b0da8b989 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 26 Sep 2017 22:47:40 +0000
Subject: [PATCH] GM-Shop brooch jewel reorganize.

---
 .../game/data/buylists/custom/3175710.xml     | 58 +++++++++++++++++++
 .../data/html/admin/gmstore/gear/jewels.htm   |  2 +-
 .../html/admin/gmstore/gear/jewels/brooch.htm | 30 ++++++++++
 .../data/html/admin/gmstore/consumables.htm   |  9 ++-
 .../data/html/admin/gmstore/gear/jewels.htm   |  2 +-
 .../html/admin/gmstore/gear/jewels/brooch.htm | 30 ++++++++++
 .../data/html/admin/gmstore/consumables.htm   |  9 ++-
 .../data/html/admin/gmstore/gear/jewels.htm   |  2 +-
 .../html/admin/gmstore/gear/jewels/brooch.htm | 30 ++++++++++
 9 files changed, 159 insertions(+), 13 deletions(-)
 create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/custom/3175710.xml
 create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm
 create mode 100644 L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm
 create mode 100644 L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/custom/3175710.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/custom/3175710.xml
new file mode 100644
index 0000000000..034bf0f8c8
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/custom/3175710.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="38850" price="0" />
+	<item id="38851" price="0" />
+	<item id="38852" price="0" />
+	<item id="38853" price="0" />
+	<item id="38854" price="0" />
+	<item id="38855" price="0" />
+	<item id="38856" price="0" />
+	<item id="38857" price="0" />
+	<item id="38858" price="0" />
+	<item id="38859" price="0" />
+	<item id="38860" price="0" />
+	<item id="38861" price="0" />
+	<item id="38862" price="0" />
+	<item id="38863" price="0" />
+	<item id="38864" price="0" />
+	<item id="38865" price="0" />
+	<item id="38866" price="0" />
+	<item id="38867" price="0" />
+	<item id="38868" price="0" />
+	<item id="38869" price="0" />
+	<item id="38870" price="0" />
+	<item id="38871" price="0" />
+	<item id="38872" price="0" />
+	<item id="38873" price="0" />
+	<item id="38874" price="0" />
+	<item id="38875" price="0" />
+	<item id="38876" price="0" />
+	<item id="38877" price="0" />
+	<item id="38878" price="0" />
+	<item id="38879" price="0" />
+	<item id="38880" price="0" />
+	<item id="38881" price="0" />
+	<item id="38882" price="0" />
+	<item id="38883" price="0" />
+	<item id="38884" price="0" />
+	<item id="38885" price="0" />
+	<item id="38886" price="0" />
+	<item id="38887" price="0" />
+	<item id="38888" price="0" />
+	<item id="38889" price="0" />
+	<item id="38890" price="0" />
+	<item id="38891" price="0" />
+	<item id="38892" price="0" />
+	<item id="38893" price="0" />
+	<item id="38894" price="0" />
+	<item id="38895" price="0" />
+	<item id="38896" price="0" />
+	<item id="38897" price="0" />
+	<item id="38898" price="0" />
+	<item id="38899" price="0" />
+	<item id="38927" price="0" />
+	<item id="38928" price="0" />
+	<item id="38929" price="0" />
+	<item id="38930" price="0" />
+	<item id="38931" price="0" />
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels.htm
index 9ebf3e3d8d..119b2dceb1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels.htm
@@ -55,7 +55,7 @@ Jewels by Grade<br1>
 <button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 3175711" value="Brooch Jewels/Box" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm
new file mode 100644
index 0000000000..5d034d13d2
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm
@@ -0,0 +1,30 @@
+<html><title>Shop</title><body>
+<center>
+<table width=260>
+<tr>
+<td width=40>
+<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+<td width=180>
+<center>GM Shop - Brooch</center>
+</td>
+<td width=40>
+<button value="Back" action="bypass -h admin_html gmstore/gear/jewels.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+</tr>
+</table>
+</center>
+<br><br>
+<center>
+Brooch Jewels<br1>
+<table width=260>
+<tr>
+<td align=center>
+<button action="bypass -h admin_buy 3175711" value="Brooch Jewels/Box" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+<td align=center>
+<button action="bypass -h admin_buy 3175710" value="Brooch Stones" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+</tr>
+</table>
+</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/consumables.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/consumables.htm
index 241890a680..d96e2ca7ed 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/consumables.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/consumables.htm
@@ -35,7 +35,7 @@
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9927" value="Old Crystals (SA)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9948" value="Henna Dyes" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
 <button action="bypass -h admin_buy 9929" value="Elixirs" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
@@ -43,18 +43,17 @@
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 3175709" value="New Crystals (SA)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9927" value="Soul Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 3175710" value="Brooch Stone" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9939" value="Gems/Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9939" value="Gems/Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 3175709" value="Ensoul Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9948" value="Henna Dyes" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels.htm
index 9ebf3e3d8d..119b2dceb1 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels.htm
@@ -55,7 +55,7 @@ Jewels by Grade<br1>
 <button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 3175711" value="Brooch Jewels/Box" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm
new file mode 100644
index 0000000000..5d034d13d2
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm
@@ -0,0 +1,30 @@
+<html><title>Shop</title><body>
+<center>
+<table width=260>
+<tr>
+<td width=40>
+<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+<td width=180>
+<center>GM Shop - Brooch</center>
+</td>
+<td width=40>
+<button value="Back" action="bypass -h admin_html gmstore/gear/jewels.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+</tr>
+</table>
+</center>
+<br><br>
+<center>
+Brooch Jewels<br1>
+<table width=260>
+<tr>
+<td align=center>
+<button action="bypass -h admin_buy 3175711" value="Brooch Jewels/Box" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+<td align=center>
+<button action="bypass -h admin_buy 3175710" value="Brooch Stones" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+</tr>
+</table>
+</center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/consumables.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/consumables.htm
index 241890a680..d96e2ca7ed 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/consumables.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/consumables.htm
@@ -35,7 +35,7 @@
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9927" value="Old Crystals (SA)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9948" value="Henna Dyes" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
 <button action="bypass -h admin_buy 9929" value="Elixirs" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
@@ -43,18 +43,17 @@
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 3175709" value="New Crystals (SA)" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9927" value="Soul Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 3175710" value="Brooch Stone" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9939" value="Gems/Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9939" value="Gems/Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 3175709" value="Ensoul Crystals" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9948" value="Henna Dyes" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels.htm
index 9ebf3e3d8d..119b2dceb1 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels.htm
@@ -55,7 +55,7 @@ Jewels by Grade<br1>
 <button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 3175711" value="Brooch Jewels/Box" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm
new file mode 100644
index 0000000000..5d034d13d2
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels/brooch.htm
@@ -0,0 +1,30 @@
+<html><title>Shop</title><body>
+<center>
+<table width=260>
+<tr>
+<td width=40>
+<button value="Main" action="bypass -h admin_admin" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+<td width=180>
+<center>GM Shop - Brooch</center>
+</td>
+<td width=40>
+<button value="Back" action="bypass -h admin_html gmstore/gear/jewels.htm" width=45 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+</tr>
+</table>
+</center>
+<br><br>
+<center>
+Brooch Jewels<br1>
+<table width=260>
+<tr>
+<td align=center>
+<button action="bypass -h admin_buy 3175711" value="Brooch Jewels/Box" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+<td align=center>
+<button action="bypass -h admin_buy 3175710" value="Brooch Stones" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+</tr>
+</table>
+</center></body></html>
\ No newline at end of file