BETA: Datapack format and cleanup.

L2J_DataPack_BETA/dist/game/data/categoryData.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="xsd/categoryData.xsd">
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/categoryData.xsd">
 	<category name="FIGHTER_GROUP">
 		<id>0</id> <!-- Human Fighter -->
 		<id>1</id> <!-- Warrior -->

L2J_DataPack_BETA/dist/game/data/enchantItemData.xml

@@ -6,7 +6,7 @@
 	<enchant id="951" targetGrade="c" />
 	<enchant id="955" targetGrade="d" />
 	<enchant id="959" targetGrade="s" />
-	
+
 	<!-- Scrolls: Enchant Armor -->
 	<enchant id="730" targetGrade="a" />
 	<enchant id="948" targetGrade="b" />
@@ -29,17 +29,17 @@
 
 	<!-- Not used anymore. -->
 	<!-- Crystal Scrolls: Enchant Weapon -->
-	<!-- <enchant id="731" targetGrade="a" bonusRate="100" />
-	<enchant id="949" targetGrade="b" bonusRate="100" />
-	<enchant id="953" targetGrade="c" bonusRate="100" />
-	<enchant id="957" targetGrade="d" bonusRate="100" />
-	<enchant id="961" targetGrade="s" bonusRate="100" /> -->
+	<!-- <enchant id="731" targetGrade="a" bonusRate="100" /> -->
+	<!-- <enchant id="949" targetGrade="b" bonusRate="100" /> -->
+	<!-- <enchant id="953" targetGrade="c" bonusRate="100" /> -->
+	<!-- <enchant id="957" targetGrade="d" bonusRate="100" /> -->
+	<!-- <enchant id="961" targetGrade="s" bonusRate="100" /> -->
 	<!-- Crystal Scrolls: Enchant Armor -->
-	<!-- <enchant id="732" targetGrade="a" bonusRate="100" />
-	<enchant id="950" targetGrade="b" bonusRate="100" />
-	<enchant id="954" targetGrade="c" bonusRate="100" />
-	<enchant id="958" targetGrade="d" bonusRate="100" />
-	<enchant id="962" targetGrade="s" bonusRate="100" /> -->
+	<!-- <enchant id="732" targetGrade="a" bonusRate="100" /> -->
+	<!-- <enchant id="950" targetGrade="b" bonusRate="100" /> -->
+	<!-- <enchant id="954" targetGrade="c" bonusRate="100" /> -->
+	<!-- <enchant id="958" targetGrade="d" bonusRate="100" /> -->
+	<!-- <enchant id="962" targetGrade="s" bonusRate="100" /> -->
 
 	<!-- Weapon Enchant Scrolls -->
 	<enchant id="22006" targetGrade="d" bonusRate="10" />
@@ -230,7 +230,7 @@
 	<support id="12364" targetGrade="b" maxEnchant="9" bonusRate="15" />
 	<support id="12365" targetGrade="a" maxEnchant="9" bonusRate="12" />
 	<support id="12366" targetGrade="s" maxEnchant="9" bonusRate="10" />
-	
+
 	<!-- Armor-Type Enhance Backup Stone -->
 	<support id="12367" targetGrade="d" maxEnchant="9" bonusRate="35" />
 	<support id="12368" targetGrade="c" maxEnchant="9" bonusRate="27" />
@@ -244,7 +244,7 @@
 	<support id="14704" targetGrade="b" maxEnchant="9" bonusRate="15" />
 	<support id="14705" targetGrade="a" maxEnchant="9" bonusRate="12" />
 	<support id="14706" targetGrade="s" maxEnchant="9" bonusRate="10" />
-	
+
 	<!-- Agathion Auxiliary Stone: Enchant Armor -->
 	<support id="14707" targetGrade="d" maxEnchant="9" bonusRate="35" />
 	<support id="14708" targetGrade="c" maxEnchant="9" bonusRate="27" />

L2J_DataPack_BETA/dist/game/data/enchantItemGroups.xml

@@ -58,7 +58,7 @@
 		<current enchant="3-14" chance="40" />
 		<current enchant="15-65535" chance="20" />
 	</enchantRateGroup>
-	
+
 	<!-- Default scrolls enchanting route line. -->
 	<enchantScrollGroup id="0">
 		<!-- Bind armor group to all item slots except full armor. -->

L2J_DataPack_BETA/dist/game/data/multisell/521.xml

