From cb336f1a0dc5beb2a2a2961467397782641fecbd Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Sun, 28 Jan 2018 13:45:23 -0500
Subject: fix xml errors

---
 badges.xml                                  |  1 -
 elementals.xml                              |  1 -
 equipmentslots.xml                          | 14 ---------
 graphics/badges/guilds/crc.xml              |  2 +-
 graphics/badges/guilds/phoenixcouncil.xml   |  2 +-
 groups.xml                                  |  3 +-
 homunculuses.xml                            |  1 -
 horses.xml                                  |  1 -
 itemoptions.xml                             |  1 -
 items/equip-head/item5203_MoonshroomHat.xml |  2 +-
 languages.xml                               |  1 -
 maps.xml                                    |  4 +--
 mercenaries.xml                             |  1 -
 mods.xml                                    |  1 -
 network.xml                                 |  1 -
 npcdialogs.xml                              |  1 -
 pets.xml                                    |  1 -
 skillunits.xml                              |  1 -
 sounds.xml                                  |  1 -
 stats.xml                                   | 47 +++++++++++------------------
 texts.xml                                   |  1 -
 21 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/badges.xml b/badges.xml
index b520e6e1..75a3043d 100644
--- a/badges.xml
+++ b/badges.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2013 Evol Online -->
-
 <badges>
   <party>
     <!-- we don't want party badges anymore -->
diff --git a/elementals.xml b/elementals.xml
index d82536b6..e7d1dfd2 100644
--- a/elementals.xml
+++ b/elementals.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2016 Evol Online -->
-
 <elementals>
 </elementals>
diff --git a/equipmentslots.xml b/equipmentslots.xml
index b080855b..1d31fec2 100644
--- a/equipmentslots.xml
+++ b/equipmentslots.xml
@@ -1,65 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2017 The Mana World -->
-
 <equipmentslots>
   <slot name="topclothes" slot="0"/>
   <slot name="top" slot="0"/>
   <slot name="torso" slot="0"/>
   <slot name="body" slot="0"/>
   <slot name="slot0" slot="0"/>
-
   <slot name="glove" slot="1"/>
   <slot name="gloves" slot="1"/>
   <slot name="slot1" slot="1"/>
-
   <slot name="hat" slot="2"/>
   <slot name="hats" slot="2"/>
   <slot name="slot2" slot="2"/>
-
   <slot name="bottomclothes" slot="3"/>
   <slot name="bottom" slot="3"/>
   <slot name="pants" slot="3"/>
   <slot name="slot3" slot="3"/>
-
   <slot name="shoes" slot="4"/>
   <slot name="boot" slot="4"/>
   <slot name="boots" slot="4"/>
   <slot name="slot4" slot="4"/>
-
   <slot name="misc1" slot="5"/>
   <slot name="cape" slot="5"/>
   <slot name="slot5" slot="5"/>
-
   <slot name="wings" slot="6"/>
   <slot name="slot6" slot="6"/>
-
   <slot name="misc2" slot="7"/>
   <slot name="scarf" slot="7"/>
   <slot name="scarfs" slot="7"/>
   <slot name="slot7" slot="7"/>
-
   <slot name="weapon" slot="8"/>
   <slot name="weapons" slot="8"/>
   <slot name="slot8" slot="8"/>
-
   <slot name="shield" slot="9"/>
   <slot name="shields" slot="9"/>
   <slot name="slot9" slot="9"/>
-
   <slot name="arrow" slot="10"/>
   <slot name="arrows" slot="10"/>
   <slot name="ammo" slot="10"/>
   <slot name="slot10" slot="10"/>
-
   <slot name="amulet" slot="11"/>
   <slot name="amulets" slot="11"/>
   <slot name="slot11" slot="11"/>
-
   <slot name="ring" slot="12"/>
   <slot name="rings" slot="12"/>
   <slot name="slot12" slot="12"/>
-
   <slot name="slot13" slot="13"/>
   <slot name="slot14" slot="14"/>
   <slot name="slot15" slot="15"/>
