Fixed auto HP potions.

Contributed by gamelike85.

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 minutes. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09500-09599.xml

@@ -334,6 +334,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml

@@ -80,11 +80,9 @@
 	</skill>
 	<skill id="17114" toLevel="1" name="Promise Cube">
 		<operateType>A1</operateType>
-		<reuseDelay>-1000</reuseDelay>
 	</skill>
 	<skill id="17115" toLevel="1" name="Promise Cube Skill">
 		<operateType>A1</operateType>
-		<reuseDelay>-1000</reuseDelay>
 	</skill>
 	<skill id="17116" toLevel="1" name="Promise Cube Pack">
 		<operateType>A1</operateType>
@@ -110,7 +108,6 @@
 		<itemConsumeId>37560</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -131,7 +128,6 @@
 		<itemConsumeId>37561</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -152,7 +148,6 @@
 		<itemConsumeId>37562</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -364,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing... For 2 minutes, P. Atk. / M. Atk. / Atk. Spd. / Casting Spd. x 2. Effect disappears upon logout. -->
@@ -1083,7 +1091,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Warrior's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml

@@ -133,6 +133,7 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -150,6 +151,7 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -167,6 +169,7 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -184,6 +187,7 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -197,10 +201,13 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No duration. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
@@ -664,7 +671,6 @@
 		<!-- Teleports you to Talking Island Village. -->
 		<itemConsumeId>39553</itemConsumeId> <!-- Minstrel's Scroll of Escape: Talking Island -->
 		<itemConsumeCount>1</itemConsumeCount>
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -693,7 +699,6 @@
 			<value level="1">39554</value> <!-- Bard's Scroll of Escape - Hunter's Village -->
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -722,7 +727,6 @@
 			<value level="1">39555</value> <!-- Minstrel's Scroll of Escape: Magmeld -->
 		</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>

L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 minutes. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09500-09599.xml

@@ -562,6 +562,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml

@@ -108,7 +108,6 @@
 		<itemConsumeId>37560</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>3600000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -129,7 +128,6 @@
 		<itemConsumeId>37561</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>3600000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -150,7 +148,6 @@
 		<itemConsumeId>37562</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>3600000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -362,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing...\nFor 2 minutes, P. Atk. / M. Atk. / Atk. Spd. / Casting Spd. x 2. Effect disappears upon logout. -->
@@ -1081,7 +1091,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Warrior's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17900-17999.xml

@@ -201,10 +201,12 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No duration. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18600-18699.xml

@@ -15,7 +15,6 @@
 		<effects>
 			<effect name="VitalityPointsRate">
 				<amount>150</amount>
-				<mode>PER</mode>
 			</effect>
 			<effect name="ExpModify">
 				<amount>150</amount>

L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 minutes. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47500-47599.xml

@@ -919,6 +919,13 @@
 		<set name="icon" val="icon.bm_grankain_potion" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="18670" level="1"/> <!-- Gran Kain's Miraculous Medicine -->
+		</skills>
 	</item>
 	<item id="47579" name="Christmas Party Herb" type="EtcItem">
 		<!-- Christmas Party Herb. P. Atk./M. Atk./P. Def./M. Def. are increased by 50%, and you are turned into Santa for 2 minutes. Effect disappears when restarted. -->

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09500-09599.xml

@@ -562,6 +562,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml

@@ -108,7 +108,6 @@
 		<itemConsumeId>37560</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>3600000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -129,7 +128,6 @@
 		<itemConsumeId>37561</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>3600000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -150,7 +148,6 @@
 		<itemConsumeId>37562</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>3600000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -362,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing...\nFor 2 minutes, P. Atk. / M. Atk. / Atk. Spd. / Casting Spd. x 2. Effect disappears upon logout. -->
@@ -1081,7 +1091,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Warrior's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17900-17999.xml

@@ -201,10 +201,12 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No duration. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18600-18699.xml

