Try this new skill ordering

1 files changed, 126 insertions, 122 deletions

diff --git a/skills.xml b/skills.xml
index b8d24f0a..76a3a7e3 100644
--- a/skills.xml
+++ b/skills.xml
@@ -34,18 +34,6 @@ Copyright (C) 2018 TMW2 -->
 			description="Craft equipment with special bonuses"
 		/>
 		<skill
-			id="20034"
-			name="Read Ancient Languages"
-			icon="graphics/skills/none.png"
-			description="Read stuff in long forgotten languages."
-		/>
-		<skill
-			id="20035"
-			name="Speech"
-			icon="graphics/skills/none.png"
-			description="Work in progress, involving charisma."
-		/>
-		<skill
 			id="20002"
 			name="Super Menu"
 			icon="graphics/skills/none.png"
@@ -53,12 +41,6 @@ Copyright (C) 2018 TMW2 -->
 			invokeCmd="@super"
 		/>
 		<skill
-			id="20010"
-			name="Special Class Membership"
-			icon="graphics/skills/warrior.png"
-			description="Grants you additional Magic Skill Points."
-		/>
-		<skill
 			id="20050"
 			name="First Aid"
 			icon="graphics/skills/first_aid.png"
@@ -104,15 +86,6 @@ Copyright (C) 2018 TMW2 -->
 			castingSrcEffectId="23"
 		/>
 		<skill
-			id="22"
-			name="Divine Protection"
-			icon="graphics/skills/wizard/potion.png"
-			description="Jesus' blessing, extra defense against unholy things."
-			castingAnimation="emote.xml"
-			castingSrcEffectId="23"
-			dstEffectId="701"
-		/>
-		<skill
 			id="334"
 			name="Marriage Life force"
 			icon="graphics/skills/none.png"
@@ -131,25 +104,6 @@ Copyright (C) 2018 TMW2 -->
 			dstEffectId="703"
 		/>
 		<skill
-			id="681"
-			name="Backpack Float"
-			icon="graphics/skills/none.png"
-			description="Increase maximum weight."
-		/>
-		<skill
-			id="36"
-			name="Backpack Float 2"
-			icon="graphics/skills/none.png"
-			description="FIXME: Increase maximum weight."
-		/>
-		<!-- TODO status.c:3009 allow guns -->
-		<skill
-			id="44"
-			name="Archers Eye"
-			icon="graphics/skills/none.png"
-			description="Raise range and Chance to Hit on bows (incl. skills)."
-		/>
-		<skill
 			id="50"
 			name="Stealing"
 			icon="graphics/skills/none.png"
@@ -159,18 +113,6 @@ Copyright (C) 2018 TMW2 -->
 		/>
 
 		<skill
-			id="37"
-			name="Discount"
-			icon="graphics/skills/none.png"
-			description="Discount when purchasing: 5% + 2% per skill level"
-		/>
-		<skill
-			id="38"
-			name="Barter"
-			icon="graphics/skills/none.png"
-			description="Sell items for more money: 5% + 2% per skill level"
-		/>
-		<skill
 			id="20022"
 			name="Mana Conversion"
 			icon="graphics/skills/emote.png"
@@ -271,6 +213,77 @@ Copyright (C) 2018 TMW2 -->
 			icon="graphics/skills/transmutation.png"
 			description="MP + -5/lv. Transmute stuff into other stuff."
 		/>
