From faeee7d385cfe705e2560a824ccd1429ce03f608 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 15 Dec 2020 06:20:11 +0000
Subject: [PATCH] Addition of Scroll of Escape Herphah and Joachim.

---
 .../game/data/stats/items/80800-80899.xml     |  8 +++++
 .../game/data/stats/skills/39500-39599.xml    | 36 +++++++++++++++++++
 .../game/data/stats/items/80800-80899.xml     | 12 +++++--
 .../game/data/stats/skills/39500-39599.xml    | 36 +++++++++++++++++++
 .../dist/game/data/xsd/items.xsd              |  2 +-
 5 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80800-80899.xml
index 6e29715e89..525e183ea7 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80800-80899.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80800-80899.xml
@@ -744,6 +744,10 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39535" level="1" /> <!-- Scroll of Escape: Herphah -->
+		</skills>
 	</item>
 	<item id="80858" name="Scroll of Escape: Joachim" type="EtcItem">
 		<!-- Teleports you to where Joachim is. -->
@@ -756,6 +760,10 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39536" level="1" /> <!-- Scroll of Escape: Joachim -->
+		</skills>
 	</item>
 	<item id="80859" name="Blood-thirsty Akamanah Shaper" type="Weapon">
 		<!-- Weapon born from Demonic Sword Akamanah. Upgrade through Kaysia in the Town of Oren. Max HP can increase by more than 150,000. Cannot be crystallized, enchanted, augmented, changed or assigned an attribute. -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39500-39599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39500-39599.xml
index bf08db7162..60896a51ba 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39500-39599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39500-39599.xml
@@ -496,11 +496,47 @@
 		<operateType>A1</operateType>
 		<isMagic>4</isMagic>
 		<hitTime>200</hitTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<itemConsumeId>80857</itemConsumeId> <!-- Scroll of Escape: Herphah -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<conditions>
+			<condition name="OpAlignment">
+				<affectType>CASTER</affectType>
+				<alignment>LAWFUL</alignment>
+			</condition>
+			<condition name="OpCanEscape" />
+		</conditions>
+		<effects>
+			<effect name="Teleport">
+				<x>146536</x>
+				<y>26824</y>
+				<z>-2207</z>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39536" toLevel="1" name="Scroll of Escape: Joachim">
 		<operateType>A1</operateType>
 		<isMagic>4</isMagic>
 		<hitTime>200</hitTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<itemConsumeId>80858</itemConsumeId> <!-- Scroll of Escape: Joachim -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<conditions>
+			<condition name="OpAlignment">
+				<affectType>CASTER</affectType>
+				<alignment>LAWFUL</alignment>
+			</condition>
+			<condition name="OpCanEscape" />
+		</conditions>
+		<effects>
+			<effect name="Teleport">
+				<x>146520</x>
+				<y>26744</y>
+				<z>-2207</z>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39537" toLevel="1" name="Zariche's Sealed Box">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80800-80899.xml
index 619975acd8..4926234c88 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80800-80899.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80800-80899.xml
@@ -748,9 +748,13 @@
 		<set name="weight" val="30" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="true" />
+		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39535" level="1" /> <!-- Scroll of Escape: Herphah -->
+		</skills>
 	</item>
 	<item id="80858" name="Scroll of Escape: Joachim" type="EtcItem">
 		<!-- Teleports you to where Joachim is. -->
@@ -760,9 +764,13 @@
 		<set name="weight" val="30" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="true" />
+		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39536" level="1" /> <!-- Scroll of Escape: Joachim -->
+		</skills>
 	</item>
 	<item id="80859" name="Blood-thirsty Akamanah Shaper" type="Weapon">
 		<!-- A weapon created from Blood Sword Akamanah. Max HP can be more than 150,000. Its appearance cannot be changed. Cannot be assigned an attribute, crystallized, augmented, enchanted, or enhanced with a soul crystal. <Enhancing>. Take the weapon and Akamanah's Blood to Kaysia in Oren to get a Bloodstained Akamanah weapon. -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/39500-39599.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/39500-39599.xml
index 69a78d5e66..1833678893 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/39500-39599.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/39500-39599.xml
@@ -512,11 +512,47 @@
 		<operateType>A1</operateType>
 		<isMagic>4</isMagic>
 		<hitTime>200</hitTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<itemConsumeId>80857</itemConsumeId> <!-- Scroll of Escape: Herphah -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<conditions>
+			<condition name="OpAlignment">
+				<affectType>CASTER</affectType>
+				<alignment>LAWFUL</alignment>
+			</condition>
+			<condition name="OpCanEscape" />
+		</conditions>
+		<effects>
+			<effect name="Teleport">
+				<x>146536</x>
+				<y>26824</y>
+				<z>-2207</z>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39536" toLevel="1" name="Scroll of Escape: Joachim">
 		<operateType>A1</operateType>
 		<isMagic>4</isMagic>
 		<hitTime>200</hitTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<itemConsumeId>80858</itemConsumeId> <!-- Scroll of Escape: Joachim -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<conditions>
+			<condition name="OpAlignment">
+				<affectType>CASTER</affectType>
+				<alignment>LAWFUL</alignment>
+			</condition>
+			<condition name="OpCanEscape" />
+		</conditions>
+		<effects>
+			<effect name="Teleport">
+				<x>146520</x>
+				<y>26744</y>
+				<z>-2207</z>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39537" toLevel="1" name="Zariche's Sealed Box">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/items.xsd b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/items.xsd
index 53bd734454..b05ed532df 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/items.xsd
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/items.xsd
@@ -94,7 +94,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="skill">
 												<xs:complexType>
-													<xs:attribute name="id" type="xs:unsignedShort" use="required" />
+													<xs:attribute name="id" type="xs:unsignedInt" use="required" />
 													<xs:attribute name="level" type="xs:unsignedByte" use="required" />
 													<xs:attribute name="type" type="xs:string" use="optional" />
 													<xs:attribute name="type_value" type="xs:unsignedByte" use="optional" />