@@ -1448,6 +1448,19 @@
 	</skill>
 	<skill id="18670" toLevel="1" name="Gran Kain's Miraculous Medicine">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>47578</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="Hp">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18671" toLevel="1" name="Prophecy of Might - PC Cafe exclusive">
 		<!-- For 60 minutes, Standard and Skill Attack Critical Rate and Damage +25%. PC Cafe exclusive skill. -->

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 minutes. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47500-47599.xml

@@ -980,6 +980,13 @@
 		<set name="icon" val="icon.bm_grankain_potion" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="18670" level="1"/> <!-- Gran Kain's Miraculous Medicine -->
+		</skills>
 	</item>
 	<item id="47579" name="Christmas Party Herb" type="EtcItem">
 		<!-- Christmas Party Herb. P. Atk./M. Atk./P. Def./M. Def. are increased by 50%, and you are turned into Santa for 2 minutes. Effect disappears when restarted. -->

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml

@@ -562,6 +562,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml

@@ -108,7 +108,6 @@
 		<itemConsumeId>37560</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -129,7 +128,6 @@
 		<itemConsumeId>37561</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -150,7 +148,6 @@
 		<itemConsumeId>37562</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -362,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing...\nFor 2 minutes, P. Atk. / M. Atk. / Atk. Spd. / Casting Spd. x 2. Effect disappears upon logout. -->
@@ -1081,7 +1091,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Warrior's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17900-17999.xml

@@ -201,10 +201,12 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No duration. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml

@@ -1478,6 +1478,19 @@
 	</skill>
 	<skill id="18670" toLevel="1" name="Gran Kain's Miraculous Medicine">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>47578</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="Hp">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18671" toLevel="1" name="Prophecy of Might - PC Cafe exclusive">
 		<!-- For 60 minutes, Standard and Skill Attack Critical Rate and Damage +25%. PC Cafe exclusive skill. -->

L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 minutes. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47500-47599.xml

@@ -980,6 +980,13 @@
 		<set name="icon" val="icon.bm_grankain_potion" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="18670" level="1"/> <!-- Gran Kain's Miraculous Medicine -->
+		</skills>
 	</item>
 	<item id="47579" name="Christmas Party Herb" type="EtcItem">
 		<!-- Christmas Party Herb. P. Atk./ M. Atk./ P. Def./ M. Def. are increased by 50%, and you are turned into Santa for 2 minutes. Effect disappears when restarted. -->

L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48200-48299.xml

@@ -1266,6 +1266,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="39174" level="1"/> <!-- Valor Recovery Potion Lv1 -->
+		</skills>
 	</item>
 	<item id="48285" name="Scroll: PK" type="EtcItem">
 		<!-- Double-click to lower PK value by 1. Your PK value has to be at least 1. Cannot be used when the Demonic Sword Zariche or the Blood Sword Akamanah is in possession. -->

L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48600-48699.xml

@@ -36,8 +36,18 @@
 		<!-- Enchant scroll exclusively for Angel and Dragon accessories. The scroll can enchant an accessory up to +10.. <Warning>. The Angel Accessory may fail to enchant starting from +1, and it will be destroyed if it fails. -->
 		<set name="icon" val="icon.scrl_of_ench_acc" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="is_dropable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
+		<set name="commissionItemType" val="SCROLL_OTHER" />
+		<skills>
+			<skill id="39247" level="1" /> <!-- Scroll: Enchant Angel Accessory -->
+		</skills>
 	</item>
 </list>

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09500-09599.xml

@@ -562,6 +562,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml

@@ -108,7 +108,6 @@
 		<itemConsumeId>37560</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -129,7 +128,6 @@
 		<itemConsumeId>37561</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -150,7 +148,6 @@
 		<itemConsumeId>37562</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -362,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing...\nFor 2 minutes, P. Atk./ M. Atk./ Atk. Spd./ Casting Spd. x 2. Effect disappears upon logout. -->
