Remove ea-skills.xml

3 files changed, 17 insertions, 38 deletions

diff --git a/ea-skills.xml b/ea-skills.xml
deleted file mode 100644
index 9aed32ee..00000000
--- a/ea-skills.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2011 The Mana World Development Team -->
-<!-- The ea-skills.xml file is used by old ManaPlus versions.
-    For now should be same with skills.xml
-    See documentation: http://manaplus.org/skills.xml
--->
-<skills>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//set/@name" translate="yes"/>
-    <its:translateRule selector="//set/skill/@name" translate="yes"/>
-    <its:translateRule selector="//set/skill/@description" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
-  <set name="Basic">
-    <skill id="1" name="Emote" icon="graphics/skills/basic/emote.png"/>
-    <skill id="2" name="Trade" icon="graphics/skills/basic/trade.png"/>
-    <skill id="3" name="Party" icon="graphics/skills/basic/party.png"/>
-  </set>
-  <set name="Magic">
-    <skill id="340" name="Magic" icon="graphics/skills/magic/basic.png"/>
-    <skill id="341" name="Life Magic" icon="graphics/skills/magic/life.png"/>
-    <skill id="342" name="War Magic" icon="graphics/skills/magic/war.png"/>
-    <skill id="343" name="Transmutation Magic" icon="graphics/skills/magic/transmutation.png"/>
-    <skill id="344" name="Nature Magic" icon="graphics/skills/magic/nature.png"/>
-    <skill id="345" name="Astral Magic" icon="graphics/skills/magic/astral.png"/>
-    <skill id="346" name="Dark Magic" icon="graphics/skills/magic/dark.png"/>
-  </set>
-  <set name="Focus">
-    <skill id="339" name="Focusing" icon="graphics/skills/focus/focus.png"/>
-    <skill id="45" name="Mallards Eye" icon="graphics/skills/focus/mallardseye.png"/>
-    <skill id="350" name="Brawling" icon="graphics/skills/focus/brawling.png"/>
-    <skill id="351" name="Lucky Counter" icon="graphics/skills/unknown.png"/>
-    <skill id="352" name="Speed" icon="graphics/skills/focus/speed.png"/>
-    <skill id="353" name="Resist Poison" icon="graphics/skills/focus/resistpoison.png"/>
-    <skill id="354" name="Astral Soul" icon="graphics/skills/focus/astralsoul.png"/>
-    <skill id="355" name="Raging" icon="graphics/skills/focus/raging.png"/>
-  </set>
-</skills>
diff --git a/paths.xml b/paths.xml
index d037d4b6..0317a270 100644
--- a/paths.xml
+++ b/paths.xml
@@ -49,4 +49,15 @@ Also, don't forget to add the '/' path separator at the end of folder values.
   <option name="music" value="music/"/>
   <option name="wallpapers" value="graphics/images/"/>
   <option name="wallpaperFile" value="login_wallpaper.png"/>
+  <!--
+    ManaPlus tries to load skillsFile first, then skillsFile2 if it failed.
+    In old versions, ea-skills.xml before skills.xml, now it is swapped.
+    This config setting makes any version of ManaPlus DTRT.
+
+    It can be removed once ea-skills.xml is not in zips
+    or min ManaPlus version is bumped to v1.4.1.18 (which is also the
+    first version that supports <include> in all files)
+    ... or would it be better to specify all the files?
+  -->
+  <option name="skillsFile" value="skills.xml"/>
 </configuration>
diff --git a/skills.xml b/skills.xml
index 3f4966fb..92b7f18d 100644
--- a/skills.xml
+++ b/skills.xml
@@ -2,6 +2,12 @@
 <!-- Copyright 2011 The Mana World Development Team -->
 <!-- See documentation at: http://manaplus.org/skills.xml -->
 <skills>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//set/@name" translate="yes"/>
+    <its:translateRule selector="//set/skill/@name" translate="yes"/>
+    <its:translateRule selector="//set/skill/@description" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
   <set name="Basic">
     <skill id="1" name="Emote" icon="graphics/skills/basic/emote.png"/>
     <skill id="2" name="Trade" icon="graphics/skills/basic/trade.png"/>