St3eT/elven_vil.diff

## elven_vil.diff
diff --git a/L2J_DataPack/dist/game/data/html/default/30991-1.htm b/L2J_DataPack/dist/game/data/html/default/30991-1.htm
index f846d50..1f4a75f 100644
--- a/L2J_DataPack/dist/game/data/html/default/30991-1.htm
+++ b/L2J_DataPack/dist/game/data/html/default/30991-1.htm
@@ -1,11 +1,10 @@
-<html><body>
-Lottery Ticket Seller:<br>
+<html><body>Lottery Ticket Seller:<br>
 Thank you for playing the lottery.<br>
 One lottery Ticket costs %ticket_price% Adena.<br>
 If you wish to play the lottery, press the button.<br>
 <center>
-<a action="bypass -h npc_%objectId%_Loto 21">Continue</a><br>
-<a action="bypass -h npc_%objectId%_Loto 25">Lottery instructions</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Quit</a>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 21">Continue</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 25">Lottery instructions</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 0">Quit</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/html/default/30991-2.htm b/L2J_DataPack/dist/game/data/html/default/30991-2.htm
index 2bfb2c2..d452228 100644
--- a/L2J_DataPack/dist/game/data/html/default/30991-2.htm
+++ b/L2J_DataPack/dist/game/data/html/default/30991-2.htm
@@ -9,6 +9,6 @@
 Lottery Tickets are sold on a weekly basis, starting at 7:10 pm every Saturday until 6:50 pm the following Saturday.<br>
 The winning numbers are announced at 7:00 pm every Saturday. All times are subject to change.<br>
 I wish you luck! Enjoy the lottery.<br>
-<A action="bypass -h npc_%objectId%_Chat 0">Back</a><br>
-<A action="bypass -h npc_%objectId%_Loto 0">Buy a Lottery Ticket.</a>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 0">Buy a Lottery Ticket.</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/html/default/30991-3.htm b/L2J_DataPack/dist/game/data/html/default/30991-3.htm
index 26db30a..3cc8687 100644
--- a/L2J_DataPack/dist/game/data/html/default/30991-3.htm
+++ b/L2J_DataPack/dist/game/data/html/default/30991-3.htm
@@ -3,6 +3,6 @@
 May I have your attention please!<br>
 The total jackpot amount so far for the Round %race% Lottery is %adena% Adena.<br><br>
 <center>
-<a action="bypass -h npc_%objectId%_Chat 0">Return</a>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 0">Return</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/html/default/30991-4.htm b/L2J_DataPack/dist/game/data/html/default/30991-4.htm
index ac16a93..f5e5b82 100644
--- a/L2J_DataPack/dist/game/data/html/default/30991-4.htm
+++ b/L2J_DataPack/dist/game/data/html/default/30991-4.htm
@@ -1,5 +1,5 @@
 <html><body>
 Lottery Ticket Seller:<br>
 %result%
-<a action="bypass -h npc_%objectId%_Chat 0">Return</a>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 0">Return</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/html/default/30991-6.htm b/L2J_DataPack/dist/game/data/html/default/30991-6.htm
index bf5dc9d..7f9f79e 100644
--- a/L2J_DataPack/dist/game/data/html/default/30991-6.htm
+++ b/L2J_DataPack/dist/game/data/html/default/30991-6.htm
@@ -3,6 +3,6 @@
 Thank you for playing the lottery.<br>
 The winners will be announced at 7:00 pm on Saturday<br>
 <center>
-<a action="bypass -h npc_%objectId%_Chat 0">Return</a><br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 0">Return</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/html/default/30991.htm b/L2J_DataPack/dist/game/data/html/default/30991.htm
index b55f998..68cba99 100644
--- a/L2J_DataPack/dist/game/data/html/default/30991.htm
+++ b/L2J_DataPack/dist/game/data/html/default/30991.htm
@@ -1,7 +1,7 @@
 <html><body>
 Lottery Ticket Seller:<br>
 Every ticket is a potential winner! Step right up!<br>