@@ -1081,7 +1091,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Warrior's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17900-17999.xml

@@ -201,10 +201,12 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No cooldown. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18600-18699.xml

@@ -1487,6 +1487,19 @@
 	</skill>
 	<skill id="18670" toLevel="1" name="Gran Kain's Miraculous Medicine">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>47578</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="Hp">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18671" toLevel="1" name="Prophecy of Might - PA exclusive">
 		<!-- For 60 minutes, Standard and Skill Attack Critical Rate and Damage +25%. PA exclusive skill. -->

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/39100-39199.xml

@@ -128,6 +128,19 @@
 	</skill>
 	<skill id="39174" toLevel="1" name="Valor Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48284</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>5000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39175" toLevel="1" name="Scroll: PK">
 		<operateType>A1</operateType>

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 min. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47500-47599.xml

@@ -980,6 +980,13 @@
 		<set name="icon" val="icon.bm_grankain_potion" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="18670" level="1"/> <!-- Gran Kain's Miraculous Medicine -->
+		</skills>
 	</item>
 	<item id="47579" name="Christmas Party Herb" type="EtcItem">
 		<!-- Christmas Party Herb. P. Atk./ M. Atk./ P. Def./ M. Def. are increased by 50%, and you are turned into Santa for 2 min. Effect disappears when restarted. -->

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48200-48299.xml

@@ -1266,6 +1266,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="39174" level="1"/> <!-- Valor Recovery Potion Lv1 -->
+		</skills>
 	</item>
 	<item id="48285" name="Scroll: PK" type="EtcItem">
 		<!-- Double-click to lower PK value by 1. Your PK value has to be at least 1. Cannot be used when the Demonic Sword Zariche or the Blood Sword Akamanah is in possession. -->

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48600-48699.xml

@@ -244,7 +244,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
-	<item id="48623" name="Warrior's Ring" additionalName="30-day" type="Armor">
+	<item id="48623" name="Hero's Ring" additionalName="30-day" type="Armor">
 		<!-- A ring purchased with the Marks of Battle. Max MP +33, Max CP +10%, Stun/ Paralysis/ Knock Back/ Knock Down Success Rate and Resistance +15%, Standard/ P. Atk./ M. Atk. Critical Damage +15%, and Atk. Spd./ Casting Spd. +5%. These effects do not stack with identical rings. -->
 		<set name="icon" val="icon.accessory_ring_of_hero_i01" />
 		<set name="default_action" val="EQUIP" />
@@ -263,14 +263,21 @@
 			<stat type="maxMp">33</stat>
 		</stats>
 	</item>
-	<item id="48624" name="Warrior's Miracle Cure" type="EtcItem">
+	<item id="48624" name="Hero's Miracle Cure" type="EtcItem">
-		<!-- Warrior's Miracle Cure purchased with the Marks of Battle. When used, it restores HP by 7000, and the remaining power restores CP. Can be used even in Mesmerized state. Cannot be used in Olympiad. -->
+		<!-- Heros's Miracle Cure purchased with the Marks of Battle. When used, it restores HP by 7000, and the remaining power restores CP. Can be used even in Mesmerized state. Cannot be used in Olympiad. -->
 		<set name="icon" val="icon.pvp_battle_quick_healing_potion2" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17263" level="1"/> <!-- Hero's Quick Healing Potion -->
+		</skills>
 	</item>
-	<item id="48625" name="Warrior's Rune Box (1-hour)" type="EtcItem">
+	<item id="48625" name="Hero's Rune Box (1-hour)" type="EtcItem">
 		<!-- A box containing the Warrior's Rune (1-hour) purchased with the Marks of Battle. Double-click to obtain the Warrior's Rune (1-hour) that increases XP/ SP by 20%. -->
 		<set name="icon" val="BranchSys3.icon.g_cash_fortuna_box_r" />
 		<set name="default_action" val="PEEL" />
