From 052d3e60632d3d48ee0bb07f904950ede674ac6d Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Thu, 19 Aug 2021 13:23:38 -0400
Subject: fix several xml issues

---
 graphics/particles/manapearl.particle.xml     |  26 +-
 graphics/sprites/equipment/head/headmodel.xml | 386 +++++++++++++-------------
 graphics/sprites/monsters/pet-black-cat.xml   |   5 +-
 graphics/sprites/monsters/pet-cat.xml         | 104 ++++---
 4 files changed, 252 insertions(+), 269 deletions(-)

diff --git a/graphics/particles/manapearl.particle.xml b/graphics/particles/manapearl.particle.xml
index f285c89b..226f04d1 100644
--- a/graphics/particles/manapearl.particle.xml
+++ b/graphics/particles/manapearl.particle.xml
@@ -20,19 +20,19 @@
       <property name="bounce" value="1"/>
       <property name="image" value="graphics/particles/manapearl_4x4.png"/>
       <property name="follow-parent"/>
-		<emitter>
-			<property name="image" value="graphics/particles/star-small.png|W:#aaaaff,222222"/>
-			<property name="lifetime" value="80"/>
-			<property name="fade-in" value="10"/>
-			<property name="fade-out" value="70"/>
-			<property name="output" min="0" max="1"/>
-			<property name="output-pause" value="45"/>
-			<property name="power" min="0" max="2"/>
-			<property name="horizontal-angle" min="-15" max="-175"/>
-			<property name="momentum" value="0.95"/>
-			<property name="randomness" value="200"/>
-			<property name="vertical-angle" min="0" max="90"/>
-		</emitter>
+    </emitter>
+    <emitter>
+      <property name="image" value="graphics/particles/star-small.png|W:#aaaaff,222222"/>
+      <property name="lifetime" value="80"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="70"/>
+      <property name="output" min="0" max="1"/>
+      <property name="output-pause" value="45"/>
+      <property name="power" min="0" max="2"/>
+      <property name="horizontal-angle" min="-15" max="-175"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="200"/>
+      <property name="vertical-angle" min="0" max="90"/>
     </emitter>
   </particle>
 </effect>
diff --git a/graphics/sprites/equipment/head/headmodel.xml b/graphics/sprites/equipment/head/headmodel.xml
index 461cfb40..51b55fb1 100644
--- a/graphics/sprites/equipment/head/headmodel.xml
+++ b/graphics/sprites/equipment/head/headmodel.xml
@@ -2,204 +2,190 @@
 <!-- Author: Saulc
 Copyright (C) 2018 TMW2 -->
 <sprite>
