BETA: Fix for Ticket #L5486, and some others small changes.

L2J_DataPack_BETA/dist/game/data/multisell/readme.txt

@@ -149,8 +149,8 @@ of this directory a little bit.
 364790003.xml -> Reputation Manager: Consumables
 
 326100001.xml -> Weaver Olf Kanore: Belts
-326100002.xml -> Weaver Olf Kanore: S80 & S84 Clock Unseal
-326100002.xml -> Weaver Olf Kanore: S80 & S84 Cloak Reseal
+326100002.xml -> Weaver Olf Kanore: S80 and S84 Clock Unseal
+326100002.xml -> Weaver Olf Kanore: S80 and S84 Cloak Reseal
 
 325460001.xml -> Asyatei - Soul Trader
 

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Transformation.java

@@ -49,21 +49,39 @@ public class Transformation extends L2Effect
 	public boolean onStart()
 	{
 		if (!(getEffected() instanceof L2PcInstance))
+		{
 			return false;
+		}
 		
 		L2PcInstance trg = (L2PcInstance) getEffected();
 		if (trg == null)
+		{
 			return false;
+		}
 		
 		if (trg.isAlikeDead() || trg.isCursedWeaponEquipped())
+		{
 			return false;
+		}
 		
-		if (trg.getTransformation() != null)
+		if (trg.isTransformed() || trg.isInStance())
 		{
 			trg.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
 			return false;
 		}
 		
+		if (trg.isInWater())
+		{
+			trg.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+			return false;
+		}
+		
+		if (trg.isMounted() || trg.isFlyingMounted())
+		{
+			trg.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_A_PET);
+			return false;
+		}
+		
 		TransformationManager.getInstance().transformPlayer(getSkill().getTransformId(), trg);
 		return true;
 	}

L2J_DataPack_BETA/dist/game/data/staticObjects.xml

@@ -15,7 +15,7 @@
 	<object id="23120001" name="town_map_dwarf_1" type="0" x="115462" y="-177294" z="-880" texture="town_map_dwarf_t00" map_x="165" map_y="386" />
 	<object id="23120002" name="town_map_dwarf_2" type="0" x="117449" y="-182298" z="-1488" texture="town_map_dwarf_t00" map_x="368" map_y="161" />
 	<object id="23120003" name="town_map_dwarf_3" type="0" x="116657" y="-183997" z="-1550" texture="town_map_dwarf_t00" map_x="319" map_y="110" />
-	<!-- Chairs & Thrones -->
+	<!-- Chairs and Thrones -->
 	<object id="18150002" name="TP_AT_chair_star_01" type="1" x="-59660" y="-68916" z="-2915" />
 	<object id="18150004" name="TP_AT_chair_star_01" type="1" x="-59840" y="-69023" z="-2910" />
 	<object id="18150005" name="TP_AT_chair_star_01" type="1" x="-59803" y="-69210" z="-2910" />

L2J_DataPack_BETA/dist/game/data/stats/items/21100-21199.xml

@@ -526,7 +526,7 @@
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="21152" type="Armor" name="Agathion Seal Bracelet - Singer and Dancer">
-		<!-- Description: Bracelet that summons a Singer &amp; Dancer Agathion that gleefully sings and dances. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
+		<!-- Description: Bracelet that summons a Singer and Dancer Agathion that gleefully sings and dances. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
 		<set name="icon" val="BranchSys2.icon.br_aga_singer_dancer_i00" />
 		<set name="default_action" val="equip" />
 		<set name="bodypart" val="lbracelet" />
@@ -539,7 +539,7 @@
 		<set name="item_skill" val="21233-1;23234-1;23235-1" />
 	</item>
 	<item id="21153" type="Armor" name="Agathion Seal Bracelet - Singer and Dancer - 7-day limited period">
-		<!-- Description: Bracelet that summons a Singer &amp; Dancer Agathion that gleefully sings and dances. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
+		<!-- Description: Bracelet that summons a Singer and Dancer Agathion that gleefully sings and dances. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
 		<set name="icon" val="BranchSys2.icon.br_aga_singer_dancer_i00" />
 		<set name="default_action" val="equip" />
 		<set name="bodypart" val="lbracelet" />