+		<!-- Passive skills -->
+		<skill
+			id="37"
+			name="Discount"
+			icon="graphics/skills/none.png"
+			description="Discount when purchasing: 5% + 2% per skill level"
+		/>
+		<skill
+			id="38"
+			name="Barter"
+			icon="graphics/skills/none.png"
+			description="Sell items for more money: 5% + 2% per skill level"
+		/>
+		<skill
+			id="681"
+			name="Backpack Float"
+			icon="graphics/skills/none.png"
+			description="Increase maximum weight."
+		/>
+		<skill
+			id="36"
+			name="Backpack Float 2"
+			icon="graphics/skills/none.png"
+			description="FIXME: Increase maximum weight."
+		/>
+		<!-- TODO status.c:3009 allow guns -->
+		<skill
+			id="44"
+			name="Archers Eye"
+			icon="graphics/skills/none.png"
+			description="Raise range and Chance to Hit on bows (incl. skills)."
+		/>
+		<skill
+			id="20034"
+			name="Read Ancient Languages"
+			icon="graphics/skills/none.png"
+			description="Read stuff in long forgotten languages."
+		/>
+		<skill
+			id="20035"
+			name="Speech"
+			icon="graphics/skills/none.png"
+			description="Learn more while listening to Professor."
+		/>
+		<skill
+			id="20010"
+			name="Special Class Membership"
+			icon="graphics/skills/warrior.png"
+			description="Grants you additional Magic Skill Points."
+		/>
+		<skill
+			id="284"
+			name="Dragon Slayer"
+			icon="graphics/skills/wizard/dragon.png"
+			description="Raises attack and defense while fighting dragons. Raise int."
+		/>
+		<skill
+			id="20026"
+			name="Mana Wisdom"
+			icon="graphics/skills/wizard/manaexp.png"
+			description="Increases Mana Experience Gain."
+		/>
+		<skill
+			id="22"
+			name="Divine Protection"
+			icon="graphics/skills/wizard/potion.png"
+			description="Jesus' blessing, extra defense against unholy things."
+			castingAnimation="emote.xml"
+			castingSrcEffectId="23"
+			dstEffectId="701"
+		/>
 
 	</set>
 	<set name="Physical">
@@ -310,6 +323,13 @@ Copyright (C) 2018 TMW2 -->
 			castingSrcEffectId="23"
 		/>
 		<skill
+			id="382"
+			name="Sharpshooter"
+			icon="graphics/skills/other/sharpshooter.png"
+			castingMissile-particle="graphics/particles/critical.xml"
+			description="Focus and do a magical shoot which multihits."
+		/>
+		<skill
 			id="406"
 			name="Ground Strike"
 			icon="graphics/skills/none.png"
@@ -431,15 +451,39 @@ Copyright (C) 2018 TMW2 -->
 			description="You are a member from the Wizard Mage Class."
 		/>
 		-->
+		<!-- Misc -->
 		<skill
-			id="20059"
-			name="Magic Strike"
+			id="366"
+			name="Accumulate Power"
 			icon="graphics/skills/none.png"
-			description="Standard Wind Magic Attack"
+			description="Sightly increase next magical attack power."
+			castingSrcEffectId="700"
+		/>
+		<skill
+			id="18"
+			name="Nature Wall"
+			icon="graphics/skills/none.png"
+			description="Creates several short-lived pikpiks to push back and attack enemies."
 			castingSrcEffectId="23"
-			dstEffectId="702"
 		/>
 		<skill
+			id="2443"
+			name="Fire Walk"
+			icon="graphics/skills/none.png"
+			description="Pursuers will burn their feet, o admirable one."
+			castingSrcEffectId="23"
+		/>
+		<skill
+			id="383"
+			name="Wind Walk"
+			icon="graphics/skills/none.png"
+			description="Makes you walk faster"
+			castingSrcEffectId="23"
+			dstEffectId="701"
+		/>
+
+		<!-- Priest -->
+		<skill
 			id="20051"
 			name="Healing"
 			icon="graphics/skills/first_aid.png"
@@ -461,42 +505,6 @@ Copyright (C) 2018 TMW2 -->
 			castingSrcEffectId="23"
 			dstEffectId="703"
 		/>