diff --git a/graphics/badges/guilds/crc.xml b/graphics/badges/guilds/crc.xml
index 964567a1..5bb1fb83 100644
--- a/graphics/badges/guilds/crc.xml
+++ b/graphics/badges/guilds/crc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Micksha -->
 <sprite>
   <imageset name="icon" src="graphics/badges/guilds/crc.png" width="16" height="16" offsetY="0"/>
diff --git a/graphics/badges/guilds/phoenixcouncil.xml b/graphics/badges/guilds/phoenixcouncil.xml
index b140d916..a4b9154c 100644
--- a/graphics/badges/guilds/phoenixcouncil.xml
+++ b/graphics/badges/guilds/phoenixcouncil.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2015 ManaPlus developers -->
 <sprite>
diff --git a/groups.xml b/groups.xml
index d5f72606..89546c0e 100644
--- a/groups.xml
+++ b/groups.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2017 Evol Online -->
-
 <groups>
   <group id="0"/>
   <group id="1" name="Bot" longName="Bot"/>
diff --git a/homunculuses.xml b/homunculuses.xml
index 910ccb5f..0b18882c 100644
--- a/homunculuses.xml
+++ b/homunculuses.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2016 Evol Online -->
-
 <homunculuses>
 </homunculuses>
diff --git a/horses.xml b/horses.xml
index c4425471..1777f5fb 100644
--- a/horses.xml
+++ b/horses.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2016 Evol Online -->
-
 <horses>
 </horses>
diff --git a/itemoptions.xml b/itemoptions.xml
index 6e3f7860..c416d3b4 100644
--- a/itemoptions.xml
+++ b/itemoptions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors: 4144
 Copyright (C) 2017 Evol Online -->
-
 <itemoptions>
 </itemoptions>
diff --git a/items/equip-head/item5203_MoonshroomHat.xml b/items/equip-head/item5203_MoonshroomHat.xml
index 8258ee47..bd544e23 100644
--- a/items/equip-head/item5203_MoonshroomHat.xml
+++ b/items/equip-head/item5203_MoonshroomHat.xml
@@ -6,7 +6,7 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="5203" image="equipment/head/moonshroomhat.png" name="Moonshroom Hat" description="" type="equip-head" defense="15" matk="5" weight="30" sellProtected="true">
+  <item id="5203" image="equipment/head/moonshroomhat.png" name="Moonshroom Hat" description="" type="equip-head" defense="15" mattack="5" weight="30" sellProtected="true">
     <sprite gender="unisex">equipment/head/moonshroomhat.xml</sprite>
     <sprite gender="female">equipment/head/moonshroomhat-female.xml</sprite>
     <replace sprite="hair">
diff --git a/languages.xml b/languages.xml
index b2c64ec6..64e2b0ec 100644
--- a/languages.xml
+++ b/languages.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2017 Evol Online -->
-
 <languages>
 </languages>
diff --git a/maps.xml b/maps.xml
index 2960dd18..8a44690b 100644
--- a/maps.xml
+++ b/maps.xml
@@ -657,7 +657,7 @@
     <file name="graphics/tiles/woodland_village_x2.png"/>
   </atlas>
   <atlas name="ignored">
-      <file name="graphics/tiles/collision.png"/>
-      <file name="graphics/tiles/arrows.png"/>
+    <file name="graphics/tiles/collision.png"/>
+    <file name="graphics/tiles/arrows.png"/>
   </atlas>
 </maps>
diff --git a/mercenaries.xml b/mercenaries.xml
index 7c12d8e3..aba80a8a 100644
--- a/mercenaries.xml
+++ b/mercenaries.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2016 Evol Online -->
-
 <mercenaries>
 </mercenaries>
diff --git a/mods.xml b/mods.xml
index 130dc432..b0847105 100644
--- a/mods.xml
+++ b/mods.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors: 4144
 Copyright (C) 2017 Evol Online -->
-
 <mods>
 </mods>
diff --git a/network.xml b/network.xml
index 8f0a2708..eabeaea6 100644
--- a/network.xml
+++ b/network.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2016 Evol Online -->
-
 <network>
   <inpackets>
   </inpackets>
diff --git a/npcdialogs.xml b/npcdialogs.xml
index 35cdbbe7..30680fc3 100644
--- a/npcdialogs.xml
+++ b/npcdialogs.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2016 Evol Online -->
-
 <dialogs>
 </dialogs>
