From 20b3ccd9f4eebe4f7f10b1fc71583d3e76509b87 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 17 May 2015 14:39:16 +0000
Subject: [PATCH] R Grade Lifestones support. Contributed by GMeXiD.

---
 .../game/data/stats/items/16100-16199.xml     | 15 ++++---
 .../game/data/stats/items/18500-18599.xml     | 45 +++++++++++++++++++
 .../game/data/stats/items/22600-22699.xml     | 40 +++++++++++++++++
 .../clientpackets/AbstractRefinePacket.java   | 44 +++++++++++++++---
 4 files changed, 133 insertions(+), 11 deletions(-)

diff --git a/trunk/dist/game/data/stats/items/16100-16199.xml b/trunk/dist/game/data/stats/items/16100-16199.xml
index 3afb0779fe..4e76459021 100644
--- a/trunk/dist/game/data/stats/items/16100-16199.xml
+++ b/trunk/dist/game/data/stats/items/16100-16199.xml
@@ -1184,6 +1184,7 @@
 		<set name="weight" val="2" />
 		<set name="price" val="49680" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
 		<cond msgId="113">
 			<player level="85" />
 		</cond>
@@ -1195,6 +1196,7 @@
 		<set name="weight" val="2" />
 		<set name="price" val="198960" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
 		<cond msgId="113">
 			<player level="85" />
 		</cond>
@@ -1218,6 +1220,7 @@
 		<set name="weight" val="2" />
 		<set name="price" val="4975200" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
 		<cond msgId="113">
 			<player level="85" />
 		</cond>
@@ -1231,7 +1234,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
 		<cond msgId="113">
-			<player level="85" />
+			<player level="86" />
 		</cond>
 	</item>
 	<item id="16165" type="EtcItem" name="Mid-grade Life Stone - Lv. 86">
@@ -1243,7 +1246,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
 		<cond msgId="113">
-			<player level="85" />
+			<player level="86" />
 		</cond>
 	</item>
 	<item id="16166" type="EtcItem" name="High-grade Life Stone - Lv. 86">
@@ -1255,7 +1258,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
 		<cond msgId="113">
-			<player level="85" />
+			<player level="86" />
 		</cond>
 	</item>
 	<item id="16167" type="EtcItem" name="Top-grade Life Stone - Lv. 86">
@@ -1266,7 +1269,7 @@
 		<set name="price" val="5970240" />
 		<set name="is_stackable" val="true" />
 		<cond msgId="113">
-			<player level="85" />
+			<player level="86" />
 		</cond>
 	</item>
 	<item id="16168" type="Armor" name="Elegia Breastplate {PvP}">
@@ -1450,6 +1453,7 @@
 		<set name="weight" val="2" />
 		<set name="price" val="49680" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
 		<cond msgId="113">
 			<player level="85" />
 		</cond>
@@ -1461,8 +1465,9 @@
 		<set name="weight" val="2" />
 		<set name="price" val="59616" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
 		<cond msgId="113">
-			<player level="85" />
+			<player level="86" />
 		</cond>
 	</item>
 	<item id="16179" type="Weapon" name="Vesper Cutter- Thunder {PvP} - Haste">
diff --git a/trunk/dist/game/data/stats/items/18500-18599.xml b/trunk/dist/game/data/stats/items/18500-18599.xml
index 1c11a1e007..bdd905e912 100644
--- a/trunk/dist/game/data/stats/items/18500-18599.xml
+++ b/trunk/dist/game/data/stats/items/18500-18599.xml
@@ -383,6 +383,9 @@
 		<set name="price" val="29808" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="85" />
+		</cond>
 	</item>
 	<item id="18564" name="Mid-grade Life Stone (R-grade)" additionalName="" type="EtcItem">
 		<!-- Mid-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting at level 85 or above. -->
@@ -391,6 +394,9 @@
 		<set name="price" val="119376" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="85" />
+		</cond>
 	</item>
 	<item id="18565" name="High-grade Life Stone (R-grade)" additionalName="" type="EtcItem">
 		<!-- High-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting at level 85 or above. -->
@@ -399,6 +405,9 @@
 		<set name="price" val="596880" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="85" />
+		</cond>
 	</item>
 	<item id="18566" name="Top-grade Life Stone (R-grade)" additionalName="" type="EtcItem">
 		<!-- Top-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon augmentation at level 85 or above. Can be exchanged or dropped. -->
@@ -407,6 +416,9 @@
 		<set name="price" val="2985120" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="85" />
+		</cond>
 	</item>
 	<item id="18567" name="Legendary Life Stone (R-grade)" additionalName="" type="EtcItem">
 		<!-- This is a legendary mineral, having been petrified by a creature's physical or magical force. May be used as an ingredient in weapon augmentation by characters higher than level 85. -->