-		<skill
-			id="18"
-			name="Nature Wall"
-			icon="graphics/skills/none.png"
-			description="Creates several short-lived pikpiks to push back and attack enemies."
-			castingSrcEffectId="23"
-		/>
-		<skill
-			id="2443"
-			name="Fire Walk"
-			icon="graphics/skills/none.png"
-			description="Pursuers will burn their feet, o admirable one."
-			castingSrcEffectId="23"
-		/>
-		<skill
-			id="382"
-			name="Sharpshooter"
-			icon="graphics/skills/other/sharpshooter.png"
-			castingMissile-particle="graphics/particles/critical.xml"
-			description="Focus and do a magical shoot which multihits."
-		/>
-		<skill
-			id="366"
-			name="Accumulate Power"
-			icon="graphics/skills/none.png"
-			description="Sightly increase next magical attack power."
-			castingSrcEffectId="700"
-		/>
-		<skill
-			id="383"
-			name="Wind Walk"
-			icon="graphics/skills/none.png"
-			description="Makes you walk faster"
-			castingSrcEffectId="23"
-			dstEffectId="701"
-		/>
 
 		<!-- Sage -->
 		<skill
@@ -512,18 +520,8 @@ Copyright (C) 2018 TMW2 -->
 			description="Raises damage reduction but eats MP."
 			castingSrcEffectId="23"
 		/>
-		<skill
-			id="284"
-			name="Dragon Slayer"
-			icon="graphics/skills/wizard/dragon.png"
-			description="Raises attack and defense while fighting dragons. Raise int."
-		/>
-		<skill
-			id="20026"
-			name="Mana Wisdom"
-			icon="graphics/skills/wizard/manaexp.png"
-			description="Increases Mana Experience Gain."
-		/>
+
+		<!-- Weapon Improvement -->
 		<skill
 			id="280"
 			name="Fire Weapon"
@@ -573,11 +571,10 @@ Copyright (C) 2018 TMW2 -->
 			dstEffectId="702"
 		/>
 		<skill
-			id="20060"
-			name="Lightning Bolt"
-			icon="graphics/skills/wizard/thunderbolt.png"
-			description="Standard Wind Attack."
-			castingMissile-particle="graphics/particles/lightning-lunovox.xml"
+			id="20059"
+			name="Magic Strike"
+			icon="graphics/skills/none.png"
+			description="Standard Wind Magic Attack"
 			castingSrcEffectId="23"
 			dstEffectId="702"
 		/>
@@ -617,11 +614,11 @@ Copyright (C) 2018 TMW2 -->
 			dstEffectId="702"
 		/>
 		<skill
-			id="20061"
-			name="Tempest Storm"
+			id="20060"
+			name="Lightning Bolt"
 			icon="graphics/skills/wizard/thunderbolt.png"
-			description="AoE Wind Attack."
-			castingMissile-particle="graphics/particles/misc.thunderbolt.xml"
+			description="Standard Wind Attack."
+			castingMissile-particle="graphics/particles/lightning-lunovox.xml"
 			castingSrcEffectId="23"
 			dstEffectId="702"
 		/>
@@ -663,6 +660,15 @@ Copyright (C) 2018 TMW2 -->
 			dstEffectId="701"
 		/>
 		<skill
+			id="20061"
+			name="Tempest Storm"
+			icon="graphics/skills/wizard/thunderbolt.png"
+			description="AoE Wind Attack."
+			castingMissile-particle="graphics/particles/misc.thunderbolt.xml"
+			castingSrcEffectId="23"
+			dstEffectId="702"
+		/>
+		<skill
 			id="20064"
 			name="Gaia Break"
 			icon="graphics/skills/wizard/earthspike.png"
@@ -680,7 +686,7 @@ Copyright (C) 2018 TMW2 -->
 			dstEffectId="701"
 		/>
 
-		<!-- Priest -->
+		<!-- NYI -->
 		<skill
 			id="2051"
 			name="Luma"
@@ -692,8 +698,6 @@ Copyright (C) 2018 TMW2 -->
 			castingSrcEffectId="23"
 			dstEffectId="703"
 		/>
-
-		<!-- NYI -->
 		<skill
 			id="20001"
 			name="Magic shield"