From 706a94b59f6b76555d8d7a876965c6ef4d2c8a1e Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 18 Nov 2017 04:05:54 +0000
Subject: [PATCH] Grand Crusade Keucereus teleports. Contributed by gamelike85.

---
 .../game/data/html/teleporter/30256-1.htm     |  2 +-
 .../dist/game/data/html/teleporter/30256.htm  |  1 +
 .../SeedTeleportDevice/15929.html             |  2 +-
 .../dist/game/data/teleporters/town/Bella.xml | 36 ++++++++++---------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/teleporter/30256-1.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/teleporter/30256-1.htm
index 8b856f7b5c..7a60baf1aa 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/teleporter/30256-1.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/teleporter/30256-1.htm
@@ -2,5 +2,5 @@
 Embryo has launched an occupational war againts Gracia. All Airship Fields and Sayunes are closed due to the war. The Gracia Army has allied with the Aden Army and managed to defend the Keucereus Alliance Base, but the Embryo Army continues to attack it.<br>
 If the Keucereus Alliance Base is in a defensive battle, I can send all warriors of level 95 or higher to the Keucereus Alliance Base.<br>
 If the alliance has successfully defended or no battle with the Embryo army has occurred, I can teleport you to the base immediately. Teleportation cost 150,000 Adena.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport 3 1">Teleport</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Teleport</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/teleporter/30256.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/teleporter/30256.htm
index 508322783f..8e1a7338c4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/teleporter/30256.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/teleporter/30256.htm
@@ -2,6 +2,7 @@
 Welcome! Beautiful weather, isn't it? Perfect for traveling!<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%_Chat 1">"Go to Keucereus Alliance Base"</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">"I'll teleport."[Noblesse Only]</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest TeleportToRaceTrack" msg="811;Monster Race Track">"I want to go to the Arena and Monster Race Track for free."</Button>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/15929.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/15929.html
index c12dfbd246..a888573d61 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/15929.html
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/SeedTeleportDevice/15929.html
@@ -4,5 +4,5 @@ You will be guided to select where to go.<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest SeedTeleportDevice seedOfDestruction">Seed of Destruction (Lv.93)</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest SeedTeleportDevice seedOfInfinity">Seed of Infinity (Lv.95)</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest SeedTeleportDevice seedOfHellfire">Seed of Hellfire (Lv.97)</Button>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport 3 1">Town of Gludio</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_teleport OTHER 0">Town of Gludio</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/teleporters/town/Bella.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/teleporters/town/Bella.xml
index 871759078a..338c1f5b74 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/teleporters/town/Bella.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/teleporters/town/Bella.xml
@@ -2,29 +2,28 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/teleporterData.xsd">
 	<npc id="30256"> <!-- Bella -->
 		<teleport type="NORMAL">
-			<location npcStringId="1010574" x="87130" y="-143514" z="-1291" feeCount="85000" castleId="9" /> <!-- Town of Schuttgart -->
-			<location npcStringId="1010049" x="111453" y="219391" z="-3545" feeCount="47000" castleId="6" questZoneId="118" /> <!-- Heine -->
-			<location npcStringId="1010023" x="146798" y="25796" z="-2012" feeCount="56000" castleId="5" questZoneId="77" /> <!-- Town of Aden -->
-			<location npcStringId="1010013" x="82958" y="53213" z="-1495" feeCount="35000" castleId="4" questZoneId="101" /> <!-- Town of Oren -->
-			<location npcStringId="1010006" x="15487" y="142871" z="-2701" feeCount="3400" castleId="2" questZoneId="48" /> <!-- The Town of Dion -->
-			<location npcStringId="1010199" x="148015" y="-55293" z="-2733" feeCount="71000" castleId="7" /> <!-- Town of Goddard -->
-			<location npcStringId="1010007" x="83551" y="147945" z="-3395" feeCount="29000" castleId="3" /> <!-- The Town of Giran -->
-			<location npcStringId="1010200" x="43823" y="-47760" z="-796" feeCount="53000" castleId="8" /> <!-- Town of Rune -->
-			<location npcStringId="1010004" x="-80678" y="149769" z="-3043" feeCount="7300" questZoneId="21" /> <!-- The Village of Gludin -->
-			<location npcStringId="1010001" x="-113443" y="256656" z="-1504" feeCount="16000" questZoneId="35" /> <!-- Talking Island Village -->
+			<location npcStringId="1010574" x="87130" y="-143514" z="-1291" feeCount="85000" /> <!-- Town of Schuttgart -->
+			<location npcStringId="1010049" x="111453" y="219391" z="-3545" questZoneId="118" feeCount="47000" /> <!-- Heine -->
+			<location npcStringId="1010023" x="146798" y="25796" z="-2012" questZoneId="77" feeCount="56000" /> <!-- Town of Aden -->
+			<location npcStringId="1010013" x="82958" y="53213" z="-1495" questZoneId="101" feeCount="35000" /> <!-- Town of Oren -->
+			<location npcStringId="1010006" x="15487" y="142871" z="-2701" questZoneId="48" feeCount="3400" /> <!-- The Town of Dion -->
+			<location npcStringId="1010199" x="148015" y="-55293" z="-2733" feeCount="71000" /> <!-- Town of Goddard -->
+			<location npcStringId="1010007" x="83551" y="147945" z="-3395" feeCount="29000" /> <!-- The Town of Giran -->
+			<location npcStringId="1010200" x="43823" y="-47760" z="-796" feeCount="53000" /> <!-- Town of Rune -->
+			<location npcStringId="1010004" x="-80678" y="149769" z="-3043" questZoneId="21" feeCount="7300" /> <!-- The Village of Gludin -->
+			<location npcStringId="1010001" x="-113443" y="256656" z="-1504" questZoneId="35" feeCount="16000" /> <!-- Talking Island Village -->
 			<location npcStringId="1010155" x="44730" y="49210" z="-3059" feeCount="9200" /> <!-- Elven Village -->
 			<location npcStringId="1010156" x="11162" y="16012" z="-4584" feeCount="10000" /> <!-- Dark Elf Village -->
 			<location npcStringId="1010158" x="115341" y="-178221" z="-928" feeCount="32000" /> <!-- Dwarven Village -->
 			<location npcStringId="1010157" x="-44132" y="-113378" z="-238" feeCount="23000" /> <!-- Orc Village -->
 			<location npcStringId="1010648" x="-116977" y="46607" z="368" feeCount="12000" /> <!-- Kamael Village -->