@@ -553,7 +553,7 @@
 		<set name="time" val="10080" />
 	</item>
 	<item id="21154" type="EtcItem" name="Singer and Dancer Agathion Pack">
-		<!-- Description: Wrapped pack containing a Singer &amp; Dancer Agathion. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
+		<!-- Description: Wrapped pack containing a Singer and Dancer Agathion. Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
 		<set name="icon" val="BranchSys.icon.br_four_leaf_clover_box_i00" />
 		<set name="material" val="paper" />
 		<set name="weight" val="100" />
@@ -563,7 +563,7 @@
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="21155" type="EtcItem" name="Singer and Dancer Agathion Pack">
-		<!-- Description: Wrapped pack containing a Singer &amp; Dancer Agathion (7 day). Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
+		<!-- Description: Wrapped pack containing a Singer and Dancer Agathion (7 day). Cannot be exchanged, dropped, or sold. Can be stored in a private warehouse. -->
 		<set name="icon" val="BranchSys.icon.br_four_leaf_clover_box_i00" />
 		<set name="material" val="paper" />
 		<set name="weight" val="100" />

L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml

@@ -1124,7 +1124,7 @@
 		</for>
 	</skill>
 	<skill id="176" levels="3" name="Frenzy">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#accCombat"> 2 4 6 </table>
 		<table name="#aggro"> 303 438 523 </table>

L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml

@@ -964,7 +964,7 @@
 		</for>
 	</skill>
 	<skill id="334" levels="1" name="Focus Skill Mastery">
-		<!-- Skill for Daggers & Archers -->
+		<!-- Skill for Daggers and Archers -->
 		<set name="magicLvl" val="78" />
 		<set name="mpConsume" val="36" />
 		<set name="target" val="TARGET_SELF" />
@@ -1309,7 +1309,7 @@
 		</cond>
 	</skill>
 	<skill id="345" levels="1" name="Sonic Rage">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="baseCritRate" val="10" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
@@ -1331,7 +1331,7 @@
 		</for>
 	</skill>
 	<skill id="346" levels="1" name="Raging Force">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="baseCritRate" val="10" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />

L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml

@@ -1732,7 +1732,7 @@
 		</for>
 	</skill>
 	<skill id="785" levels="1" name="Flame Icon">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="aggroPoints" val="835" />
 		<set name="hitTime" val="1800" />
 		<set name="hpConsume" val="1253" />
@@ -1830,7 +1830,7 @@
 		</for>
 	</skill>
 	<skill id="789" levels="1" name="Spirit of Shilen">
-		<!-- Confirmed CT2.5 & Update to H5 -->
+		<!-- Confirmed CT2.5 and Update to H5 -->
 		<set name="aggroPoints" val="835" />
 		<set name="hitTime" val="1800" />
 		<set name="hpConsume" val="1253" />
@@ -1881,7 +1881,7 @@
 		</cond>
 	</skill>
 	<skill id="791" levels="1" name="Lightning Shock">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="coolTime" val="720" />
 		<set name="hitTime" val="1080" />
 		<set name="isDebuff" val="true" />

L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml

@@ -551,7 +551,7 @@
 		<set name="npcId" val="13128" />
 	</skill>
 	<skill id="832" levels="2" name="Fast Recovery">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<!-- FIXME: Level 2 regen values unconfirmed -->
 		<table name="#magicLvl"> 43 49 </table>
 		<table name="#regHpCp"> 4 6 </table>
@@ -1354,7 +1354,7 @@
 		</for>
 	</skill>
 	<skill id="884" levels="11" name="Air Assault">
-		<!-- Aurabird Falcon & Owl -->
+		<!-- Aurabird Falcon and Owl -->
 		<table name="#magicLvl"> 75 76 77 78 79 80 81 82 83 84 85 </table>
 		<set name="power" val="1" />
 		<set name="mpConsume" val="30" />
@@ -1375,7 +1375,7 @@
 		</cond>
 	</skill>
 	<skill id="885" levels="1" name="Air Blink">
-		<!-- Aurabird Falcon & Owl -->
+		<!-- Aurabird Falcon and Owl -->
 		<set name="flyCourse" val="0" /> <!-- Teleport to Back -->
 		<set name="flyRadius" val="500" />
 		<set name="flyType" val="DUMMY" />

L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml

