From 4fc1cb43383cd7b4d93f8ee6a74a44eb7070a710 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 26 Mar 2018 23:35:02 +0000
Subject: [PATCH] Addition of item Express Bus Pass Card (47384). Contributed
 by Liamxroy.

---
 .../handlers/effecthandlers/GiveXp.java       |  4 ++--
 .../game/data/stats/items/47300-47399.xml     | 15 +++++++++++----
 .../game/data/stats/skills/18600-18699.xml    | 19 ++++++++++++++++++-
 .../dist/game/data/xsd/skills.xsd             |  2 +-
 .../handlers/effecthandlers/GiveXp.java       |  4 ++--
 .../game/data/stats/items/47300-47399.xml     | 16 +++++++++++-----
 .../game/data/stats/skills/18600-18699.xml    | 19 ++++++++++++++++++-
 .../dist/game/data/xsd/skills.xsd             |  2 +-
 8 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java
index 210d76f3ea..3ee7d33869 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java
@@ -28,11 +28,11 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  */
 public final class GiveXp extends AbstractEffect
 {
-	private final int _xp;
+	private final long _xp;
 	
 	public GiveXp(StatsSet params)
 	{
-		_xp = params.getInt("xp", 0);
+		_xp = params.getLong("xp", 0);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47300-47399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47300-47399.xml
index e5fa2203b6..49958016d9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47300-47399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47300-47399.xml
@@ -1180,11 +1180,18 @@
 		<!-- A bus card that can be used to get on the Express Bus. Use to acquire 100,000,000,000 EXP and 240,000,000 SP. Characters with Lv. 99 or higher only. -->
 		<set name="icon" val="icon.card_hidden" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="is_sellable" val="false" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
+		<set name="handler" val="ItemSkills" />
+		<cond msgId="1902">
+			<player levelRange="99;255" />
+		</cond>
+		<skills>
+			<skill id="18628" level="1" /> <!-- Express Bus Pass Card -->
+		</skills>
 	</item>
 	<item id="47385" name="Balthus Knight Mark" type="EtcItem">
 		<!-- Used to dress up as a member of the Balthus Knights for 1 hour. Only available for characters with Lv. 85 or higher. Buff deleted if Sub/Dual Class is changed. To be deleted when the event ends. Will be deleted when the Balthus Knights Event ends. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18600-18699.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18600-18699.xml
index a63d093c37..74a1fd0836 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18600-18699.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18600-18699.xml
@@ -945,9 +945,26 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="18628" toLevel="1" name="Express Bus Pass Card">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>47384</itemConsumeId> <!-- Express Bus Pass Card -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<reuseDelay>1000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GiveXp">
+				<xp>100000000000</xp>
+			</effect>
+			<effect name="GiveSp">
+				<xp>240000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18629" toLevel="1" name="Balthus Knight Disguise">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
index 67967b59be..9a59671ca7 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd
@@ -2090,7 +2090,7 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
-															<xs:element name="xp" type="xs:unsignedInt" />
+															<xs:element name="xp" type="xs:unsignedLong" />
 															<xs:element name="ACCURACY_COMBAT">
 																<xs:complexType>
 																	<xs:sequence>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java
index 210d76f3ea..3ee7d33869 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java
@@ -28,11 +28,11 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  */
 public final class GiveXp extends AbstractEffect
 {
-	private final int _xp;
+	private final long _xp;
 	
 	public GiveXp(StatsSet params)
 	{
-		_xp = params.getInt("xp", 0);
+		_xp = params.getLong("xp", 0);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47300-47399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47300-47399.xml
index d9774e3261..7fb077816b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47300-47399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47300-47399.xml
@@ -1226,12 +1226,18 @@
 		<!-- A bus card that can be used to get on the Express Bus. Use to acquire 100,000,000,000 EXP and 240,000,000 SP. Characters with Lv. 99 or higher only. -->
 		<set name="icon" val="icon.card_hidden" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
-		<set name="is_private_storeable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="commissionItemType" val="OTHER_ITEM" />
+		<set name="handler" val="ItemSkills" />
+		<cond msgId="1902">
+			<player levelRange="99;255" />
+		</cond>
+		<skills>
+			<skill id="18628" level="1" /> <!-- Express Bus Pass Card -->
+		</skills>
 	</item>
 	<item id="47385" name="Balthus Knight Mark" type="EtcItem">
 		<!-- Makes you eligible to receive a Member of the Balthus Knight disguise for 1 hour. Can be used only by characters of Level 85 or higher. Buff gets deleted upon Subclass/Dual Class change. To be deleted on Wednesday June 15th, 2016 after regular maintenance. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml
index 1df8b49bf0..87a94ad43e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml
@@ -945,9 +945,26 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="18628" toLevel="1" name="Express Bus Pass Card">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>47384</itemConsumeId> <!-- Express Bus Pass Card -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<reuseDelay>1000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GiveXp">
+				<xp>100000000000</xp>
+			</effect>
+			<effect name="GiveSp">
+				<xp>240000000</xp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18629" toLevel="1" name="Balthus Knight Disguise">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
index 0aec67edb4..4be3b54e92 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd
@@ -2052,7 +2052,7 @@
 															<xs:element name="hp" type="xs:unsignedByte" />
 															<xs:element name="mp" type="xs:unsignedByte" />
 															<xs:element name="cp" type="xs:unsignedByte" />
-															<xs:element name="xp" type="xs:unsignedInt" />
+															<xs:element name="xp" type="xs:unsignedLong" />
 															<xs:element name="ACCURACY_COMBAT">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">