@@ -279,7 +286,7 @@
 		<set name="weight" val="10" />
 		<set name="is_stackable" val="true" />
 	</item>
-	<item id="48626" name="Warrior's Rune" additionalName="1-hour" type="EtcItem">
+	<item id="48626" name="Hero's Rune" additionalName="1-hour" type="EtcItem">
 		<!-- Warrior's Rune purchased with the Mark of Battle. If stored in the inventory, increases Hunting Acquired XP/ SP by 20%. -->
 		<set name="icon" val="icon.bm_freya_bloody_rune" />
 		<set name="material" val="PAPER" />

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml

@@ -562,6 +562,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml

@@ -108,7 +108,6 @@
 		<itemConsumeId>37560</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -129,7 +128,6 @@
 		<itemConsumeId>37561</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -150,7 +148,6 @@
 		<itemConsumeId>37562</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -362,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing..\nFor 2 min., P. Atk./ M. Atk./ Atk. Spd./ Casting Spd. x 2. Effect disappears upon logout. -->
@@ -1081,7 +1091,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Warrior's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17900-17999.xml

@@ -201,10 +201,12 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No duration. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18600-18699.xml

@@ -1487,6 +1487,19 @@
 	</skill>
 	<skill id="18670" toLevel="1" name="Gran Kain's Miraculous Medicine">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>47578</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="Hp">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18671" toLevel="1" name="Prophecy of Might - PA exclusive">
 		<!-- For 60 min., Standard and Skill Attack Critical Rate and Damage +25%. PA exclusive skill. -->

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39100-39199.xml

@@ -129,6 +129,19 @@
 	</skill>
 	<skill id="39174" toLevel="1" name="Valor Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48284</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>5000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39175" toLevel="1" name="Scroll: PK">
 		<operateType>A1</operateType>

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 min. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47500-47599.xml

@@ -980,6 +980,13 @@
 		<set name="icon" val="icon.bm_grankain_potion" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="18670" level="1"/> <!-- Gran Kain's Miraculous Medicine -->
+		</skills>
 	</item>
 	<item id="47579" name="Christmas Party Herb" type="EtcItem">
 		<!-- Christmas Party Herb. P. Atk./ M. Atk./ P. Def./ M. Def. are increased by 50%, and you are turned into Santa for 2 min. Effect disappears when restarted. -->

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48200-48299.xml

@@ -1271,6 +1271,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="39174" level="1"/> <!-- Valor Recovery Potion Lv1 -->
+		</skills>
 	</item>
 	<item id="48285" name="Scroll: PK" type="EtcItem">
 		<!-- Double-click to lower PK value by 1. Your PK value has to be at least 1. Cannot be used when the Demonic Sword Zariche or the Blood Sword Akamanah is in possession. -->

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48600-48699.xml

@@ -244,7 +244,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
-	<item id="48623" name="Warrior's Ring" additionalName="30-day" type="Armor">
+	<item id="48623" name="Hero's Ring" additionalName="30-day" type="Armor">
 		<!-- A ring purchased with the Marks of Battle. Max MP +33, Max CP +10%, Stun/ Paralysis/ Knock Back/ Knock Down Success Rate and Resistance +15%, Standard/ P. Atk./ M. Atk. Critical Damage +15%, and Atk. Spd./ Casting Spd. +5%. These effects do not stack with identical rings. -->
 		<set name="icon" val="icon.accessory_ring_of_hero_i01" />
 		<set name="default_action" val="EQUIP" />
@@ -263,14 +263,21 @@
 			<stat type="maxMp">33</stat>
 		</stats>
 	</item>
