From 7dc4e83e70cf12689240e31c88ed0de1d59d124a Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 6 Nov 2022 22:33:22 +0000
Subject: [PATCH] Fixing Wyvern mount.

---
 .../dist/game/data/CategoryData.xml           |  2 +-
 .../dist/game/data/html/admin/gm_menu.htm     | 18 ++++------
 .../others/WyvernManager/WyvernManager.java   |  2 +-
 .../admincommandhandlers/AdminRide.java       |  2 +-
 .../voicedcommandhandlers/CastleVCmd.java     |  2 +-
 .../dist/game/data/stats/npcs/15900-15999.xml | 33 +++++++++++++++++++
 .../game/data/stats/pets/15955_Wyvern.xml     |  2 +-
 .../gameserver/model/actor/Summon.java        |  5 +--
 .../dist/game/data/CategoryData.xml           |  2 +-
 .../dist/game/data/html/admin/gm_menu.htm     | 18 ++++------
 .../others/WyvernManager/WyvernManager.java   |  2 +-
 .../admincommandhandlers/AdminRide.java       |  2 +-
 .../voicedcommandhandlers/CastleVCmd.java     |  2 +-
 .../game/data/stats/pets/15955_Wyvern.xml     |  2 +-
 .../gameserver/model/actor/Summon.java        |  5 +--
 .../dist/game/data/CategoryData.xml           |  2 +-
 .../dist/game/data/html/admin/gm_menu.htm     | 18 ++++------
 .../others/WyvernManager/WyvernManager.java   |  2 +-
 .../admincommandhandlers/AdminRide.java       |  2 +-
 .../voicedcommandhandlers/CastleVCmd.java     |  2 +-
 .../game/data/stats/pets/15955_Wyvern.xml     |  2 +-
 .../gameserver/model/actor/Summon.java        |  5 +--
 .../dist/game/data/CategoryData.xml           |  2 +-
 .../dist/game/data/html/admin/gm_menu.htm     | 18 ++++------
 .../others/WyvernManager/WyvernManager.java   |  2 +-
 .../admincommandhandlers/AdminRide.java       |  2 +-
 .../voicedcommandhandlers/CastleVCmd.java     |  2 +-
 .../game/data/stats/pets/15955_Wyvern.xml     |  4 +--
 .../gameserver/model/actor/Summon.java        |  5 +--
 29 files changed, 94 insertions(+), 73 deletions(-)

diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml
index 359594290c..45f3b66a2f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml
@@ -361,7 +361,7 @@
 		<id>16042</id> <!-- grown_up_wolf_ride_white -->
 	</category>
 	<category name="WYVERN_GROUP">
-		<id>12621</id> <!-- wyvern -->
+		<id>15955</id> <!-- wyvern -->
 	</category>
 	<category name="SUBJOB_GROUP_KNIGHT">
 		<id>5</id> <!-- paladin -->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/admin/gm_menu.htm
index 51e6be4257..e7ee9762e5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/html/admin/gm_menu.htm
@@ -44,22 +44,18 @@
 <td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<center><multiedit var="new_announcement" width=250 height=80></center>
+<center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
 <td><button value="Announce" action="bypass -h admin_announce $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Critical" action="bypass -h admin_announce_crit $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="On-Screen" action="bypass -h admin_announce_screen $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="GM Chat" action="bypass -h admin_gmchat_menu $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<!--
+Wyvern<br1>
 <table width=270><tr>
-<td><button value="Fenrir" action="bypass -h admin_ride_wolf" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Strider" action="bypass -h admin_ride_strider" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Wyvern" action="bypass -h admin_ride_wyvern" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Horse" action="bypass -h admin_ride_horse" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr><tr>
-<td><button value="Jet Bike" action="bypass -h admin_ride_bike" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
--->
-<br>
+<td width=65></td>
+<td><button value="Ride" action="bypass -h admin_ride_wyvern" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Unride" action="bypass -h admin_unride" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=65></td>
+</tr></table><br>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..2dedad14e3 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -42,7 +42,7 @@ public class WyvernManager extends AbstractNpcAI
 	
 	// Misc
 	private static final int CRYSTAL_B_GRADE = 1460;