-    <imageset name="base"
-              src="graphics/sprites/equipment/head/headmodel.png"
-              width="32"
-              height="64"/>
-
-    <action name="stand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-27"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-1" offsetY="-27"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-27"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="1" offsetY="-27"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-26" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-27" delay="160"/>
-            <frame index="0" offsetX="-1" offsetY="-26" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-27" delay="160"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-1" offsetY="-27" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-26" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-27" delay="160"/>
-            <frame index="1" offsetX="-1" offsetY="-26" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-27" delay="80"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-27" delay="80"/>
-            <frame index="2" offsetX="-1" offsetY="-28" delay="160"/>
-            <frame index="2" offsetX="-1" offsetY="-27" delay="80"/>
-            <frame index="2" offsetX="-1" offsetY="-28" delay="160"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="1" offsetY="-27" delay="80"/>
-            <frame index="3" offsetX="1" offsetY="-26" delay="80"/>
-            <frame index="3" offsetX="1" offsetY="-27" delay="160"/>
-            <frame index="3" offsetX="1" offsetY="-26" delay="80"/>
-            <frame index="3" offsetX="1" offsetY="-27" delay="80"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-26" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-23" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-22" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28" delay="80"/>
-            <frame index="1" offsetX="3" offsetY="-29" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-26" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-25" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-27" delay="240"/>
-            <frame index="2" offsetX="-2" offsetY="-25" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-28" delay="80"/>
-            <frame index="3" offsetX="-3" offsetY="-30" delay="80"/>
-            <frame index="3" offsetY="-26" delay="80"/>
-            <frame index="3" offsetY="-25" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_bow" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-26" delay="240"/>
-            <frame index="0" offsetX="-1" offsetY="-24" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-25" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="2" offsetY="-27" delay="240"/>
-            <frame index="1" offsetX="4" offsetY="-28" delay="160"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-27" delay="160"/>
-            <frame index="2" offsetX="-2" offsetY="-27" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-26" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-27" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-27" delay="240"/>
-            <frame index="3" offsetX="-5" offsetY="-28" delay="160"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-14"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-17"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-18"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-5" offsetY="-17"/>
-        </animation>
-    </action>
-
-    <action name="sittop" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-14"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-17"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-18"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-5" offsetY="-17"/>
-        </animation>
-    </action>
-
-    <action name="standride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-14"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-17"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-18"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-5" offsetY="-17"/>
-        </animation>
-    </action>
-
-    <action name="spawnride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-14"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-17"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-17"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-17"/>
-        </animation>
-    </action>
-
-    <action name="ride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-14"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-17"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-17"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-5" offsetY="-17"/>
-        </animation>
-    </action>
-
-    <action name="attackride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-14"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-17"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-18"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-5" offsetY="-17"/>
-        </animation>
-    </action>
-
-    <!-- FIXME -->
-    <action name="dead" imageset="base">
-        <animation direction="default">
-            <frame index="4" offsetX="13" offsetY="8"/>
-        </animation>
-    </action>
+  <imageset name="base" src="graphics/sprites/equipment/head/headmodel.png" width="32" height="64"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-27"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY="-27"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-27"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="1" offsetY="-27"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-26" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-27" delay="160"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-27" delay="160"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="-1" offsetY="-27" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-26" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-27" delay="160"/>
+      <frame index="1" offsetX="-1" offsetY="-26" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-27" delay="80"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-27" delay="80"/>
+      <frame index="2" offsetX="-1" offsetY="-28" delay="160"/>
+      <frame index="2" offsetX="-1" offsetY="-27" delay="80"/>
+      <frame index="2" offsetX="-1" offsetY="-28" delay="160"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="1" offsetY="-27" delay="80"/>
+      <frame index="3" offsetX="1" offsetY="-26" delay="80"/>
+      <frame index="3" offsetX="1" offsetY="-27" delay="160"/>
+      <frame index="3" offsetX="1" offsetY="-26" delay="80"/>
+      <frame index="3" offsetX="1" offsetY="-27" delay="80"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-25" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-23" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-22" delay="80"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-28" delay="80"/>
+      <frame index="1" offsetX="3" offsetY="-29" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-26" delay="80"/>
+      <frame index="1" offsetX="-1" offsetY="-25" delay="80"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY="-27" delay="240"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="80"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-28" delay="80"/>
+      <frame index="3" offsetX="-3" offsetY="-30" delay="80"/>
+      <frame index="3" offsetY="-26" delay="80"/>
+      <frame index="3" offsetY="-25" delay="80"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-26" delay="240"/>
+      <frame index="0" offsetX="-1" offsetY="-24" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-25" delay="80"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="2" offsetY="-27" delay="240"/>
+      <frame index="1" offsetX="4" offsetY="-28" delay="160"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY="-27" delay="160"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="80"/>
+      <frame index="2" offsetX="-2" offsetY="-26" delay="80"/>
+      <frame index="2" offsetX="-2" offsetY="-27" delay="80"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY="-27" delay="240"/>
+      <frame index="3" offsetX="-5" offsetY="-28" delay="160"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-14"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-17"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetY="-18"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY="-17"/>
+    </animation>
+  </action>
+  <action name="sittop" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-14"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-17"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetY="-18"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY="-17"/>
+    </animation>
+  </action>
+  <action name="standride" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-14"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-17"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetY="-18"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY="-17"/>
+    </animation>
+  </action>
+  <action name="spawnride" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-14"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-17"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetY="-17"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-7" offsetY="-17"/>
+    </animation>
+  </action>
+  <action name="ride" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-14"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-17"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetY="-17"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY="-17"/>
+    </animation>
+  </action>
+  <action name="attackride" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-14"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY="-17"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetY="-18"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-5" offsetY="-17"/>
+    </animation>
+  </action>
+  <!-- FIXME -->
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="13" offsetY="8"/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/monsters/pet-black-cat.xml b/graphics/sprites/monsters/pet-black-cat.xml
index 90d2c4f6..365d4409 100644
--- a/graphics/sprites/monsters/pet-black-cat.xml
+++ b/graphics/sprites/monsters/pet-black-cat.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/pet-black-cat.png" width="32" height="32" offsetX="32" />
-
-    <include file="monsters/pet-cat.xml"/>
+  <imageset name="base" src="graphics/sprites/monsters/pet-black-cat.png" width="32" height="32" offsetX="32"/>
+  <include file="monsters/pet-cat.xml"/>
 </sprite>