@@ -222,7 +222,7 @@
 		<set name="trait" val="BLEED" />
 	</skill>
 	<skill id="911" levels="11" name="Energy Burst">
-		<!-- Aurabird Falcon & Owl -->
+		<!-- Aurabird Falcon and Owl -->
 		<table name="#power"> 469 482 494 505 517 528 539 550 561 571 580 </table>
 		<table name="#mpConsume"> 69 70 70 71 72 72 73 74 74 75 75 </table>
 		<table name="#magicLvl"> 75 76 77 78 79 80 81 82 83 84 85 </table>
@@ -484,7 +484,7 @@
 		</for>
 	</skill>
 	<skill id="924" levels="1" name="Seven Arrow">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="baseCritRate" val="15" /> <!-- FIXME: value unconfirmed -->
 		<set name="castRange" val="900" />
 		<set name="effectRange" val="1000" />
@@ -533,7 +533,7 @@
 		</for>
 	</skill>
 	<skill id="927" levels="14" name="Burning Chop" enchantGroup1="2">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<table name="#magicLvl"> 40 44 48 52 56 58 60 62 64 66 68 70 72 74 </table>
 		<table name="#enchantMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#power"> 167 210 261 319 384 419 455 492 531 570 610 651 691 731 </table>

L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml

@@ -981,7 +981,7 @@
 		</enchant1for>
 	</skill>
 	<skill id="1436" levels="30" name="Soul of Pain" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<table name="#enchantMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Power"> 111 112 112 112 113 113 113 114 114 115 115 115 116 116 116 117 117 117 118 118 119 119 119 120 120 120 121 121 121 122 </table>
 		<table name="#ench2MpConsume"> 36 36 35 35 35 34 34 32 32 32 32 32 31 31 30 30 28 28 28 28 28 27 27 26 26 26 24 24 24 24 </table>
@@ -1080,7 +1080,7 @@
 		</enchant5for>
 	</skill>
 	<skill id="1438" levels="9" name="Annihilation Circle" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<table name="#enchantMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Power"> 111 112 112 112 113 113 113 114 114 115 115 115 116 116 116 117 117 117 118 118 119 119 119 120 120 120 121 121 121 122 </table>
 		<table name="#ench2MpConsume"> 58 56 56 55 55 54 52 52 52 51 50 48 48 48 47 46 44 44 44 43 42 42 40 40 39 38 38 36 36 35 </table>
@@ -1160,7 +1160,7 @@
 		<set name="effectRange" val="1100" />
 	</skill>
 	<skill id="1441" levels="3" name="Soul to Empower">
-		<!-- CT2.5 retail confirmed & Updated to H5 -->
+		<!-- CT2.5 retail confirmed and Updated to H5 -->
 		<table name="#magicLvl"> 43 55 64 </table>
 		<table name="#mpConsume_Init"> 8 10 12 </table>
 		<table name="#mpConsume"> 30 40 48 </table>
@@ -1973,7 +1973,7 @@
 		</for>
 	</skill>
 	<skill id="1467" levels="1" name="Meteor">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="castRange" val="600" />
 		<set name="element" val="0" /> <!-- Fire -->
 		<set name="elementPower" val="20" />
@@ -1997,7 +1997,7 @@
 		</for>
 	</skill>
 	<skill id="1468" levels="1" name="Star Fall">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="hitTime" val="3000" />
@@ -2019,7 +2019,7 @@
 		</for>
 	</skill>
 	<skill id="1469" levels="1" name="Leopold" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<table name="#enchantMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Power"> 235 235 236 237 237 238 238 239 239 240 241 241 242 242 243 </table>
 		<table name="#ench2MpConsume"> 66 64 62 60 58 55 55 51 48 47 44 42 40 38 36 </table>

L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml

@@ -312,7 +312,7 @@
 		</enchant3for>
 	</skill>
 	<skill id="1513" levels="1" name="Soul Vortex Extinction" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<table name="#enchantMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<table name="#ench1Power"> 197 198 198 199 199 200 200 201 202 202 203 203 204 204 205 </table>
 		<table name="#ench2mpInitialConsume"> 16 15 15 14 14 13 13 12 12 11 10 10 9 9 8 </table>
