From da39f395435dad4e1d029f184d1d32e7f5db480e Mon Sep 17 00:00:00 2001
From: mobius <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 4 Jan 2015 10:11:28 +0000
Subject: [PATCH] Faeron Gatekeeper.

---
 .../dist/game/data/html/teleporter/33948.htm  |  6 +++---
 trunk/dist/game/data/multisell/002.xml        |  1 +
 trunk/dist/game/data/teleporters/Astiel.xml   | 21 +++++++++++++++++++
 trunk/dist/game/data/xsd/teleporterData.xsd   |  4 ++--
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 trunk/dist/game/data/teleporters/Astiel.xml

diff --git a/trunk/dist/game/data/html/teleporter/33948.htm b/trunk/dist/game/data/html/teleporter/33948.htm
index 8a57da664a..d697812551 100644
--- a/trunk/dist/game/data/html/teleporter/33948.htm
+++ b/trunk/dist/game/data/html/teleporter/33948.htm
@@ -2,9 +2,9 @@
 Welcome. I'm Astiel, and I've been dispatched here from the Ivory Tower. When I first arrived, the Ertheia were in such disarray, but the village has since stabilized.<br>
 Now, what can I help you with?<br>
 (You can teleport for free if your <font color="LEVEL">main class</font> is <font color="LEVEL">Lv. 76 or below</font>.)<br>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_Teleport 1">"Uh, can I teleport?"</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h npc_%objectId%_showTeleports">"Uh, can I teleport?"</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_multisell 002">"I want to exchange some Dimensional Diamonds."</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h scripts_Util:NoblessTeleport">[Noblesse Only] "Teleportation, please."</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h scripts_services.Birthday:summonAlegria">"I need to call Alegria."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_showNoblesSelect">[Noblesse Only] "Teleportation, please."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest CharacterBirthday">"I need to call Alegria."</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/trunk/dist/game/data/multisell/002.xml b/trunk/dist/game/data/multisell/002.xml
index b158d3b73f..b4cf3434f3 100644
--- a/trunk/dist/game/data/multisell/002.xml
+++ b/trunk/dist/game/data/multisell/002.xml
@@ -21,6 +21,7 @@
 		<npc>31320</npc> <!-- Ilyana (Gatekeeper) -->
 		<npc>31964</npc> <!-- Bilia (Gatekeeper) -->
 		<npc>32163</npc> <!-- Ragara (Gatekeeper) -->
+		<npc>33948</npc> <!-- Astiel (Gatekeeper) -->
 	</npcs>
 	<item>
 		<!-- Dimensional Diamond -->
diff --git a/trunk/dist/game/data/teleporters/Astiel.xml b/trunk/dist/game/data/teleporters/Astiel.xml
new file mode 100644
index 0000000000..26e237ff92
--- /dev/null
+++ b/trunk/dist/game/data/teleporters/Astiel.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/teleporterData.xsd">
+	<npc id="33948"> <!-- Astiel -->
+		<teleport type="NORMAL">
+			<location npcStringId="1010004" x="-80684" y="149770" z="-3040" feeCount="11000" />
+			<location npcStringId="1010005" x="-14593" y="123936" z="-3120" feeCount="14000" />
+			<location npcStringId="1010001" x="-113432" y="256568" z="-1534" feeCount="1300" />
+			<location npcStringId="1010742" x="-82441" y="244204" z="-3747" feeCount="160" />
+		</teleport>
+		<teleport type="NOBLES_TOKEN">
+			<location npcStringId="1010506" x="-87328" y="142266" z="-3640" feeId="13722" feeCount="1" />
+			<location npcStringId="1010507" x="73579" y="142709" z="-3768" feeId="13722" feeCount="1" />
+			<location npcStringId="1010053" x="146440" y="46723" z="-3432" feeId="13722" feeCount="1" />
+		</teleport>
+		<teleport type="NOBLES_ADENA">
+			<location npcStringId="1010506" x="-87328" y="142266" z="-3640" feeCount="1000" />
+			<location npcStringId="1010507" x="73579" y="142709" z="-3768" feeCount="1000" />
+			<location npcStringId="1010053" x="146440" y="46723" z="-3432" feeCount="1000" />
+		</teleport>
+	</npc>
+</list>
\ No newline at end of file
diff --git a/trunk/dist/game/data/xsd/teleporterData.xsd b/trunk/dist/game/data/xsd/teleporterData.xsd
index e292feb5cd..d6b69774ff 100644
--- a/trunk/dist/game/data/xsd/teleporterData.xsd
+++ b/trunk/dist/game/data/xsd/teleporterData.xsd
@@ -15,7 +15,7 @@
 												<xs:attribute type="xs:int" name="npcStringId" use="optional" />
 												<xs:attribute type="xs:int" name="x" use="required" />
 												<xs:attribute type="xs:int" name="y" use="required" />
-												<xs:attribute type="xs:short" name="z" use="required" />
+												<xs:attribute type="xs:int" name="z" use="required" />
 												<xs:attribute type="xs:int" name="feeId" use="optional" />
 												<xs:attribute type="xs:int" name="feeCount" use="optional" />
 											</xs:complexType>
@@ -33,7 +33,7 @@
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>
-						<xs:attribute type="xs:short" name="id" />
+						<xs:attribute type="xs:int" name="id" />
 					</xs:complexType>
 				</xs:element>
 			</xs:sequence>