-	<item id="48624" name="Warrior's Miracle Cure" type="EtcItem">
+	<item id="48624" name="Hero's Miracle Cure" type="EtcItem">
-		<!-- Warrior's Miracle Cure purchased with the Marks of Battle. When used, it restores HP by 7000, and the remaining power restores CP. Can be used even in Mesmerized state. Cannot be used in Olympiad. -->
+		<!-- Heros's Miracle Cure purchased with the Marks of Battle. When used, it restores HP by 7000, and the remaining power restores CP. Can be used even in Mesmerized state. Cannot be used in Olympiad. -->
 		<set name="icon" val="icon.pvp_battle_quick_healing_potion2" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17263" level="1"/> <!-- Hero's Quick Healing Potion -->
+		</skills>
 	</item>
-	<item id="48625" name="Warrior's Rune Box (1-hour)" type="EtcItem">
+	<item id="48625" name="Hero's Rune Box (1-hour)" type="EtcItem">
 		<!-- A box containing the Warrior's Rune (1-hour) purchased with the Marks of Battle. Double-click to obtain the Warrior's Rune (1-hour) that increases XP/ SP by 20%. -->
 		<set name="icon" val="BranchSys3.icon.g_cash_fortuna_box_r" />
 		<set name="default_action" val="PEEL" />
@@ -279,7 +286,7 @@
 		<set name="weight" val="10" />
 		<set name="is_stackable" val="true" />
 	</item>
-	<item id="48626" name="Warrior's Rune" additionalName="1-hour" type="EtcItem">
+	<item id="48626" name="Hero's Rune" additionalName="1-hour" type="EtcItem">
 		<!-- Warrior's Rune purchased with the Mark of Battle. If stored in the inventory, increases Hunting Acquired XP/ SP by 20%. -->
 		<set name="icon" val="icon.bm_freya_bloody_rune" />
 		<set name="material" val="PAPER" />

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/09500-09599.xml

@@ -562,6 +562,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml

@@ -359,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing...\nFor 2 min., P. Atk./ M. Atk./ Atk. Spd./ Casting Spd. x 2. Effect disappears upon logout. -->
@@ -1078,7 +1091,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Warrior's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17900-17999.xml

@@ -201,10 +201,12 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No duration. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18600-18699.xml

@@ -1491,6 +1491,19 @@
 	</skill>
 	<skill id="18670" toLevel="1" name="Gran Kain's Miraculous Medicine">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>47578</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="Hp">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18671" toLevel="1" name="Prophecy of Might - PA exclusive">
 		<!-- For 60 min., Standard and Skill Attack Critical Rate and Damage +25%. PA exclusive skill. -->

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39100-39199.xml

@@ -130,6 +130,19 @@
 	</skill>
 	<skill id="39174" toLevel="1" name="Valor Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48284</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>5000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39175" toLevel="1" name="Scroll: PK">
 		<operateType>A1</operateType>

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/buylists/custom/0010009.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="48624" price="0" />
+	<item id="48284" price="0" />
+	<item id="47578" price="0" />
+	<item id="45945" price="0" />
+	<item id="40300" price="0" />
+	<item id="37894" price="0" />
+	<item id="37671" price="0" />
+	<item id="35930" price="0" />
+</list>

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/html/admin/gmstore/consumables.htm

@@ -59,5 +59,10 @@
 <td align=center>
 </td>
 </tr>
+<tr>
+<td align=center>
+<button action="bypass -h admin_buy 0010009" value="Auto Heal Potions" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+</td>
+</tr>
 </table>
 </center></body></html>

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 min. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/47500-47599.xml

@@ -980,6 +980,13 @@
 		<set name="icon" val="icon.bm_grankain_potion" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="18670" level="1"/> <!-- Gran Kain's Miraculous Medicine -->
+		</skills>
 	</item>
 	<item id="47579" name="Christmas Party Herb" type="EtcItem">
 		<!-- Christmas Party Herb. P. Atk./ M. Atk./ P. Def./ M. Def. are increased by 50%, and you are turned into Santa for 2 min. Effect disappears when restarted. -->

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/48200-48299.xml