@@ -635,7 +635,7 @@
 		<set name="triggeredLevel" val="1" />
 	</skill>
 	<skill id="1527" levels="3" name="Expert Casting">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<table name="#magicLvl"> 40 49 55 </table>
 		<table name="#mReuse"> 0.9 0.85 0.8 </table>
 		<set name="magicLvl" val="#magicLvl" />

L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml

@@ -291,8 +291,8 @@
 		<set name="chanceType" val="ON_CRIT" />
 	</skill>
 	<skill id="3427" levels="1" name="Special Ability: Infinity Rapier">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
-		<set name="magicLvl" val="85" />
+		<!-- Confirmed CT2.5 and Updated to H5 -->
+		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />

L2J_DataPack_BETA/dist/game/data/stats/skills/03500-03599.xml

@@ -883,7 +883,7 @@
 		</for>
 	</skill>
 	<skill id="3578" levels="1" name="Special Ability: Infinity Blade">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -918,7 +918,7 @@
 		</for>
 	</skill>
 	<skill id="3580" levels="1" name="Special Ability: Infinity Axe">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -948,7 +948,7 @@
 		</for>
 	</skill>
 	<skill id="3582" levels="1" name="Special Ability: Infinity Cleaver">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -967,7 +967,7 @@
 		</for>
 	</skill>
 	<skill id="3583" levels="1" name="Special Ability: Infinity Crusher">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -1001,7 +1001,7 @@
 		</for>
 	</skill>
 	<skill id="3585" levels="1" name="Special Ability: Infinity Wing">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -1036,7 +1036,7 @@
 		</for>
 	</skill>
 	<skill id="3587" levels="1" name="Special Ability: Infinity Fang">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -1071,7 +1071,7 @@
 		</for>
 	</skill>
 	<skill id="3589" levels="1" name="Special Ability: Infinity Stinger">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -1108,7 +1108,7 @@
 		</for>
 	</skill>
 	<skill id="3591" levels="1" name="Special Ability: Infinity Spear">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -1129,7 +1129,7 @@
 		</for>
 	</skill>
 	<skill id="3592" levels="1" name="Dispell">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<!-- Infinity Spear Skill -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
@@ -1141,7 +1141,7 @@
 		<set name="target" val="TARGET_ONE" />
 	</skill>
 	<skill id="3593" levels="1" name="Special Ability: Infinity Bow">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -1208,7 +1208,7 @@
 		</for>
 	</skill>
 	<skill id="3597" levels="1" name="Special Ability: Infinity Rod">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />

L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml

@@ -19,7 +19,7 @@
 		</for>
 	</skill>
 	<skill id="3601" levels="10" name="Special Ability: Haste">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<table name="#pAtkSpd"> 1.08 1.07 1.07 1.07 1.06 1.06 1.06 1.06 1.07 1.11 </table>
 		<table name="#pvpBonus"> 1 1 1 1 1 1 1.05 1.05 1.05 1.05 </table>
 		<table name="#magicLvl"> 46 49 52 55 58 61 64 67 75 84 </table>
@@ -122,7 +122,7 @@
 		</for>
 	</skill>
 	<skill id="3605" levels="1" name="Clan Oath Heavy Armor Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -133,7 +133,7 @@
 		</for>
 	</skill>
 	<skill id="3606" levels="1" name="Clan Oath Light Armor Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -144,7 +144,7 @@
 		</for>
 	</skill>
 	<skill id="3607" levels="1" name="Clan Oath Robe Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -611,7 +611,7 @@
 		</for>
 	</skill>
 	<skill id="3634" levels="1" name="Special Ability: Infinity Sword">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -630,7 +630,7 @@
 		</for>
 	</skill>
 	<skill id="3635" levels="1" name="Special Ability: Infinity Shooter">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />

L2J_DataPack_BETA/dist/game/data/stats/skills/06300-06399.xml

@@ -40,7 +40,7 @@
 	</skill>
 	<skill id="6302" levels="1" name="Cold Air">
 		<!-- Confirmed CT2.5 -->
-		<!-- Freya Skills (Triggered from 6662 & 6698) -->
+		<!-- Freya Skills (Triggered from 6662 and 6698) -->
 		<set name="aggroPoints" val="1" />
 		<set name="isMagic" val="true" />
 		<set name="isTriggeredSkill" val="true" />

L2J_DataPack_BETA/dist/game/data/stats/skills/08200-08299.xml