diff --git a/pets.xml b/pets.xml
index f8f42800..0e5bdcba 100644
--- a/pets.xml
+++ b/pets.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2013 Evol Online -->
-
 <pets>
 </pets>
diff --git a/skillunits.xml b/skillunits.xml
index 579f5e4f..89b8d9a3 100644
--- a/skillunits.xml
+++ b/skillunits.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2015 Evol Online -->
-
 <skillunits>
 </skillunits>
diff --git a/sounds.xml b/sounds.xml
index d65bf658..3273639f 100644
--- a/sounds.xml
+++ b/sounds.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors: 4144, Reid
 Copyright (C) 2013 Evol Online -->
-
 <sounds>
 </sounds>
diff --git a/stats.xml b/stats.xml
index c8cdc3cd..0262e8b9 100644
--- a/stats.xml
+++ b/stats.xml
@@ -1,37 +1,26 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2016 Evol Online -->
 <stats>
   <basic>
-    <stat id="13" tag="str" name="Strength"/>
-    <stat id="14" tag="agi" name="Agility"/>
-    <stat id="15" tag="vit" name="Vitality"/>
-    <stat id="16" tag="int" name="Intelligence"/>
-    <stat id="17" tag="dex" name="Dexterity"/>
-    <stat id="18" tag="luk" name="Luck"/>
+    <stat id="13" tag="str" attr="PLAYER_STR" name="Strength"/>
+    <stat id="14" tag="agi" attr="PLAYER_AGI" name="Agility"/>
+    <stat id="15" tag="vit" attr="PLAYER_VIT" name="Vitality"/>
+    <stat id="16" tag="int" attr="PLAYER_INT" name="Intelligence"/>
+    <stat id="17" tag="dex" attr="PLAYER_DEX" name="Dexterity"/>
+    <stat id="18" tag="luk" attr="PLAYER_LUK" name="Luck"/>
   </basic>
   <extended>
-    <!-- ATK -->
-    <stat id="112" name="Attack"/>
-    <!-- DEF -->
-    <stat id="111" name="Defense"/>
-    <!-- MATK -->
-    <stat id="110" name="M.Attack"/>
-    <!-- MDEF -->
-    <stat id="109" name="M.Defense"/>
-    <!-- HIT -->
-    <stat id="108" name="% Accuracy"/>
-    <!-- FLEE -->
-    <stat id="107" name="% Evade"/>
-    <!-- CRIT -->
-    <stat id="106" name="% Critical"/>
-    <!-- ATTACK_DELAY -->
-    <stat id="100" name="Attack Delay"/>
-    <!-- WALK_SPEED -->
-    <stat id="102" name="Walk Delay"/>
-    <!-- ATTACK_RANGE -->
-    <stat id="101" name="Attack Range"/>
-    <!-- ATTACK_SPEED -->
-    <stat id="103" name="Damage per sec."/>
+    <stat id="112" attr="PLAYER_ATK" name="Attack"/>
+    <stat id="111" attr="PLAYER_DEF" name="Defense"/>
+    <stat id="110" attr="PLAYER_MATK" name="M.Attack"/>
+    <stat id="109" attr="PLAYER_MDEF" name="M.Defense"/>
+    <stat id="108" attr="PLAYER_HIT" name="% Accuracy"/>
+    <stat id="107" attr="PLAYER_FLEE" name="% Evade"/>
+    <stat id="106" attr="PLAYER_CRIT" name="% Critical"/>
+    <stat id="100" attr="PLAYER_ATTACK_DELAY" name="Attack Delay"/>
+    <stat id="102" attr="PLAYER_WALK_SPEED" name="Walk Delay"/>
+    <stat id="101" attr="PLAYER_ATTACK_RANGE" name="Attack Range"/>
+    <stat id="103" attr="PLAYER_ATTACK_SPEED" name="Damage per sec."/>
   </extended>
 </stats>
diff --git a/texts.xml b/texts.xml
index fd754221..10219ed5 100644
--- a/texts.xml
+++ b/texts.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: 4144
 Copyright (C) 2017 Evol Online -->
-
 <texts>
 </texts>
-- 
cgit v1.2.3-60-g2f50