@@ -414,6 +426,9 @@
 		<set name="weight" val="2" />
 		<set name="price" val="5970240" />
 		<set name="is_stackable" val="true" />
+		<cond msgId="113">
+			<player level="85" />
+		</cond>		
 	</item>
 	<item id="18568" name="Life Stone (R95-grade)" additionalName="" type="EtcItem">
 		<!-- Ordinary mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 95. -->
@@ -422,6 +437,9 @@
 		<set name="price" val="59616" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="95" />
+		</cond>
 	</item>
 	<item id="18569" name="Mid-grade Life Stone (R95-grade)" additionalName="" type="EtcItem">
 		<!-- Mid-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 95. -->
@@ -430,6 +448,9 @@
 		<set name="price" val="238752" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="95" />
+		</cond>
 	</item>
 	<item id="18570" name="High-grade Life Stone (R95-grade)" additionalName="" type="EtcItem">
 		<!-- High-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 95. -->
@@ -438,6 +459,9 @@
 		<set name="price" val="1193760" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="95" />
+		</cond>
 	</item>
 	<item id="18571" name="Top-grade Life Stone (R95-grade)" additionalName="" type="EtcItem">
 		<!-- Top-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 95. -->
@@ -446,6 +470,9 @@
 		<set name="price" val="5970240" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="95" />
+		</cond>
 	</item>
 	<item id="18572" name="Legendary Life Stone (R95-grade)" additionalName="" type="EtcItem">
 		<!-- Legendary mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 95. -->
@@ -453,6 +480,9 @@
 		<set name="weight" val="2" />
 		<set name="price" val="11940480" />
 		<set name="is_stackable" val="true" />
+		<cond msgId="113">
+			<player level="95" />
+		</cond>
 	</item>
 	<item id="18573" name="Life Stone (R99-grade)" additionalName="" type="EtcItem">
 		<!-- Ordinary mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 99. -->
@@ -461,6 +491,9 @@
 		<set name="price" val="71540" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="99" />
+		</cond>
 	</item>
 	<item id="18574" name="Mid-grade Life Stone (R99-grade)" additionalName="" type="EtcItem">
 		<!-- Mid-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 99. -->
@@ -469,6 +502,9 @@
 		<set name="price" val="286500" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="99" />
+		</cond>
 	</item>
 	<item id="18575" name="High-grade Life Stone (R99-grade)" additionalName="" type="EtcItem">
 		<!-- High-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 99. -->
@@ -477,6 +513,9 @@
 		<set name="price" val="1432500" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="99" />
+		</cond>
 	</item>
 	<item id="18576" name="Top-grade Life Stone (R99-grade)" additionalName="" type="EtcItem">
 		<!-- Top-grade mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 99. -->
@@ -485,6 +524,9 @@
 		<set name="price" val="7164300" />
 		<set name="is_stackable" val="true" />
 		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="99" />
+		</cond>
 	</item>
 	<item id="18577" name="Legendary Life Stone (R99-grade)" additionalName="" type="EtcItem">
 		<!-- Legendary mineral that has been petrified by a creature's physical or magical damage. May be used as an ingredient in weapon crafting by characters above level 99. -->
@@ -492,6 +534,9 @@
 		<set name="weight" val="2" />
 		<set name="price" val="14328600" />
 		<set name="is_stackable" val="true" />
+		<cond msgId="113">
+			<player level="99" />
+		</cond>
 	</item>
 	<item id="18578" name="Requiem Shaper" additionalName="Guidance" type="Weapon">
 		<!-- (Soul Crystal Enhancement)\nIncreases Accuracy by 7.6. Increases damage inflicted during PvP. Increases P. Critical Damage when enchanted to + 4. -->
diff --git a/trunk/dist/game/data/stats/items/22600-22699.xml b/trunk/dist/game/data/stats/items/22600-22699.xml
index 7dfdca7b74..f87e78eca2 100644
--- a/trunk/dist/game/data/stats/items/22600-22699.xml
+++ b/trunk/dist/game/data/stats/items/22600-22699.xml
@@ -168,32 +168,72 @@
 	<item id="22629" name="High-grade Life Stone (R-grade)" additionalName="" type="EtcItem">
 		<!-- Premium user exclusive item\nHigh-level mineral that has been petrified inside a creature through physical or magical damage. Can be used by characters who are level 85 or above. -->
 		<set name="icon" val="icon.r_mineral_rare_i00" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="2" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="85" />
+		</cond>
 	</item>
 	<item id="22630" name="Top-grade Life Stone (R-grade)" additionalName="" type="EtcItem">
 		<!-- Premium user exclusive item\nTop-grade mineral that has been petrified inside a creature through physical or magical damage. Can be used by characters who are level 85 or above. -->
 		<set name="icon" val="icon.r_mineral_unique_i00" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="2" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="85" />