diff --git a/graphics/sprites/monsters/pet-cat.xml b/graphics/sprites/monsters/pet-cat.xml
index 21a15152..e1635b74 100644
--- a/graphics/sprites/monsters/pet-cat.xml
+++ b/graphics/sprites/monsters/pet-cat.xml
@@ -1,56 +1,54 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/pet-cat.png" width="32" height="32" offsetX="32" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-			<frame index="19" delay="25" offsetX="-30"/>
-		</animation>
-		<animation direction="left">
-			<frame index="22" delay="25" offsetX="-30"/>
-		</animation>
-		<animation direction="up">
-			<frame index="13" delay="25" offsetX="-30"/>
-		</animation>
-		<animation direction="right">
-			<frame index="16" delay="25" offsetX="-30"/>
-		</animation>
-	</action>
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<frame index="19" delay="150" offsetX="-30"/>
-			<end />
-		</animation>
-		<animation direction="left">
-			<frame index="22" delay="150" offsetX="-30"/>
-			<end />
-		</animation>
-		<animation direction="up">
-			<frame index="13" delay="150" offsetX="-30"/>
-			<end />
-		</animation>
-		<animation direction="right">
-			<frame index="16" delay="150" offsetX="-30"/>
-			<end />
-		</animation>
-	</action>
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="18" end="20" delay="150" offsetX="-30" /> 
-			<frame index="19" delay="150" offsetX="-30" /> 
-		</animation>
-		<animation direction="left">
-			<sequence start="21" end="23" delay="100" offsetX="-30" /> 
-			<frame index="22" delay="150" offsetX="-30" /> 
-		</animation>
-		<animation direction="up">
-			<sequence start="12" end="14" delay="100" offsetX="-30" /> 
-			<frame index="13" delay="150" offsetX="-30" /> 
-		</animation>
-		<animation direction="right">
-			<sequence start="15" end="17" delay="100" offsetX="-30" /> 
-			<frame index="16" delay="150" offsetX="-30" /> 
-		</animation>
-
-	</action>
+  <imageset name="base" src="graphics/sprites/monsters/pet-cat.png" width="32" height="32" offsetX="32"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="19" delay="25" offsetX="-30"/>
+    </animation>
+    <animation direction="left">
+      <frame index="22" delay="25" offsetX="-30"/>
+    </animation>
+    <animation direction="up">
+      <frame index="13" delay="25" offsetX="-30"/>
+    </animation>
+    <animation direction="right">
+      <frame index="16" delay="25" offsetX="-30"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="19" delay="150" offsetX="-30"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="22" delay="150" offsetX="-30"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="13" delay="150" offsetX="-30"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="16" delay="150" offsetX="-30"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="18" end="20" delay="150" offsetX="-30"/>
+      <frame index="19" delay="150" offsetX="-30"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="21" end="23" delay="100" offsetX="-30"/>
+      <frame index="22" delay="150" offsetX="-30"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="12" end="14" delay="100" offsetX="-30"/>
+      <frame index="13" delay="150" offsetX="-30"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="15" end="17" delay="100" offsetX="-30"/>
+      <frame index="16" delay="150" offsetX="-30"/>
+    </animation>
+  </action>
 </sprite>
-- 
cgit v1.2.3-60-g2f50