-	private static final int WYVERN = 12621;
+	private static final int WYVERN = 15955;
 	private static final int WYVERN_FEE = 25;
 	private static final int STRIDER_LEVEL = 55;
 	private static final int[] STRIDERS =
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
index bbe7739adf..4a94bf891c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
@@ -63,7 +63,7 @@ public class AdminRide implements IAdminCommandHandler
 			int petRideId;
 			if (command.startsWith("admin_ride_wyvern"))
 			{
-				petRideId = 12621;
+				petRideId = 15955;
 			}
 			else if (command.startsWith("admin_ride_strider"))
 			{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
index 8608d62e60..6ea7ab7916 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
@@ -123,7 +123,7 @@ public class CastleVCmd implements IVoicedCommandHandler
 			{
 				if (activeChar.isClanLeader() && (activeChar.getClan().getCastleId() > 0))
 				{
-					activeChar.mount(12621, 0, true);
+					activeChar.mount(15955, 0, true);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/npcs/15900-15999.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/npcs/15900-15999.xml
index 9b248747c7..5e85491623 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/npcs/15900-15999.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/npcs/15900-15999.xml
@@ -348,6 +348,39 @@
 			<skill id="4415" level="1" /> <!-- Bare Hands -->
 		</skillList>
 	</npc>
+	<npc id="15955" level="70" type="Folk" name="Wyvern">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>DRAGON</race>
+		<sex>MALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578.55294197919" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
+			<attack physical="688.86373" magical="470.40463" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
+			<defence physical="295.91597" magical="216.53847" />
+			<speed>
+				<walk ground="80" />
+				<run ground="170" />
+			</speed>
+			<hitTime>600</hitTime>
+			<abnormalResist physical="10" magical="10" />
+		</stats>
+		<status attackable="true" />
+		<collision>
+			<radius normal="250" />
+			<height normal="80" />
+		</collision>
+		<skillList>
+			<skill id="4416" level="10" /> <!-- Dragons -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average Damage Dealer -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="4121" level="1" /> <!-- Summoned Monster Magic Protection -->
+		</skillList>
+	</npc>
 	<npc id="15969" level="85" type="Monster" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/15955_Wyvern.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/15955_Wyvern.xml
index b4c1f08138..b5eea2c69a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/15955_Wyvern.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/pets/15955_Wyvern.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
 	<!-- wyvern -->
-	<pet id="12621" itemId="-1" index="99">
+	<pet id="15955" itemId="-1" index="99">
 		<set name="food" val="6316" />
 		<set name="hungry_limit" val="55" />
 		<set name="load" val="54510" />
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 50a2adc52f..c7c3c9e65e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -96,9 +96,10 @@ public abstract class Summon extends Playable
 	// @formatter:off
 	private static final int[] PASSIVE_SUMMONS =
 	{
-		12564, 12621, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
+		12564, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
 		14712, 14713, 14714, 14715, 14716, 14717, 14718, 14719, 14720, 14721, 14722, 14723,
-		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736
+		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736,
+		15955
 	};
 	// @formatter:on
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml
index 08ccb53abc..b25fcae27d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml
@@ -373,7 +373,7 @@
 		<id>16042</id> <!-- grown_up_wolf_ride_white -->
 	</category>
 	<category name="WYVERN_GROUP">
-		<id>12621</id> <!-- wyvern -->
+		<id>15955</id> <!-- wyvern -->
 	</category>
 	<category name="SUBJOB_GROUP_KNIGHT">
 		<id>5</id> <!-- paladin -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/admin/gm_menu.htm
index 51e6be4257..e7ee9762e5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/html/admin/gm_menu.htm
@@ -44,22 +44,18 @@
 <td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<center><multiedit var="new_announcement" width=250 height=80></center>
+<center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
 <td><button value="Announce" action="bypass -h admin_announce $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Critical" action="bypass -h admin_announce_crit $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="On-Screen" action="bypass -h admin_announce_screen $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="GM Chat" action="bypass -h admin_gmchat_menu $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<!--
+Wyvern<br1>
 <table width=270><tr>
-<td><button value="Fenrir" action="bypass -h admin_ride_wolf" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Strider" action="bypass -h admin_ride_strider" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Wyvern" action="bypass -h admin_ride_wyvern" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Horse" action="bypass -h admin_ride_horse" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr><tr>
-<td><button value="Jet Bike" action="bypass -h admin_ride_bike" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
--->
-<br>
+<td width=65></td>
+<td><button value="Ride" action="bypass -h admin_ride_wyvern" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Unride" action="bypass -h admin_unride" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=65></td>
+</tr></table><br>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..2dedad14e3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -42,7 +42,7 @@ public class WyvernManager extends AbstractNpcAI
 	
 	// Misc
 	private static final int CRYSTAL_B_GRADE = 1460;
-	private static final int WYVERN = 12621;
+	private static final int WYVERN = 15955;
 	private static final int WYVERN_FEE = 25;
 	private static final int STRIDER_LEVEL = 55;
 	private static final int[] STRIDERS =
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
index bbe7739adf..4a94bf891c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
@@ -63,7 +63,7 @@ public class AdminRide implements IAdminCommandHandler
 			int petRideId;
 			if (command.startsWith("admin_ride_wyvern"))
 			{
-				petRideId = 12621;
+				petRideId = 15955;
 			}
 			else if (command.startsWith("admin_ride_strider"))
 			{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
index 8608d62e60..6ea7ab7916 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
@@ -123,7 +123,7 @@ public class CastleVCmd implements IVoicedCommandHandler
 			{
 				if (activeChar.isClanLeader() && (activeChar.getClan().getCastleId() > 0))
 				{
-					activeChar.mount(12621, 0, true);
+					activeChar.mount(15955, 0, true);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/15955_Wyvern.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/15955_Wyvern.xml
index b4c1f08138..b5eea2c69a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/15955_Wyvern.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/pets/15955_Wyvern.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
 	<!-- wyvern -->
-	<pet id="12621" itemId="-1" index="99">
+	<pet id="15955" itemId="-1" index="99">
 		<set name="food" val="6316" />
 		<set name="hungry_limit" val="55" />
 		<set name="load" val="54510" />
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 1a9d3025f9..d49f01ceb0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -96,9 +96,10 @@ public abstract class Summon extends Playable
 	// @formatter:off
 	private static final int[] PASSIVE_SUMMONS =
 	{
-		12564, 12621, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
+		12564, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
 		14712, 14713, 14714, 14715, 14716, 14717, 14718, 14719, 14720, 14721, 14722, 14723,
-		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736
+		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736,
+		15955
 	};
 	// @formatter:on
 	
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/CategoryData.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/CategoryData.xml
index 3303d34515..4316018060 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/CategoryData.xml
@@ -385,7 +385,7 @@
 		<id>16042</id> <!-- grown_up_wolf_ride_white -->
 	</category>
 	<category name="WYVERN_GROUP">
-		<id>12621</id> <!-- wyvern -->
+		<id>15955</id> <!-- wyvern -->
 	</category>
 	<category name="SUBJOB_GROUP_KNIGHT">
 		<id>5</id> <!-- paladin -->
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/html/admin/gm_menu.htm
index 51e6be4257..e7ee9762e5 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/html/admin/gm_menu.htm
@@ -44,22 +44,18 @@
 <td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<center><multiedit var="new_announcement" width=250 height=80></center>
+<center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
 <td><button value="Announce" action="bypass -h admin_announce $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Critical" action="bypass -h admin_announce_crit $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="On-Screen" action="bypass -h admin_announce_screen $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="GM Chat" action="bypass -h admin_gmchat_menu $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<!--
+Wyvern<br1>
 <table width=270><tr>
-<td><button value="Fenrir" action="bypass -h admin_ride_wolf" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Strider" action="bypass -h admin_ride_strider" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Wyvern" action="bypass -h admin_ride_wyvern" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Horse" action="bypass -h admin_ride_horse" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr><tr>
-<td><button value="Jet Bike" action="bypass -h admin_ride_bike" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
--->
-<br>
+<td width=65></td>
+<td><button value="Ride" action="bypass -h admin_ride_wyvern" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Unride" action="bypass -h admin_unride" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=65></td>
+</tr></table><br>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..2dedad14e3 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -42,7 +42,7 @@ public class WyvernManager extends AbstractNpcAI
 	
 	// Misc
 	private static final int CRYSTAL_B_GRADE = 1460;
-	private static final int WYVERN = 12621;
+	private static final int WYVERN = 15955;
 	private static final int WYVERN_FEE = 25;
 	private static final int STRIDER_LEVEL = 55;
 	private static final int[] STRIDERS =
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
index bbe7739adf..4a94bf891c 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
@@ -63,7 +63,7 @@ public class AdminRide implements IAdminCommandHandler
 			int petRideId;
 			if (command.startsWith("admin_ride_wyvern"))
 			{
-				petRideId = 12621;
+				petRideId = 15955;
 			}
 			else if (command.startsWith("admin_ride_strider"))
 			{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
index 8608d62e60..6ea7ab7916 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
@@ -123,7 +123,7 @@ public class CastleVCmd implements IVoicedCommandHandler
 			{
 				if (activeChar.isClanLeader() && (activeChar.getClan().getCastleId() > 0))
 				{
-					activeChar.mount(12621, 0, true);
+					activeChar.mount(15955, 0, true);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/pets/15955_Wyvern.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/pets/15955_Wyvern.xml
index b4c1f08138..b5eea2c69a 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/pets/15955_Wyvern.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/pets/15955_Wyvern.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
 	<!-- wyvern -->
-	<pet id="12621" itemId="-1" index="99">
+	<pet id="15955" itemId="-1" index="99">
 		<set name="food" val="6316" />
 		<set name="hungry_limit" val="55" />
 		<set name="load" val="54510" />
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 611086f746..490bb123d8 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -96,9 +96,10 @@ public abstract class Summon extends Playable
 	// @formatter:off
 	private static final int[] PASSIVE_SUMMONS =
 	{
-		12564, 12621, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
+		12564, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
 		14712, 14713, 14714, 14715, 14716, 14717, 14718, 14719, 14720, 14721, 14722, 14723,
-		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736
+		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736,
+		15955
 	};
 	// @formatter:on
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/CategoryData.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/CategoryData.xml
index 3303d34515..4316018060 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/CategoryData.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/CategoryData.xml
@@ -385,7 +385,7 @@
 		<id>16042</id> <!-- grown_up_wolf_ride_white -->
 	</category>
 	<category name="WYVERN_GROUP">
-		<id>12621</id> <!-- wyvern -->
+		<id>15955</id> <!-- wyvern -->
 	</category>
 	<category name="SUBJOB_GROUP_KNIGHT">
 		<id>5</id> <!-- paladin -->
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/admin/gm_menu.htm
index 51e6be4257..e7ee9762e5 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/html/admin/gm_menu.htm
@@ -44,22 +44,18 @@
 <td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<center><multiedit var="new_announcement" width=250 height=80></center>
+<center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
 <td><button value="Announce" action="bypass -h admin_announce $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Critical" action="bypass -h admin_announce_crit $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="On-Screen" action="bypass -h admin_announce_screen $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="GM Chat" action="bypass -h admin_gmchat_menu $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
-<!--
+Wyvern<br1>
 <table width=270><tr>
-<td><button value="Fenrir" action="bypass -h admin_ride_wolf" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Strider" action="bypass -h admin_ride_strider" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Wyvern" action="bypass -h admin_ride_wyvern" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Horse" action="bypass -h admin_ride_horse" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr><tr>
-<td><button value="Jet Bike" action="bypass -h admin_ride_bike" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-</tr></table>
--->
-<br>
+<td width=65></td>
+<td><button value="Ride" action="bypass -h admin_ride_wyvern" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Unride" action="bypass -h admin_unride" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td width=65></td>
+</tr></table><br>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 356236cfc7..2dedad14e3 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -42,7 +42,7 @@ public class WyvernManager extends AbstractNpcAI
 	
 	// Misc
 	private static final int CRYSTAL_B_GRADE = 1460;
-	private static final int WYVERN = 12621;
+	private static final int WYVERN = 15955;
 	private static final int WYVERN_FEE = 25;
 	private static final int STRIDER_LEVEL = 55;
 	private static final int[] STRIDERS =
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
index bbe7739adf..4a94bf891c 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java
@@ -63,7 +63,7 @@ public class AdminRide implements IAdminCommandHandler
 			int petRideId;
 			if (command.startsWith("admin_ride_wyvern"))
 			{
-				petRideId = 12621;
+				petRideId = 15955;
 			}
 			else if (command.startsWith("admin_ride_strider"))
 			{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
index 8608d62e60..6ea7ab7916 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java
@@ -123,7 +123,7 @@ public class CastleVCmd implements IVoicedCommandHandler
 			{
 				if (activeChar.isClanLeader() && (activeChar.getClan().getCastleId() > 0))
 				{
-					activeChar.mount(12621, 0, true);
+					activeChar.mount(15955, 0, true);
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/15955_Wyvern.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/15955_Wyvern.xml
index 4cb82341e6..b5eea2c69a 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/15955_Wyvern.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/pets/15955_Wyvern.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <pets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/PetData.xsd">
 	<!-- wyvern -->
-	<pet id="12621" itemId="-1" index="99">
+	<pet id="15955" itemId="-1" index="99">
 		<set name="food" val="6316" />
 		<set name="hungry_limit" val="55" />
 		<set name="load" val="54510" />
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Summon.java
index 611086f746..490bb123d8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -96,9 +96,10 @@ public abstract class Summon extends Playable
 	// @formatter:off
 	private static final int[] PASSIVE_SUMMONS =
 	{
-		12564, 12621, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
+		12564, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
 		14712, 14713, 14714, 14715, 14716, 14717, 14718, 14719, 14720, 14721, 14722, 14723,
-		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736
+		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736,
+		15955
 	};
 	// @formatter:on