+		</cond>
 	</item>
 	<item id="22631" name="High-grade Life Stone (R95-grade)" additionalName="" type="EtcItem">
 		<!-- Premium user exclusive item\nHigh-level mineral that has been petrified inside a creature through physical or magical damage. Can be used by characters who are above level 95. -->
 		<set name="icon" val="icon.r95_mineral_rare_i00" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="2" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="95" />
+		</cond>
 	</item>
 	<item id="22632" name="Top-grade Life Stone (R95-grade)" additionalName="" type="EtcItem">
 		<!-- Premium user exclusive item\nTop-grade mineral that has been petrified inside a creature through physical or magical damage. Can be used by characters who are above level 95. -->
 		<set name="icon" val="icon.r95_mineral_unique_i00" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="2" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="95" />
+		</cond>
 	</item>
 	<item id="22633" name="High-grade Life Stone (R99-grade)" additionalName="" type="EtcItem">
 		<!-- Premium user exclusive item\nHigh-level mineral that has been petrified inside a creature through physical or magical damage. Can be used by characters who are above level 99. -->
 		<set name="icon" val="icon.r99_mineral_rare_i00" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
 		<set name="weight" val="2" />
+		<set name="is_dropable" val="false" />
+		<set name="is_tradable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="LIFE_STONE" />
+		<cond msgId="113">
+			<player level="99" />
+		</cond>
 	</item>
 	<item id="22634" name="Top-grade Life Stone (R99-grade)" additionalName="" type="EtcItem">
 		<!-- Premium user exclusive item\nTop-grade mineral that has been petrified inside a creature through physical or magical damage. Can be used by characters who are above level 99. -->
diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java
index 47fc29e9fe..ff560e6c45 100644
--- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java
+++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java
@@ -46,6 +46,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
 	protected static final int GEMSTONE_D = 2130;
 	protected static final int GEMSTONE_C = 2131;
 	protected static final int GEMSTONE_B = 2132;
+	protected static final int GEMSTONE_A = 2133;
 	
 	private static final Map<Integer, LifeStone> _lifeStones = new HashMap<>();
 	
@@ -67,7 +68,10 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
 			80,
 			82,
 			84,
-			85
+			85,
+			86,
+			95,
+			99
 		};
 		private final int _grade;
 		private final int _level;
@@ -191,11 +195,23 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
 		_lifeStones.put(16163, new LifeStone(GRADE_TOP, 13));
 		_lifeStones.put(16177, new LifeStone(GRADE_ACC, 13));
 		
-		_lifeStones.put(16164, new LifeStone(GRADE_NONE, 13));
-		_lifeStones.put(16165, new LifeStone(GRADE_MID, 13));
-		_lifeStones.put(16166, new LifeStone(GRADE_HIGH, 13));
-		_lifeStones.put(16167, new LifeStone(GRADE_TOP, 13));
-		_lifeStones.put(16178, new LifeStone(GRADE_ACC, 13));
+		_lifeStones.put(16164, new LifeStone(GRADE_NONE, 14));
+		_lifeStones.put(16165, new LifeStone(GRADE_MID, 14));
+		_lifeStones.put(16166, new LifeStone(GRADE_HIGH, 14));
+		_lifeStones.put(16167, new LifeStone(GRADE_TOP, 14));
+		_lifeStones.put(16178, new LifeStone(GRADE_ACC, 14));
+		
+		_lifeStones.put(18564, new LifeStone(GRADE_MID, 15));
+		_lifeStones.put(18565, new LifeStone(GRADE_HIGH, 15));
+		_lifeStones.put(18566, new LifeStone(GRADE_TOP, 15));
+		
+		_lifeStones.put(22629, new LifeStone(GRADE_MID, 16));
+		_lifeStones.put(22630, new LifeStone(GRADE_HIGH, 16));
+		_lifeStones.put(22631, new LifeStone(GRADE_TOP, 16));
+		
+		_lifeStones.put(22632, new LifeStone(GRADE_MID, 17));
+		_lifeStones.put(22633, new LifeStone(GRADE_HIGH, 17));
+		_lifeStones.put(22634, new LifeStone(GRADE_TOP, 17));
 	}
 	
 	protected static final LifeStone getLifeStone(int itemId)
@@ -460,6 +476,10 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
 			case S80:
 			case S84:
 				return GEMSTONE_B;
+			case R:
+			case R95:
+			case R99:
+				return GEMSTONE_A;
 			default:
 				return 0;
 		}
@@ -490,6 +510,12 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
 						return 360;
 					case S84:
 						return 480;
+					case R:
+						return 540;
+					case R95:
+						return 620;
+					case R99:
+						return 700;
 					default:
 						return 0;
 				}
@@ -507,6 +533,12 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
 					case S80:
 					case S84:
 						return 36;
+					case R:
+						return 55;
+					case R95:
+						return 70;
+					case R99:
+						return 95;
 					default:
 						return 0;
 				}