-<a action="bypass -h npc_%objectId%_Loto 0">Purchase Lottery Ticket</a><br>
-<a action="bypass -h npc_%objectId%_Loto 23">Current lottery jackpot</a><br>
-<a action="bypass -h npc_%objectId%_Loto 24">Previous winning numbers/Prize claim</a>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 0">Purchase Lottery Ticket</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 23">Current lottery jackpot</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 24">Previous winning numbers/Prize claim</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/html/default/33786.htm b/L2J_DataPack/dist/game/data/html/default/33786.htm
new file mode 100644
index 0000000..6754423
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/html/default/33786.htm
@@ -0,0 +1,4 @@
+<html><body>Mother Tree:<br>
+The Mother Tree, withered up after the Blood Rain.<br>
+The wind seems to carry the weeping of the tree.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/html/teleporter/30146.htm b/L2J_DataPack/dist/game/data/html/teleporter/30146.htm
index 5fb851a..49c4c9d 100644
--- a/L2J_DataPack/dist/game/data/html/teleporter/30146.htm
+++ b/L2J_DataPack/dist/game/data/html/teleporter/30146.htm
@@ -1,8 +1,9 @@
-<html><body>Gatekeeper Mirabel:<br>
-The Elves once thought that this forest was the entire world, but it is actually just a small part of a vast continent. If you want to go to the bigger world, we, the gatekeepers will gladly send you.<br>
-<a action="bypass -h npc_%objectId%_Chat 1">Teleport</a><br>
-<a action="bypass -h npc_%objectId%_multisell 002">Exchange Dimension Diamonds.</a><br>
-<a action="bypass -h npc_%objectId%_Quest NoblesseTeleport">[Noblesse Exclusive] Teleport</a><br>
-<a action="bypass -h npc_%objectId%_Quest CharacterBirthday">Call Alegria</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+<html><body>Teleport Device:<br>
+The Elven Village is deserted due to the recent plague outbreak. The survivors have fled to Talking Island, and you should do the same. <br>
+((If your <font color="LEVEL">Main Class</font> is <font color="LEVEL">Lv. 76 or below</font>, you may teleport for free.)<br>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_showTeleports">"I'll teleport."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 002">"I want to trade Dimensional Diamonds."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_showNoblesSelect">[Noblesse Only] Teleport</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest CharacterBirthday">"It's my character creation anniversary!</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/teleporters/TeleportDevice-Elven.xml b/L2J_DataPack/dist/game/data/teleporters/TeleportDevice-Elven.xml
new file mode 100644
index 0000000..a25852e
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/teleporters/TeleportDevice-Elven.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/teleporterData.xsd">
+	<npc id="30146"> <!-- Teleport Device -->
+		<teleport type="NORMAL">
+			<location npcStringId="1010005" x="-14608" y="123920" z="-3128" feeCount="9200" /> <!-- The Town of Gludio -->
+			<location npcStringId="1010158" x="115341" y="-178221" z="-928" feeCount="23000" /> <!-- Dwarven Village -->
+			<location npcStringId="1010001" x="-113443" y="256656" z="-1504" feeCount="26000" /> <!-- Talking Island Village -->
+			<location npcStringId="1010157" x="-44132" y="-113378" z="-238" feeCount="18000" /> <!-- Orc Village -->
+			<location npcStringId="1010648" x="-116977" y="46607" z="368" feeCount="16000" /> <!-- Kamael Village -->
+			<location npcStringId="1010156" x="11162" y="16012" z="-4584" feeCount="4700" /> <!-- Dark Elf Village -->
+			<location npcStringId="1010167" x="21373" y="51119" z="-3693" feeCount="710" /> <!-- Elven Forest (Lv. 8) -->
+			<location npcStringId="1010560" x="29298" y="74968" z="-3777" feeCount="820" /> <!-- Elven Fortress (Lv. 10) -->
+			<location npcStringId="1010612" x="-10612" y="75881" z="-3587" feeCount="1700" /> <!-- Neutral Zone (Lv. 15) -->
+		</teleport>
+		<teleport type="NOBLES_TOKEN">
+			<location npcStringId="1010506" x="-87334" y="142252" z="-3645" feeId="13722" feeCount="1" /> <!-- Gludin Arena -->
+			<location npcStringId="1010507" x="73579" y="142709" z="-3763" feeId="13722" feeCount="1" /> <!-- Giran Arena -->
+			<location npcStringId="1010613" x="-18415" y="85624" z="-3675" feeId="13722" feeCount="1" /> <!-- The Center of the Neutral Zone -->
+			<location npcStringId="1010053" x="146434" y="46712" z="-3433" feeId="13722" feeCount="1" /> <!-- Coliseum -->
+			<location npcStringId="1010731" x="-186306" y="242822" z="2552" feeId="13722" feeCount="100" /> <!-- Keucereus Alliance Base -->
+		</teleport>
+		<teleport type="NOBLES_ADENA">
+			<location npcStringId="1010506" x="-87334" y="142252" z="-3645" feeCount="1000" /> <!-- Gludin Arena -->
+			<location npcStringId="1010507" x="73579" y="142709" z="-3763" feeCount="1000" /> <!-- Giran Arena -->
+			<location npcStringId="1010613" x="-18415" y="85624" z="-3675" feeCount="1000" /> <!-- The Center of the Neutral Zone -->
+			<location npcStringId="1010053" x="146434" y="46712" z="-3433" feeCount="1000" /> <!-- Coliseum -->
+			<location npcStringId="1010731" x="-186306" y="242822" z="2552" feeCount="100000" /> <!-- Keucereus Alliance Base -->
+		</teleport>
+	</npc>
+</list>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/sql/game/spawnlist.sql b/L2J_DataPack/dist/sql/game/spawnlist.sql
index 5d94455..95ce8bc 100644
--- a/L2J_DataPack/dist/sql/game/spawnlist.sql
+++ b/L2J_DataPack/dist/sql/game/spawnlist.sql
@@ -17496,117 +17496,6 @@
 ("Elven_Village", 1, 27017, 34721, 36156, -3640, 0, 0, 0, 30, 0, 0, 0),
 -- Kracha
 ("Elven_Village", 1, 27060, 36910, 61471, -3616, 0, 0, 0, 180, 0, 0, 0),
--- Teleport Device
-("Elven_Village_Npc", 1, 30146, 46926, 51511, -2976, 0, 0, 43000, 60, 0, 0, 0),
--- Unoren
-("Elven_Village_Npc", 1, 30147, 44667, 46896, -2982, 0, 0, 31000, 60, 0, 0, 0),
--- Ariel
-("Elven_Village_Npc", 1, 30148, 44683, 46952, -2981, 0, 0, 28672, 60, 0, 0, 0),
--- Creamees
-("Elven_Village_Npc", 1, 30149, 42700, 50057, -2984, 0, 0, 14500, 60, 0, 0, 0),
--- Herbiel
-("Elven_Village_Npc", 1, 30150, 42766, 50037, -2984, 0, 0, 11500, 60, 0, 0, 0),
--- Chad
-("Elven_Village_Npc", 1, 30151, 47868, 50167, -2983, 0, 0, 50000, 60, 0, 0, 0),
--- Julia
-("Elven_Village_Npc", 1, 30152, 47912, 50170, -2983, 0, 0, 50000, 60, 0, 0, 0),
--- Markius
-("Elven_Village_Npc", 1, 30153, 47780, 49568, -2984, 0, 0, 4096, 60, 0, 0, 0),
--- Asterios
-("Elven_Village_Npc", 1, 30154, 44692, 52261, -2792, 0, 0, 0, 60, 0, 0, 0),
--- Ellenia
-("Elven_Village_Npc", 1, 30155, 45725, 52105, -2792, 0, 0, 16384, 60, 0, 0, 0),
--- Esrandell
-("Elven_Village_Npc", 1, 30156, 44823, 52414, -2792, 0, 0, 49152, 60, 0, 0, 0),
--- Greenis
-("Elven_Village_Npc", 1, 30157, 45000, 52101, -2792, 0, 0, 16384, 60, 0, 0, 0),
--- Esrandell
-("Elven_Village_Npc", 1, 30158, 45919, 52414, -2792, 0, 0, 49152, 60, 0, 0, 0),
--- Wheeler
-("Elven_Village_Npc", 1, 30216, 45778, 46534, -2992, 0, 0, 40960, 60, 0, 0, 0),
--- Berros
-("Elven_Village_Npc", 1, 30217, 45487, 46511, -2992, 0, 0, 57344, 60, 0, 0, 0),
--- Kendell
-("Elven_Village_Npc", 1, 30218, 47595, 51569, -2992, 0, 0, 16384, 60, 0, 0, 0),
--- Veltress
-("Elven_Village_Npc", 1, 30219, 47401, 51764, -2992, 0, 0, 0, 60, 0, 0, 0),
--- Starden
-("Elven_Village_Npc", 1, 30220, 42971, 51372, -2992, 0, 0, 32768, 60, 0, 0, 0),
--- Rayen
-("Elven_Village_Npc", 1, 30221, 42812, 51138, -2992, 0, 0, 16384, 60, 0, 0, 0),
--- Alshupes
-("Elven_Village_Npc", 1, 30222, 45859, 50827, -3056, 0, 0, 45056, 60, 0, 0, 0),
--- Arujien
-("Elven_Village_Npc", 1, 30223, 42978, 49115, -2992, 0, 0, 0, 60, 0, 0, 0),
--- Alberius
-("Elven_Village_Npc", 1, 30284, 45727, 51721, -2800, 0, 0, 49152, 60, 0, 0, 0),
--- Gartrandell
-("Elven_Village_Npc", 1, 30285, 44995, 51706, -2800, 0, 0, 49352, 60, 0, 0, 0),
--- Rizraell
-("Elven_Village_Npc", 1, 30361, 45610, 49008, -3056, 0, 0, 53248, 60, 0, 0, 0),
--- Andellia
-("Elven_Village_Npc", 1, 30362, 46475, 50495, -3056, 0, 0, 61440, 60, 0, 0, 0),
--- Aios
-("Elven_Village_Npc", 1, 30363, 44476, 47153, -2984, 0, 0, 46000, 60, 0, 0, 0),
--- Nerupa
-("Elven_Village_Npc", 1, 30370, 46048, 41200, -3504, 0, 0, 17000, 60, 0, 0, 0),
--- Newbie Helper
-("Elven_Village_Npc", 1, 30400, 46112, 41200, -3504, 0, 0, 17000, 60, 0, 0, 0),
--- Rosella
-("Elven_Village_Npc", 1, 30414, 43673, 49683, -3048, 0, 0, 0, 60, 0, 0, 0),
--- Newbie Helper
-("Elven_Village_Npc", 1, 30599, 45475, 48359, -3056, 0, 0, 49152, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("Elven_Village_Npc", 1, 30991, 46960, 51506, -2976, 0, 0, 47000, 60, 0, 0, 0),
--- Broadcasting Tower
-("Elven_Village_Npc", 1, 31031, 46450, 50822, -3056, 0, 0, 16384, 5, 0, 0, 0),
--- Sentinel
-("Elven_Village_Npc", 1, 31033, 48885, 44208, -3504, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31033, 39175, 37179, -3608, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31033, 49442, 55892, -3448, 0, 0, 14536, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31033, 38222, 44301, -3648, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31033, 43649, 59039, -3632, 0, 0, 0, 60, 0, 0, 0),
--- Kasiel
-("Elven_Village", 1, 31358, 43936, 51092, -2994, 0, 0, 0, 60, 0, 0, 0),
--- Jaradine
-("Elven_Village", 1, 31359, 44947, 50556, -3056, 0, 0, 0, 60, 0, 0, 0),
--- Perelin
-("Elven_Village_Npc", 1, 31563, 42672, 50352, -2984, 0, 0, 63500, 60, 0, 0, 0),
--- Grand Olympiad Manager
-("Elven_Village_Npc", 1, 31688, 44652, 50972, -3056, 0, 0, 49000, 60, 0, 0, 0),
--- Mr. Cat
-("Elven Village", 1, 31756, 45472, 49312, -3067, 0, 0, 53000, 60, 0, 0, 0),
-("Elven Village", 1, 31756, 47648, 51296, -2989, 0, 0, 38500, 60, 0, 0, 0),
--- Miss Queen
-("Elven Village", 1, 31757, 45414, 49296, -3067, 0, 0, 53000, 60, 0, 0, 0),
-("Elven Village", 1, 31757, 47680, 51255, -2989, 0, 0, 38500, 60, 0, 0, 0),
--- Monument of Heroes
-("Elven_Village_Npc", 1, 31769, 44602, 50979, -3056, 0, 0, 49000, 60, 0, 0, 0),
--- Adventure Guildsman
-("Elven_Village_Npc", 1, 31780, 45443, 48357, -3056, 0, 0, 50000, 60, 0, 0, 0),
--- Adventure Guildsman
-("Elven_Village_Npc", 1, 31781, 43136, 51376, -2992, 0, 0, 59000, 60, 0, 0, 0),
--- Pixy
-("Elven_Village_Npc", 1, 31848, 44336, 45127, -3704, 0, 0, 4676, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 48468, 37228, -3568, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 53396, 54646, -3480, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 47891, 45145, -3680, 0, 0, 28372, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 52948, 64124, -3472, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31848, 36370, 52378, -3520, 0, 0, 47819, 60, 0, 0, 0),
--- Treant
-("Elven_Village_Npc", 1, 31851, 43496, 38808, -3488, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 50944, 38828, -3520, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 56274, 53431, -3592, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 50640, 60470, -3440, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 57036, 62656, -3360, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 42211, 58300, -3664, 0, 0, 0, 60, 0, 0, 0),
-("Elven_Village_Npc", 1, 31851, 35592, 57852, -3680, 0, 0, 0, 60, 0, 0, 0),
--- Pixy Murika
-("Elven_Village_Npc", 1, 31852, 49262, 53607, -3216, 0, 0, 53248, 60, 0, 0, 0),
--- Treant Bremec
-("Elven_Village_Npc", 1, 31853, 50592, 54896, -3352, 0, 0, 40960, 60, 0, 0, 0),
--- Dimensional Merchant
-("Elven_Village_Npc", 1, 32478, 47600, 49920, -2992, 0, 0, 33500, 60, 0, 0, 0),
 --
 ("oren03_npc2119_01", 1, 32529, 46199, 39120, -3511, 0, 0, 0, 60, 0, 0, 0),
 ("oren03_npc2119_02", 1, 32529, 46723, 39231, -3511, 0, 0, 0, 60, 0, 0, 0),
@@ -17628,8 +17517,6 @@
 ("oren03_npc2119_18", 1, 32529, 46216, 39585, -3510, 0, 0, 0, 60, 0, 0, 0),
 ("oren03_npc2119_19", 1, 32529, 46139, 41117, -3508, 0, 0, 0, 60, 0, 0, 0),
 ("oren03_npc2119_20", 1, 32529, 45580, 40728, -3509, 0, 0, 0, 60, 0, 0, 0),
--- Manor Manager
-("Elven_Village_Npc", 1, 35230, 43849, 50558, -3056, 0, 0, 1448, 60, 0, 0, 0),

 -- [21_20]

@@ -42469,4 +42356,8 @@
 ('21_16', 1, 31757, 44294, -47642, -792, 0, 0, 50000, 60, 0, 0, 0), -- Miss Queen
 -- New Orc Village
 ('18_14', 1, 30994, -45266, -112468, -240, 0, 0, 500, 60, 0, 0, 0), -- Lottery Ticket Seller
-('18_14', 1, 30576, -43964, -113389, -232, 0, 0, 0, 60, 0, 0, 0); -- Teleport Device
\ No newline at end of file
+('18_14', 1, 30576, -43964, -113389, -232, 0, 0, 0, 60, 0, 0, 0), -- Teleport Device
+-- New Elven Village
+('21_19', 1, 30146, 45173, 48889, -3056, 0, 0, 0, 60, 0, 0, 0), -- Teleport Device
+('21_19', 1, 33786, 45256, 49556, -3064, 0, 0, 27964, 60, 0, 0, 0), -- Mother Tree
+('21_19', 1, 30991, 46960, 51506, -2976, 0, 0, 47000, 60, 0, 0, 0); -- Lottery Ticket Seller
	diff --git a/L2J_DataPack/dist/game/data/html/default/30991-1.htm b/L2J_DataPack/dist/game/data/html/default/30991-1.htm
	index f846d50..1f4a75f 100644
	--- a/L2J_DataPack/dist/game/data/html/default/30991-1.htm
	+++ b/L2J_DataPack/dist/game/data/html/default/30991-1.htm
	@@ -1,11 +1,10 @@
	-<html><body>
	-Lottery Ticket Seller:<br>
	+<html><body>Lottery Ticket Seller:<br>
	Thank you for playing the lottery.<br>
	One lottery Ticket costs %ticket_price% Adena.<br>
	If you wish to play the lottery, press the button.<br>
	<center>
	-<a action="bypass -h npc_%objectId%_Loto 21">Continue</a><br>
	-<a action="bypass -h npc_%objectId%_Loto 25">Lottery instructions</a><br>
	-<a action="bypass -h npc_%objectId%_Chat 0">Quit</a>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 21">Continue</Button>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 25">Lottery instructions</Button>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 0">Quit</Button>
	</center>
	</body></html>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/game/data/html/default/30991-2.htm b/L2J_DataPack/dist/game/data/html/default/30991-2.htm
	index 2bfb2c2..d452228 100644
	--- a/L2J_DataPack/dist/game/data/html/default/30991-2.htm
	+++ b/L2J_DataPack/dist/game/data/html/default/30991-2.htm
	@@ -9,6 +9,6 @@
	Lottery Tickets are sold on a weekly basis, starting at 7:10 pm every Saturday until 6:50 pm the following Saturday.<br>
	The winning numbers are announced at 7:00 pm every Saturday. All times are subject to change.<br>
	I wish you luck! Enjoy the lottery.<br>
	-<A action="bypass -h npc_%objectId%_Chat 0">Back</a><br>
	-<A action="bypass -h npc_%objectId%_Loto 0">Buy a Lottery Ticket.</a>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 0">Buy a Lottery Ticket.</Button>
	+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
	</body></html>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/game/data/html/default/30991-3.htm b/L2J_DataPack/dist/game/data/html/default/30991-3.htm
	index 26db30a..3cc8687 100644
	--- a/L2J_DataPack/dist/game/data/html/default/30991-3.htm
	+++ b/L2J_DataPack/dist/game/data/html/default/30991-3.htm
	@@ -3,6 +3,6 @@
	May I have your attention please!<br>
	The total jackpot amount so far for the Round %race% Lottery is %adena% Adena.<br><br>
	<center>
	-<a action="bypass -h npc_%objectId%_Chat 0">Return</a>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 0">Return</Button>
	</center>
	</body></html>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/game/data/html/default/30991-4.htm b/L2J_DataPack/dist/game/data/html/default/30991-4.htm
	index ac16a93..f5e5b82 100644
	--- a/L2J_DataPack/dist/game/data/html/default/30991-4.htm
	+++ b/L2J_DataPack/dist/game/data/html/default/30991-4.htm
	@@ -1,5 +1,5 @@
	<html><body>
	Lottery Ticket Seller:<br>
	%result%
	-<a action="bypass -h npc_%objectId%_Chat 0">Return</a>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 0">Return</Button>
	</body></html>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/game/data/html/default/30991-6.htm b/L2J_DataPack/dist/game/data/html/default/30991-6.htm
	index bf5dc9d..7f9f79e 100644
	--- a/L2J_DataPack/dist/game/data/html/default/30991-6.htm
	+++ b/L2J_DataPack/dist/game/data/html/default/30991-6.htm
	@@ -3,6 +3,6 @@
	Thank you for playing the lottery.<br>
	The winners will be announced at 7:00 pm on Saturday<br>
	<center>
	-<a action="bypass -h npc_%objectId%_Chat 0">Return</a><br>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 0">Return</Button>
	</center>
	</body></html>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/game/data/html/default/30991.htm b/L2J_DataPack/dist/game/data/html/default/30991.htm
	index b55f998..68cba99 100644
	--- a/L2J_DataPack/dist/game/data/html/default/30991.htm
	+++ b/L2J_DataPack/dist/game/data/html/default/30991.htm
	@@ -1,7 +1,7 @@
	<html><body>
	Lottery Ticket Seller:<br>
	Every ticket is a potential winner! Step right up!<br>
	-<a action="bypass -h npc_%objectId%_Loto 0">Purchase Lottery Ticket</a><br>
	-<a action="bypass -h npc_%objectId%_Loto 23">Current lottery jackpot</a><br>
	-<a action="bypass -h npc_%objectId%_Loto 24">Previous winning numbers/Prize claim</a>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 0">Purchase Lottery Ticket</Button>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 23">Current lottery jackpot</Button>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Loto 24">Previous winning numbers/Prize claim</Button>
	</body></html>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/game/data/html/default/33786.htm b/L2J_DataPack/dist/game/data/html/default/33786.htm
	new file mode 100644
	index 0000000..6754423
	--- /dev/null
	+++ b/L2J_DataPack/dist/game/data/html/default/33786.htm
	@@ -0,0 +1,4 @@
	+<html><body>Mother Tree:<br>
	+The Mother Tree, withered up after the Blood Rain.<br>
	+The wind seems to carry the weeping of the tree.
	+</body></html>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/game/data/html/teleporter/30146.htm b/L2J_DataPack/dist/game/data/html/teleporter/30146.htm
	index 5fb851a..49c4c9d 100644
	--- a/L2J_DataPack/dist/game/data/html/teleporter/30146.htm
	+++ b/L2J_DataPack/dist/game/data/html/teleporter/30146.htm
	@@ -1,8 +1,9 @@
	-<html><body>Gatekeeper Mirabel:<br>
	-The Elves once thought that this forest was the entire world, but it is actually just a small part of a vast continent. If you want to go to the bigger world, we, the gatekeepers will gladly send you.<br>
	-<a action="bypass -h npc_%objectId%_Chat 1">Teleport</a><br>
	-<a action="bypass -h npc_%objectId%_multisell 002">Exchange Dimension Diamonds.</a><br>
	-<a action="bypass -h npc_%objectId%_Quest NoblesseTeleport">[Noblesse Exclusive] Teleport</a><br>
	-<a action="bypass -h npc_%objectId%_Quest CharacterBirthday">Call Alegria</a><br>
	-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
	+<html><body>Teleport Device:<br>
	+The Elven Village is deserted due to the recent plague outbreak. The survivors have fled to Talking Island, and you should do the same. <br>
	+((If your <font color="LEVEL">Main Class</font> is <font color="LEVEL">Lv. 76 or below</font>, you may teleport for free.)<br>
	+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_showTeleports">"I'll teleport."</Button>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 002">"I want to trade Dimensional Diamonds."</Button>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_showNoblesSelect">[Noblesse Only] Teleport</Button>
	+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest CharacterBirthday">"It's my character creation anniversary!</Button>
	+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
	</body></html>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/game/data/teleporters/TeleportDevice-Elven.xml b/L2J_DataPack/dist/game/data/teleporters/TeleportDevice-Elven.xml
	new file mode 100644
	index 0000000..a25852e
	--- /dev/null
	+++ b/L2J_DataPack/dist/game/data/teleporters/TeleportDevice-Elven.xml
	@@ -0,0 +1,30 @@
	+<?xml version="1.0" encoding="UTF-8"?>
	+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/teleporterData.xsd">
	+ <npc id="30146"> <!-- Teleport Device -->
	+ <teleport type="NORMAL">
	+ <location npcStringId="1010005" x="-14608" y="123920" z="-3128" feeCount="9200" /> <!-- The Town of Gludio -->
	+ <location npcStringId="1010158" x="115341" y="-178221" z="-928" feeCount="23000" /> <!-- Dwarven Village -->
	+ <location npcStringId="1010001" x="-113443" y="256656" z="-1504" feeCount="26000" /> <!-- Talking Island Village -->
	+ <location npcStringId="1010157" x="-44132" y="-113378" z="-238" feeCount="18000" /> <!-- Orc Village -->
	+ <location npcStringId="1010648" x="-116977" y="46607" z="368" feeCount="16000" /> <!-- Kamael Village -->
	+ <location npcStringId="1010156" x="11162" y="16012" z="-4584" feeCount="4700" /> <!-- Dark Elf Village -->
	+ <location npcStringId="1010167" x="21373" y="51119" z="-3693" feeCount="710" /> <!-- Elven Forest (Lv. 8) -->
	+ <location npcStringId="1010560" x="29298" y="74968" z="-3777" feeCount="820" /> <!-- Elven Fortress (Lv. 10) -->
	+ <location npcStringId="1010612" x="-10612" y="75881" z="-3587" feeCount="1700" /> <!-- Neutral Zone (Lv. 15) -->
	+ </teleport>
	+ <teleport type="NOBLES_TOKEN">
	+ <location npcStringId="1010506" x="-87334" y="142252" z="-3645" feeId="13722" feeCount="1" /> <!-- Gludin Arena -->
	+ <location npcStringId="1010507" x="73579" y="142709" z="-3763" feeId="13722" feeCount="1" /> <!-- Giran Arena -->
	+ <location npcStringId="1010613" x="-18415" y="85624" z="-3675" feeId="13722" feeCount="1" /> <!-- The Center of the Neutral Zone -->
	+ <location npcStringId="1010053" x="146434" y="46712" z="-3433" feeId="13722" feeCount="1" /> <!-- Coliseum -->
	+ <location npcStringId="1010731" x="-186306" y="242822" z="2552" feeId="13722" feeCount="100" /> <!-- Keucereus Alliance Base -->
	+ </teleport>
	+ <teleport type="NOBLES_ADENA">
	+ <location npcStringId="1010506" x="-87334" y="142252" z="-3645" feeCount="1000" /> <!-- Gludin Arena -->
	+ <location npcStringId="1010507" x="73579" y="142709" z="-3763" feeCount="1000" /> <!-- Giran Arena -->
	+ <location npcStringId="1010613" x="-18415" y="85624" z="-3675" feeCount="1000" /> <!-- The Center of the Neutral Zone -->
	+ <location npcStringId="1010053" x="146434" y="46712" z="-3433" feeCount="1000" /> <!-- Coliseum -->
	+ <location npcStringId="1010731" x="-186306" y="242822" z="2552" feeCount="100000" /> <!-- Keucereus Alliance Base -->
	+ </teleport>
	+ </npc>
	+</list>
	\ No newline at end of file
	diff --git a/L2J_DataPack/dist/sql/game/spawnlist.sql b/L2J_DataPack/dist/sql/game/spawnlist.sql
	index 5d94455..95ce8bc 100644
	--- a/L2J_DataPack/dist/sql/game/spawnlist.sql
	+++ b/L2J_DataPack/dist/sql/game/spawnlist.sql
	@@ -17496,117 +17496,6 @@
	("Elven_Village", 1, 27017, 34721, 36156, -3640, 0, 0, 0, 30, 0, 0, 0),
	-- Kracha
	("Elven_Village", 1, 27060, 36910, 61471, -3616, 0, 0, 0, 180, 0, 0, 0),
	--- Teleport Device
	-("Elven_Village_Npc", 1, 30146, 46926, 51511, -2976, 0, 0, 43000, 60, 0, 0, 0),
	--- Unoren
	-("Elven_Village_Npc", 1, 30147, 44667, 46896, -2982, 0, 0, 31000, 60, 0, 0, 0),
	--- Ariel
	-("Elven_Village_Npc", 1, 30148, 44683, 46952, -2981, 0, 0, 28672, 60, 0, 0, 0),
	--- Creamees
	-("Elven_Village_Npc", 1, 30149, 42700, 50057, -2984, 0, 0, 14500, 60, 0, 0, 0),
	--- Herbiel
	-("Elven_Village_Npc", 1, 30150, 42766, 50037, -2984, 0, 0, 11500, 60, 0, 0, 0),
	--- Chad
	-("Elven_Village_Npc", 1, 30151, 47868, 50167, -2983, 0, 0, 50000, 60, 0, 0, 0),
	--- Julia
	-("Elven_Village_Npc", 1, 30152, 47912, 50170, -2983, 0, 0, 50000, 60, 0, 0, 0),
	--- Markius
	-("Elven_Village_Npc", 1, 30153, 47780, 49568, -2984, 0, 0, 4096, 60, 0, 0, 0),
	--- Asterios
	-("Elven_Village_Npc", 1, 30154, 44692, 52261, -2792, 0, 0, 0, 60, 0, 0, 0),
	--- Ellenia
	-("Elven_Village_Npc", 1, 30155, 45725, 52105, -2792, 0, 0, 16384, 60, 0, 0, 0),
	--- Esrandell
	-("Elven_Village_Npc", 1, 30156, 44823, 52414, -2792, 0, 0, 49152, 60, 0, 0, 0),
	--- Greenis
	-("Elven_Village_Npc", 1, 30157, 45000, 52101, -2792, 0, 0, 16384, 60, 0, 0, 0),
	--- Esrandell
	-("Elven_Village_Npc", 1, 30158, 45919, 52414, -2792, 0, 0, 49152, 60, 0, 0, 0),
	--- Wheeler
	-("Elven_Village_Npc", 1, 30216, 45778, 46534, -2992, 0, 0, 40960, 60, 0, 0, 0),
	--- Berros
	-("Elven_Village_Npc", 1, 30217, 45487, 46511, -2992, 0, 0, 57344, 60, 0, 0, 0),
	--- Kendell
	-("Elven_Village_Npc", 1, 30218, 47595, 51569, -2992, 0, 0, 16384, 60, 0, 0, 0),
	--- Veltress
	-("Elven_Village_Npc", 1, 30219, 47401, 51764, -2992, 0, 0, 0, 60, 0, 0, 0),
	--- Starden
	-("Elven_Village_Npc", 1, 30220, 42971, 51372, -2992, 0, 0, 32768, 60, 0, 0, 0),
	--- Rayen
	-("Elven_Village_Npc", 1, 30221, 42812, 51138, -2992, 0, 0, 16384, 60, 0, 0, 0),
	--- Alshupes
	-("Elven_Village_Npc", 1, 30222, 45859, 50827, -3056, 0, 0, 45056, 60, 0, 0, 0),
	--- Arujien
	-("Elven_Village_Npc", 1, 30223, 42978, 49115, -2992, 0, 0, 0, 60, 0, 0, 0),
	--- Alberius
	-("Elven_Village_Npc", 1, 30284, 45727, 51721, -2800, 0, 0, 49152, 60, 0, 0, 0),
	--- Gartrandell
	-("Elven_Village_Npc", 1, 30285, 44995, 51706, -2800, 0, 0, 49352, 60, 0, 0, 0),
	--- Rizraell
	-("Elven_Village_Npc", 1, 30361, 45610, 49008, -3056, 0, 0, 53248, 60, 0, 0, 0),
	--- Andellia
	-("Elven_Village_Npc", 1, 30362, 46475, 50495, -3056, 0, 0, 61440, 60, 0, 0, 0),
	--- Aios
	-("Elven_Village_Npc", 1, 30363, 44476, 47153, -2984, 0, 0, 46000, 60, 0, 0, 0),
	--- Nerupa
	-("Elven_Village_Npc", 1, 30370, 46048, 41200, -3504, 0, 0, 17000, 60, 0, 0, 0),
	--- Newbie Helper
	-("Elven_Village_Npc", 1, 30400, 46112, 41200, -3504, 0, 0, 17000, 60, 0, 0, 0),
	--- Rosella
	-("Elven_Village_Npc", 1, 30414, 43673, 49683, -3048, 0, 0, 0, 60, 0, 0, 0),
	--- Newbie Helper
	-("Elven_Village_Npc", 1, 30599, 45475, 48359, -3056, 0, 0, 49152, 60, 0, 0, 0),
	--- Lottery Ticket Seller
	-("Elven_Village_Npc", 1, 30991, 46960, 51506, -2976, 0, 0, 47000, 60, 0, 0, 0),
	--- Broadcasting Tower
	-("Elven_Village_Npc", 1, 31031, 46450, 50822, -3056, 0, 0, 16384, 5, 0, 0, 0),
	--- Sentinel
	-("Elven_Village_Npc", 1, 31033, 48885, 44208, -3504, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31033, 39175, 37179, -3608, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31033, 49442, 55892, -3448, 0, 0, 14536, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31033, 38222, 44301, -3648, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31033, 43649, 59039, -3632, 0, 0, 0, 60, 0, 0, 0),
	--- Kasiel
	-("Elven_Village", 1, 31358, 43936, 51092, -2994, 0, 0, 0, 60, 0, 0, 0),
	--- Jaradine
	-("Elven_Village", 1, 31359, 44947, 50556, -3056, 0, 0, 0, 60, 0, 0, 0),
	--- Perelin
	-("Elven_Village_Npc", 1, 31563, 42672, 50352, -2984, 0, 0, 63500, 60, 0, 0, 0),
	--- Grand Olympiad Manager
	-("Elven_Village_Npc", 1, 31688, 44652, 50972, -3056, 0, 0, 49000, 60, 0, 0, 0),
	--- Mr. Cat
	-("Elven Village", 1, 31756, 45472, 49312, -3067, 0, 0, 53000, 60, 0, 0, 0),
	-("Elven Village", 1, 31756, 47648, 51296, -2989, 0, 0, 38500, 60, 0, 0, 0),
	--- Miss Queen
	-("Elven Village", 1, 31757, 45414, 49296, -3067, 0, 0, 53000, 60, 0, 0, 0),
	-("Elven Village", 1, 31757, 47680, 51255, -2989, 0, 0, 38500, 60, 0, 0, 0),
	--- Monument of Heroes
	-("Elven_Village_Npc", 1, 31769, 44602, 50979, -3056, 0, 0, 49000, 60, 0, 0, 0),
	--- Adventure Guildsman
	-("Elven_Village_Npc", 1, 31780, 45443, 48357, -3056, 0, 0, 50000, 60, 0, 0, 0),
	--- Adventure Guildsman
	-("Elven_Village_Npc", 1, 31781, 43136, 51376, -2992, 0, 0, 59000, 60, 0, 0, 0),
	--- Pixy
	-("Elven_Village_Npc", 1, 31848, 44336, 45127, -3704, 0, 0, 4676, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31848, 48468, 37228, -3568, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31848, 53396, 54646, -3480, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31848, 47891, 45145, -3680, 0, 0, 28372, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31848, 52948, 64124, -3472, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31848, 36370, 52378, -3520, 0, 0, 47819, 60, 0, 0, 0),
	--- Treant
	-("Elven_Village_Npc", 1, 31851, 43496, 38808, -3488, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31851, 50944, 38828, -3520, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31851, 56274, 53431, -3592, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31851, 50640, 60470, -3440, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31851, 57036, 62656, -3360, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31851, 42211, 58300, -3664, 0, 0, 0, 60, 0, 0, 0),
	-("Elven_Village_Npc", 1, 31851, 35592, 57852, -3680, 0, 0, 0, 60, 0, 0, 0),
	--- Pixy Murika
	-("Elven_Village_Npc", 1, 31852, 49262, 53607, -3216, 0, 0, 53248, 60, 0, 0, 0),
	--- Treant Bremec
	-("Elven_Village_Npc", 1, 31853, 50592, 54896, -3352, 0, 0, 40960, 60, 0, 0, 0),
	--- Dimensional Merchant
	-("Elven_Village_Npc", 1, 32478, 47600, 49920, -2992, 0, 0, 33500, 60, 0, 0, 0),
	--
	("oren03_npc2119_01", 1, 32529, 46199, 39120, -3511, 0, 0, 0, 60, 0, 0, 0),
	("oren03_npc2119_02", 1, 32529, 46723, 39231, -3511, 0, 0, 0, 60, 0, 0, 0),
	@@ -17628,8 +17517,6 @@
	("oren03_npc2119_18", 1, 32529, 46216, 39585, -3510, 0, 0, 0, 60, 0, 0, 0),
	("oren03_npc2119_19", 1, 32529, 46139, 41117, -3508, 0, 0, 0, 60, 0, 0, 0),
	("oren03_npc2119_20", 1, 32529, 45580, 40728, -3509, 0, 0, 0, 60, 0, 0, 0),
	--- Manor Manager
	-("Elven_Village_Npc", 1, 35230, 43849, 50558, -3056, 0, 0, 1448, 60, 0, 0, 0),

	-- [21_20]

	@@ -42469,4 +42356,8 @@
	('21_16', 1, 31757, 44294, -47642, -792, 0, 0, 50000, 60, 0, 0, 0), -- Miss Queen
	-- New Orc Village
	('18_14', 1, 30994, -45266, -112468, -240, 0, 0, 500, 60, 0, 0, 0), -- Lottery Ticket Seller
	-('18_14', 1, 30576, -43964, -113389, -232, 0, 0, 0, 60, 0, 0, 0); -- Teleport Device
	\ No newline at end of file
	+('18_14', 1, 30576, -43964, -113389, -232, 0, 0, 0, 60, 0, 0, 0), -- Teleport Device
	+-- New Elven Village
	+('21_19', 1, 30146, 45173, 48889, -3056, 0, 0, 0, 60, 0, 0, 0), -- Teleport Device
	+('21_19', 1, 33786, 45256, 49556, -3064, 0, 0, 27964, 60, 0, 0, 0), -- Mother Tree
	+('21_19', 1, 30991, 46960, 51506, -2976, 0, 0, 47000, 60, 0, 0, 0); -- Lottery Ticket Seller