@@ -3,16 +3,16 @@
 	<npcs>
 		<npc>31555</npc> <!-- Abercrombie -->
 	</npcs>
-  	<item>
+	<item>
 		<!-- Golden Ram Coin -->
-    		<ingredient count="1" id="7251"/>
+		<ingredient count="1" id="7251" />
 		<!-- Booty - Gray Pouch -->
-		<production count="1" id="7725"/>
-  	</item>
-  	<item>
+		<production count="1" id="7725" />
+	</item>
+	<item>
 		<!-- Golden Ram Coin -->
-	   	<ingredient count="10" id="7251"/>
+		<ingredient count="10" id="7251" />
 		<!-- Dimensional Diamond -->
-		<production count="1" id="7562"/>
-  	</item>
+		<production count="1" id="7562" />
+	</item>
 </list>

L2J_DataPack_BETA/dist/game/data/multisell/526.xml

@@ -3,28 +3,28 @@
 	<npcs>
 		<npc>31555</npc> <!-- Abercrombie -->
 	</npcs>
-  	<item>
+	<item>
 		<!-- Golden Ram Coin -->
-    		<ingredient count="1" id="7251"/>
+		<ingredient count="1" id="7251" />
 		<!-- Booty - Gray Pouch -->
-    		<production count="1" id="7725"/>
-  	</item>
-  	<item>
+		<production count="1" id="7725" />
+	</item>
+	<item>
 		<!-- Golden Ram Coin -->
-    		<ingredient count="6" id="7251"/>
+		<ingredient count="6" id="7251" />
 		<!-- Booty - Yellow Pouch -->
-    		<production count="1" id="7636"/>
-  	</item>
-  	<item>
+		<production count="1" id="7636" />
+	</item>
+	<item>
 		<!-- Golden Ram Coin -->
-    		<ingredient count="28" id="7251"/>
+		<ingredient count="28" id="7251" />
 		<!-- Booty - Brown Pouch -->
-    		<production count="1" id="7637"/>
-  	</item>
-  	<item>
+		<production count="1" id="7637" />
+	</item>
+	<item>
 		<!-- Golden Ram Coin -->
-    		<ingredient count="10" id="7251"/>
+		<ingredient count="10" id="7251" />
 		<!-- Dimensional Diamond -->
-    		<production count="1" id="7562"/>
-  	</item>
+		<production count="1" id="7562" />
+	</item>
 </list>

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java

@@ -18,6 +18,9 @@
  */
 package quests.Q00327_RecoverTheFarmland;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -25,9 +28,6 @@ import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Recover the Farmland (327).
  * @author GKR
@@ -73,7 +73,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 	private static final int MIN_LVL = 25;
 	private static final Map<String, ItemHolder> FRAGMENTS_REWARD_DATA = new HashMap<>(4);
 	private static final Map<Integer, Integer> FRAGMENTS_DROP_PROB = new HashMap<>(7);
-	private static final ItemHolder[] FULL_REWARD_DATA = 
+	private static final ItemHolder[] FULL_REWARD_DATA =
 	{
 		new ItemHolder(ANCIENT_CLAY_URN, 2766),
 		new ItemHolder(ANCIENT_BRASS_TIARA, 3227),
@@ -117,7 +117,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 		
 		String html = null;
 		
-		switch(event)
+		switch (event)
 		{
 			case "30034-01.html":
 			case "30313-01.html":
@@ -167,7 +167,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 					addExpAndSp(player, getQuestItemsCount(player, item.getId()) * item.getCount(), 0);
 					takeItems(player, item.getId(), -1);
 					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
-					html = event; 
+					html = event;
 				}
 				break;
 			}
@@ -181,7 +181,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 						addExpAndSp(player, getQuestItemsCount(player, it.getId()) * it.getCount(), 0);
 						takeItems(player, it.getId(), -1);
 						playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
-						rewarded = true; 
+						rewarded = true;
 					}
 				}
 				html = rewarded ? event : "30034-02.html";