@@ -1083,7 +1083,7 @@
 		</for>
 	</skill>
 	<skill id="8284" levels="1" name="Vesper Noble Heavy Armor Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -1114,7 +1114,7 @@
 		</for>
 	</skill>
 	<skill id="8286" levels="1" name="Vesper Noble Light Armor Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -1145,7 +1145,7 @@
 		</for>
 	</skill>
 	<skill id="8288" levels="1" name="Vesper Noble Robe Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />

L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml

@@ -28,7 +28,7 @@
 		</for>
 	</skill>
 	<skill id="8302" levels="1" name="Vesper Noble Heavy Armor Set for Adults">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -67,7 +67,7 @@
 		</for>
 	</skill>
 	<skill id="8304" levels="1" name="Vesper Noble Light Armor Set for Adults">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -106,7 +106,7 @@
 		</for>
 	</skill>
 	<skill id="8306" levels="1" name="Vesper Noble Robe Set for Adults">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />

L2J_DataPack_BETA/dist/game/data/stats/skills/08400-08499.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="8400" levels="1" name="Vorpal Heavy Armor Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -24,7 +24,7 @@
 		</for>
 	</skill>
 	<skill id="8401" levels="1" name="Vorpal Leather Armor Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -45,7 +45,7 @@
 		</for>
 	</skill>
 	<skill id="8402" levels="1" name="Vorpal Robe Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -106,7 +106,7 @@
 		</for>
 	</skill>
 	<skill id="8405" levels="1" name="Elegia Robe Set">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -192,7 +192,7 @@
 		</for>
 	</skill>
 	<skill id="8409" levels="1" name="Vorpal Heavy Armor Set - PvP">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -219,7 +219,7 @@
 		</for>
 	</skill>
 	<skill id="8410" levels="1" name="Vorpal Leather Armor Set - PvP">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -244,7 +244,7 @@
 		</for>
 	</skill>
 	<skill id="8411" levels="1" name="Vorpal Robe Set - PvP">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />
@@ -317,7 +317,7 @@
 		</for>
 	</skill>
 	<skill id="8414" levels="1" name="Elegia Robe Set - PvP">
-		<!-- Confirmed CT2.5 & Updated to H5 -->
+		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="BUFF" />

L2J_DataPack_BETA/dist/game/data/stats/skills/23200-23299.xml

@@ -1357,7 +1357,7 @@
 		<set name="operateType" val="P" />
 	</skill>
 	<skill id="23298" levels="1" name="Flame Hawk">
-		<!-- FIXME: Chance & Reuse values are unconfirmed -->
+		<!-- FIXME: Chance and Reuse values are unconfirmed -->
 		<set name="element" val="0" /> <!-- Fire -->
 		<set name="elementPower" val="20" />
 		<set name="isTriggeredSkill" val="true" />
@@ -1373,7 +1373,7 @@
 		</for>
 	</skill>
 	<skill id="23299" levels="1" name="Arrow Rain">
-		<!-- FIXME: Chance & Reuse values are unconfirmed -->
+		<!-- FIXME: Chance and Reuse values are unconfirmed -->
 		<set name="element" val="2" /> <!-- Wind -->
 		<set name="elementPower" val="20" />
 		<set name="isTriggeredSkill" val="true" />

L2J_DataPack_BETA/dist/game/data/stats/skills/23300-23399.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="23300" levels="1" name="Ghost Piercing">
-		<!-- FIXME: Chance & Reuse values are unconfirmed -->
+		<!-- FIXME: Chance and Reuse values are unconfirmed -->
 		<set name="element" val="5" /> <!-- Dark -->
 		<set name="elementPower" val="20" />
 		<set name="isTriggeredSkill" val="true" />

L2J_DataPack_BETA/dist/game/data/zones/zone.xml

@@ -97,7 +97,7 @@
 		<node X="-213500" Y="182800" />
 	</zone>
 
-	<!-- (vertices, min Z & Max Z are estimated) -->
+	<!-- (vertices, min Z and Max Z are estimated) -->
 	<zone name="Den of Evil 1" type="EffectZone" shape="Cylinder" minZ="-2300" maxZ="-2100" rad="750">
 		<stat name="reuse" val="9000" />
 		<stat name="targetClass" val="L2Character" />