@@ -1271,6 +1271,13 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="39174" level="1"/> <!-- Valor Recovery Potion Lv1 -->
+		</skills>
 	</item>
 	<item id="48285" name="Scroll: PK" type="EtcItem">
 		<!-- Double-click to lower PK value by 1. Your PK value has to be at least 1. Cannot be used when the Demonic Sword Zariche or the Blood Sword Akamanah is in possession. -->

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/48600-48699.xml

@@ -244,7 +244,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 	</item>
-	<item id="48623" name="Warrior's Ring" additionalName="30-day" type="Armor">
+	<item id="48623" name="Hero's Ring" additionalName="30-day" type="Armor">
 		<!-- A ring purchased with the Marks of Battle. Max MP +33, Max CP +10%, Stun/ Paralysis/ Knock Back/ Knock Down Success Rate and Resistance +15%, Standard/ P. Atk./ M. Atk. Critical Damage +15%, and Atk. Spd./ Casting Spd. +5%. These effects do not stack with identical rings. -->
 		<set name="icon" val="icon.accessory_ring_of_hero_i01" />
 		<set name="default_action" val="EQUIP" />
@@ -263,14 +263,21 @@
 			<stat type="maxMp">33</stat>
 		</stats>
 	</item>
-	<item id="48624" name="Warrior's Miracle Cure" type="EtcItem">
+	<item id="48624" name="Hero's Miracle Cure" type="EtcItem">
-		<!-- Warrior's Miracle Cure purchased with the Marks of Battle. When used, it restores HP by 7000, and the remaining power restores CP. Can be used even in Mesmerized state. Cannot be used in Olympiad. -->
+		<!-- Heros's Miracle Cure purchased with the Marks of Battle. When used, it restores HP by 7000, and the remaining power restores CP. Can be used even in Mesmerized state. Cannot be used in Olympiad. -->
 		<set name="icon" val="icon.pvp_battle_quick_healing_potion2" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="material" val="PAPER" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17263" level="1"/> <!-- Hero's Quick Healing Potion -->
+		</skills>
 	</item>
-	<item id="48625" name="Warrior's Rune Box (1-hour)" type="EtcItem">
+	<item id="48625" name="Hero's Rune Box (1-hour)" type="EtcItem">
 		<!-- A box containing the Warrior's Rune (1-hour) purchased with the Marks of Battle. Double-click to obtain the Warrior's Rune (1-hour) that increases XP/ SP by 20%. -->
 		<set name="icon" val="BranchSys3.icon.g_cash_fortuna_box_r" />
 		<set name="default_action" val="PEEL" />
@@ -279,7 +286,7 @@
 		<set name="weight" val="10" />
 		<set name="is_stackable" val="true" />
 	</item>
-	<item id="48626" name="Warrior's Rune" additionalName="1-hour" type="EtcItem">
+	<item id="48626" name="Hero's Rune" additionalName="1-hour" type="EtcItem">
 		<!-- Warrior's Rune purchased with the Mark of Battle. If stored in the inventory, increases Hunting Acquired XP/ SP by 20%. -->
 		<set name="icon" val="icon.bm_freya_bloody_rune" />
 		<set name="material" val="PAPER" />

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/09500-09599.xml

@@ -562,6 +562,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/17100-17199.xml

@@ -359,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing,. For 5 min., P. Atk. / M. Atk. / Atk. Spd. / Casting Spd. increases by 50%. Effect disappears upon logout. -->

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Hero's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/17900-17999.xml

@@ -201,10 +201,12 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No duration. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/18600-18699.xml

@@ -1490,6 +1490,19 @@
 	</skill>
 	<skill id="18670" toLevel="1" name="Gran Kain's Miraculous Medicine">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>47578</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="Hp">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18671" toLevel="1" name="Prophecy of Might - PA exclusive">
 		<!-- For 60 min., Standard and Skill Attack Critical Rate and Damage +25%. PA exclusive skill. -->

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39100-39199.xml