-			<location npcStringId="1010741" x="-80532" y="247714" z="-3492" feeCount="14000" questZoneId="542" /> <!-- Faeron Village -->
-			<location npcStringId="1010745" x="-149649" y="255028" z="-80" feeCount="18000" /> <!-- Gludio Airship Wharf -->
-			<location npcStringId="1010175" x="-74850" y="168753" z="-3506" feeCount="1400" castleId="1" questZoneId="256" /> <!-- Windmill Hill (Lv. 20) -->
-			<location npcStringId="1010097" x="-41167" y="122789" z="-2914" feeCount="790" questZoneId="27" /> <!-- Ruins of Agony (Lv. 25) -->
-			<location npcStringId="1010101" x="-19353" y="136842" z="-3759" feeCount="610" questZoneId="29" /> <!-- Ruins of Despair (Lv. 30) -->
-			<location npcStringId="1010621" x="-16475" y="208815" z="-3662" feeCount="1400" castleId="1" questZoneId="15" /> <!-- Wastelands (Lv. 35) -->
+			<location npcStringId="1010741" x="-80532" y="247714" z="-3492" questZoneId="542" feeCount="14000" /> <!-- Faeron Village -->
+			<location npcStringId="1010175" x="-74850" y="168753" z="-3506" questZoneId="256" feeCount="1400" /> <!-- Windmill Hill (Lv. 20) -->
+			<location npcStringId="1010097" x="-41167" y="122789" z="-2914" questZoneId="27" feeCount="790" /> <!-- Ruins of Agony (Lv. 25) -->
+			<location npcStringId="1010101" x="-19353" y="136842" z="-3759" questZoneId="29" feeCount="610" /> <!-- Ruins of Despair (Lv. 30) -->
+			<location npcStringId="1010621" x="-16475" y="208815" z="-3662" questZoneId="15" feeCount="1400" /> <!-- Wastelands (Lv. 35) -->
 			<location npcStringId="1010566" x="-9965" y="176174" z="-4149" feeCount="2100" /> <!-- Ant Nest (Lv. 29) -->
-			<location npcStringId="1010102" x="-28341" y="155100" z="-3514" feeCount="1400" castleId="1" /> <!-- Windawood Manor (Lv. 22) -->
+			<location npcStringId="1010102" x="-28341" y="155100" z="-3514" feeCount="1400" /> <!-- Windawood Manor (Lv. 22) -->
 		</teleport>
 		<teleport type="NOBLES_TOKEN">
 			<location npcStringId="1010506" x="-87328" y="142266" z="-3640" feeId="13722" feeCount="1" /> <!-- Gludin Arena -->
@@ -38,5 +37,8 @@
 			<location npcStringId="1010171" x="-6989" y="109503" z="-3040" feeCount="1000" /> <!-- Evil Hunting Grounds (Lv. 14) -->
 			<location npcStringId="1010053" x="146440" y="46723" z="-3432" feeCount="1000" /> <!-- Coliseum -->
 		</teleport>
+		<teleport type="OTHER">
+			<location npcStringId="1010731" x="-186565" y="243629" z="2621" feeCount="150000" /> <!-- Keucereus Alliance Base -->
+		</teleport>
 	</npc>
 </list>
\ No newline at end of file