@@ -275,7 +275,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 			{
 				if (!hasQuestItems(player, ANCIENT_CLAY_URN))
 				{
-					html = "30314-07.html"; 
+					html = "30314-07.html";
 				}
 				else
 				{
@@ -289,7 +289,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 			{
 				if (!hasQuestItems(player, ANCIENT_BRASS_TIARA))
 				{
-					html = "30314-07.html"; 
+					html = "30314-07.html";
 				}
 				else
 				{
@@ -315,7 +315,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 			{
 				if (!hasQuestItems(player, ANCIENT_BRONZE_MIRROR))
 				{
-					html = "30314-07.html"; 
+					html = "30314-07.html";
 				}
 				else
 				{
@@ -329,7 +329,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 			{
 				if (!hasQuestItems(player, ANCIENT_JADE_NECKLACE))
 				{
-					html = "30314-07.html"; 
+					html = "30314-07.html";
 				}
 				else
 				{
@@ -350,7 +350,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 		final QuestState st = getQuestState(killer, false);
 		if (st != null)
 		{
-			if((npc.getId() == TUREK_ORK_SHAMAN) || (npc.getId() == TUREK_ORK_WARLORD))
+			if ((npc.getId() == TUREK_ORK_SHAMAN) || (npc.getId() == TUREK_ORK_WARLORD))
 			{
 				giveItems(killer, TUREK_MEDALLION, 1);
 			}
@@ -373,12 +373,12 @@ public final class Q00327_RecoverTheFarmland extends Quest
 		final QuestState st = getQuestState(player, true);
 		String html = getNoQuestMsg(player);
 		
-		switch(npc.getId())
+		switch (npc.getId())
 		{
 			case LEIKAN:
 			{
 				if (st.isCreated())
-				{ 
+				{
 					html = ((player.getLevel() >= MIN_LVL) ? "30382-02.htm" : "30382-01.htm");
 				}
 				else if (st.isStarted())
@@ -457,7 +457,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
 		}
 		
 		return html;
-	}	
+	}
 	
 	public static void main(String[] args)
 	{

L2J_DataPack_BETA/dist/game/data/skillLearn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"	xsi:noNamespaceSchemaLocation="xsd/skillLearn.xsd">
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/skillLearn.xsd">
 	<npc id="30010"> <!-- Auron -->
 		<classId>0</classId> <!-- Human Fighter -->
 		<classId>1</classId> <!-- Warrior -->

L2J_DataPack_BETA/dist/game/data/spawnlist/turek_orcs_fixed_pos.xml

@@ -8,7 +8,7 @@
 			<fleeZ>-3552</fleeZ>
 		</AIData>
 		<npc id="20498" x="-100536" y="103827" z="-3488" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Supplier -->
-	<npc id="20498" x="-99937" y="103479" z="-3536" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Supplier -->
+		<npc id="20498" x="-99937" y="103479" z="-3536" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Supplier -->
 		<npc id="20497" x="-98696" y="101233" z="-3536" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Skirmisher -->
 		<npc id="20497" x="-99367" y="102854" z="-3520" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Skirmisher -->
 		<npc id="20501" x="-100719" y="103235" z="-3552" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Shaman -->
@@ -35,8 +35,8 @@
 			<fleeY>102304</fleeY>
 			<fleeZ>-3552</fleeZ>
 		</AIData>
-		<npc id="20494" x="-97269" y="102450" z="-3504" respawnDelay="60" respawnRandom="20" />	<!-- Turek War Hound  -->
-		<npc id="20494" x="-96112" y="102114" z="-3536" respawnDelay="60" respawnRandom="20" />	<!-- Turek War Hound  -->
+		<npc id="20494" x="-97269" y="102450" z="-3504" respawnDelay="60" respawnRandom="20" />	<!-- Turek War Hound -->
+		<npc id="20494" x="-96112" y="102114" z="-3536" respawnDelay="60" respawnRandom="20" />	<!-- Turek War Hound -->
 		<npc id="20500" x="-95967" y="102844" z="-3504" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Sentinel -->
 		<npc id="20500" x="-97677" y="102445" z="-3504" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Sentinel -->
 		<npc id="20499" x="-97863" y="101342" z="-3432" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Footman -->
@@ -362,7 +362,7 @@
 		<npc id="20497" x="-88150" y="102989" z="-3400" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Skirmisher -->
 		<npc id="20501" x="-87989" y="103261" z="-3400" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Shaman -->
 		<npc id="20501" x="-88643" y="102900" z="-3406" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Shaman -->
-	</spawn>	
+	</spawn>
 	<!-- gludio15_1721_25sm1 -->
 	<spawn>
 		<AIData>

L2J_DataPack_BETA/dist/game/data/spawnlist/turek_orcs_zone_based.xml

@@ -78,7 +78,7 @@
 			<fleeY>106816</fleeY>
 			<fleeZ>-3392</fleeZ>
 		</AIData>
-    <npc id="20496" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Archer -->
+		<npc id="20496" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Archer -->
 		<npc id="20498" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Supplier -->
 		<npc id="20497" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Skirmisher -->
 		<npc id="20501" count="3" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Shaman -->
@@ -222,7 +222,7 @@
 			<fleeZ>-3552</fleeZ>
 		</AIData>
 		<npc id="20501" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Shaman -->
-		<npc id="20495" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Warlord -->		
+		<npc id="20495" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Warlord -->
 	</spawn>
 	<!-- gludio15_1721_23sm1 -->
 	<spawn zone="turek_orc_zone_19">
@@ -233,7 +233,7 @@
 	<spawn zone="turek_orc_zone_20">
 		<npc id="20497" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Skirmisher -->
 		<npc id="20501" count="2" respawnDelay="60" respawnRandom="20" />	<!-- Turek Orc Shaman -->
-	</spawn>	
+	</spawn>
 	<!-- gludio15_1721_25sm1 -->
 	<spawn zone="turek_orc_zone_21">
 		<AIData>

L2J_DataPack_BETA/dist/game/data/stats/items/22200-22299.xml

@@ -354,7 +354,7 @@
 	</item>
 	<item id="22230" type="EtcItem" name="Scroll: Enchant Armor of Destruction (D-Grade) - Event">
 		<!-- Description: When enchanted, increases P. Def. by 1 for D-Grade armor and accessories. Increases by 3 starting from +4. It can safely be enchanted up to +3. For one-piece armor, it can safely be enchanted up to +4. When enchant fails, the item is not crystallized by the power of the goddess of destruction, and the existing enchant value is maintained. When armor is enchanted up to +4, HP increases according to the enchant value. Cannot be used on armor that are +6 or above. -->
-		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_d_i01" />		
+		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_d_i01" />
 		<set name="default_action" val="skill_reduce" />
 		<set name="etcitem_type" val="scrl_enchant_am" />
 		<set name="immediate_effect" val="1" />

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

@@ -2060,7 +2060,7 @@
 		<node X="131" Y="242444" />
 	</zone>
 	<!-- Stakato Nest Buff -->
-	<zone name="22_16_stakato_mob_buff" id="200103" type="EffectZone" shape="NPoly"	minZ="-6368" maxZ="-3296">
+	<zone name="22_16_stakato_mob_buff" id="200103" type="EffectZone" shape="NPoly" minZ="-6368" maxZ="-3296">
 		<stat name="skillIdLvl" val="6170-1;" /> <!-- s_area_stakato_nest_fury -->
 		<stat name="chance" val="100" />
 		<!-- stat name="unitTick" val="90" / -->
@@ -2073,7 +2073,7 @@
 		<node X="89999" Y="-41698" />
 		<node X="73982" Y="-41655" />
 	</zone>
-	<zone name="22_16_stakato_mob_buff_display" id="200104" type="EffectZone" shape="NPoly"  minZ="-6368" maxZ="-3296">
+	<zone name="22_16_stakato_mob_buff_display" id="200104" type="EffectZone" shape="NPoly" minZ="-6368" maxZ="-3296">
 		<stat name="skillIdLvl" val="6169-1;" /> <!-- s_area_stakato_nest_fury_for_pc -->
 		<stat name="chance" val="100" />
 		<!-- stat name="unitTick" val="90" / -->

L2J_DataPack_BETA/dist/game/data/zones/npcSpawnTerritories/npc_spawn_zone_test.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list enabled="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/zones.xsd">
 	<zone name="spawn_zone_test_01" type="NpcSpawnTerritory" shape="Cuboid" minZ="-3734" maxZ="-3689">
-			<node X="75552" Y="142899" />
-			<node X="76887" Y="144333" />
+		<node X="75552" Y="142899" />
+		<node X="76887" Y="144333" />
 	</zone>
 </list>

L2J_DataPack_BETA/dist/game/data/zones/npcSpawnTerritories/turek_orcs.xml

@@ -211,7 +211,7 @@
 		<node X="-93143" Y="111844" />
 		<node X="-93012" Y="112700" />
 		<node X="-93891" Y="113293" />
-		<node X="-94746" Y="112718" />		
+		<node X="-94746" Y="112718" />
 		<node X="-94560" Y="111746" />
 	</zone>
 	<!-- gludio15_1721_32s -->