@@ -130,6 +130,19 @@
 	</skill>
 	<skill id="39174" toLevel="1" name="Valor Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48284</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>5000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39175" toLevel="1" name="Scroll: PK">
 		<operateType>A1</operateType>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/37600-37699.xml

@@ -1688,9 +1688,15 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_freightable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="17153" level="1"/> <!-- Heavenly Recovery Potion -->
+		</skills>
 	</item>
 	<item id="37672" name="Mysterious Friend Summon Bracelet" additionalName="30-day" type="Armor">
 		<!-- Bracelet that can summon another character. The summoning character and the summoned character must both be equipped with it and in the same party. 30-day. Cooldown is 60 minutes. Cannot be used in the Olympiad. Cannot be shared within the same account through the Dimensional Merchant. -->

L2J_Mobius_Classic_Interlude/dist/game/data/stats/items/47500-47599.xml

@@ -980,6 +980,13 @@
 		<set name="icon" val="icon.bm_grankain_potion" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true"/>
+		<set name="etcitem_type" val="POTION"/>
+		<set name="commissionItemType" val="POTION"/>
+		<set name="handler" val="ItemSkills"/>
+		<skills>
+			<skill id="18670" level="1"/> <!-- Gran Kain's Miraculous Medicine -->
+		</skills>
 	</item>
 	<item id="47579" name="Christmas Party Herb" type="EtcItem">
 		<!-- Christmas Party Herb. P. Atk./M. Atk./P. Def./M. Def. are increased by 50%, and you are turned into Santa for 2 minutes. Effect disappears when restarted. -->

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09500-09599.xml

@@ -562,6 +562,8 @@
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
+		<itemConsumeId>35930</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<magicLvl>1</magicLvl>
 		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17100-17199.xml

@@ -108,7 +108,6 @@
 		<itemConsumeId>37560</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -129,7 +128,6 @@
 		<itemConsumeId>37561</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -150,7 +148,6 @@
 		<itemConsumeId>37562</itemConsumeId> <!-- Emperor's Vitality Tonic -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>60000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
@@ -362,6 +359,19 @@
 	</skill>
 	<skill id="17153" toLevel="1" name="Heavenly Recovery Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>37671</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>2500</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
 		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing...\nFor 2 minutes, P. Atk. / M. Atk. / Atk. Spd. / Casting Spd. x 2. Effect disappears upon logout. -->
@@ -1081,7 +1091,7 @@
 			<effect name="MagicMpCost">
 				<amount>-10</amount>
 				<mode>PER</mode>
-				<magicType>22</magicType>
+				<magicType>2</magicType>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17200-17299.xml

@@ -421,6 +421,19 @@
 	</skill>
 	<skill id="17263" toLevel="1" name="Warrior's Quick Healing Potion">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>48624</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HpCpHeal">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17264" toLevel="1" name="Scroll of Escape: Hellbound">
 		<!-- Scroll to teleport to Hellbound. -->

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17900-17999.xml

@@ -201,10 +201,12 @@
 	<skill id="17913" toLevel="1" name="Supreme Windy Quick Healing Potion">
 		<!-- Restores 5000 HP and restores CP with remaining power. No duration. -->
 		<icon>icon.etc_potion_gold_i00</icon>
+		<operateType>A1</operateType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
-		<operateType>A1</operateType>
+		<itemConsumeId>37894</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<reuseDelay>500</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/18600-18699.xml

@@ -1478,6 +1478,19 @@
 	</skill>
 	<skill id="18670" toLevel="1" name="Gran Kain's Miraculous Medicine">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<itemConsumeId>47578</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="Hp">
+				<power>7000</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18671" toLevel="1" name="Prophecy of Might - PC Cafe exclusive">
 		<!-- For 60 minutes, Standard and Skill Attack Critical Rate and Damage +25%. PC Cafe exclusive skill. -->