Add XSD/indent checking

8 files changed, 46 insertions, 98 deletions

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..07a8042d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+notifications:
+  email:
+    on_success: changed
+    on_failure: always
+  irc:
+    channels:   "chat.freenode.net#themanaworld-dev"
+    on_success: always
+    on_failure: always
+    use_notice: true
+
+install:
+  - pushd ..
+  - git clone --depth 1 git://github.com/themanaworld/tmw-tools.git tools
+  - popd
+
+script:
+  - make check
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..2a66f887
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,25 @@
+# for pipefail
+SHELL=/bin/bash
+.SECONDARY:
+.DELETE_ON_ERROR:
+
+check:
+	git diff --exit-code
+
+XMLS = $(shell find -type f -name '*.xml')
+check: check-xml
+check-xml: $(patsubst %.xml,%.xml.ok,${XMLS})
+	find -name '*.xml.ok' -delete
+	find -name '*.xml.out' -delete
+%.xml.ok: %.xml %.xml.out
+	diff $^
+	touch $@
+%.xml.out: %.xml
+	set -e -o pipefail; \
+	xmllint --format --schema tools/tmw.xsd $< 2>&1 > $@ | grep -v 'Skipping import of schema'
+
+check: xsd
+xsd:
+	xmllint --format --schema tools/dl/XMLSchema.xsd tools/tmw.xsd > tmw-formatted.xsd
+	diff tools/tmw.xsd tmw-formatted.xsd
+	rm tmw-formatted.xsd
diff --git a/graphics/particles/crit.particle.xml b/graphics/particles/crit.particle.xml
index f28cddb6..7f534477 100644
--- a/graphics/particles/crit.particle.xml
+++ b/graphics/particles/crit.particle.xml
@@ -21,7 +21,7 @@ An explosion of white particles.
       <property name="position-x" min="-8" max="8"/>
       <property name="position-y" min="-8" max="8"/>
       <property name="vertical-angle" min="70" max="90"/>
-      <property name="horizontal-angle" min="" max="360"/>
+      <property name="horizontal-angle" min="0" max="360"/>
       <property name="power" min="1" max="4"/>
       <property name="bounce" value="0.75"/>
       <property name="gravity" value="0.1"/>
diff --git a/graphics/sprites/model/male.xml b/graphics/sprites/model/male.xml
index 36674ad3..7102f600 100644
--- a/graphics/sprites/model/male.xml
+++ b/graphics/sprites/model/male.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sprite name="player" aciton="stand" variants="135" variant_offset="1">
+<sprite name="player" action="stand" variants="135" variant_offset="1">
   <imageset name="base" src="graphics/sprites/model/male.png|W;B;R" width="64" height="64"/>
   <action name="default" imageset="base"/>
   <action name="stand" imageset="base">
diff --git a/graphics/sprites/monsters/skeleton.xml b/graphics/sprites/monsters/skeleton.xml
index 4220a551..b047cf01 100644
--- a/graphics/sprites/monsters/skeleton.xml
+++ b/graphics/sprites/monsters/skeleton.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sprite aciton="stand" variants="72" variant_offset="1">
+<sprite action="stand" variants="72" variant_offset="1">
   <imageset name="base" src="graphics/sprites/monsters/skeleton.png|W" width="64" height="64"/>
   <include file="model/male.xml"/>
 </sprite>
diff --git a/graphics/sprites/monsters/zombie.xml b/graphics/sprites/monsters/zombie.xml
index 8ccd4672..19738d82 100644
--- a/graphics/sprites/monsters/zombie.xml
+++ b/graphics/sprites/monsters/zombie.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sprite aciton="stand" variants="56" variant_offset="1">
+<sprite action="stand" variants="56" variant_offset="1">
   <imageset name="base" src="graphics/sprites/monsters/zombie.png" width="64" height="64"/>
   <action name="stand" imageset="base">
     <animation direction="down">
diff --git a/items.xsd b/items.xsd
deleted file mode 100644
index 2fb6b667..00000000
--- a/items.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <!-- IMAGE TYPE -->
-
-  <xsd:simpleType name="mw_ItemArtType">
-    <xsd:restriction base="xsd:integer">
-      <xsd:minInclusive value="0" />
-      <xsd:maxInclusive value="1" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- ITEMS LIST FILE SCHEMA -->
-
-  <xsd:element name="items">
-    <xsd:complexType>
-      <xsd:sequence>
-
-        <xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
-          <xsd:complexType>
-            <xsd:simpleContent>
-              <xsd:extension base="xsd:string">
-                <xsd:attribute name="name" type="xsd:string" />
-                <xsd:attribute name="description" type="xsd:string" />
-                <xsd:attribute name="effect" type="xsd:string" />
-                <xsd:attribute name="id" type="xsd:positiveInteger" />
-                <xsd:attribute name="image" type="xsd:positiveInteger" />
-                <xsd:attribute name="art" type="mw_ItemArtType" />
-                <xsd:attribute name="type" type="xsd:integer" />
-                <xsd:attribute name="slot" type="xsd:integer" />
-                <xsd:attribute name="weight" type="xsd:positiveInteger" />
-              </xsd:extension>
-            </xsd:simpleContent>
-          </xsd:complexType>
-        </xsd:element>
-
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-</xsd:schema>
diff --git a/items.xsl b/items.xsl
deleted file mode 100644
index acf9e7d8..00000000
--- a/items.xsl
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!-- Edited by XMLSpy® -->
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method='html' version='1.0' encoding='UTF-8' indent='yes'/>
-
-
-<xsl:variable name="icon-dir">graphics/items</xsl:variable>
-
-<xsl:template match="/">
-  <html>
-  <body>
-  <h2>Item Database</h2>
-      <xsl:for-each select="items/item">
-      <xsl:sort select="@type"/>
-        <xsl:if test="@name">
-          
-          <p>
-          <table border="1">
-          <tr bgcolor="ddddff">
-            <td>
-              <xsl:if test="@image">
-              <img src="{$icon-dir}/{@image}"/>
-              </xsl:if>
-            </td>
-            <td colspan="3">
-              <xsl:value-of select="@name"/>
-            </td>
-          </tr>
-          
-          <tr>
-            <td><strong>ID: </strong><xsl:value-of select="@id"/></td>
-            <td><strong>Type: </strong><xsl:value-of select="@type"/></td>
-            <xsl:if test="@weapon_type">
-              <td><strong>Skill: </strong><xsl:value-of select="@weapon-type"/></td>
-            </xsl:if>
-            <td><strong>Weight: </strong><xsl:value-of select="@weight"/></td>          
-          </tr>
-          
-          <tr>
-            <td colspan="4"><strong>Description: </strong><xsl:value-of select="@description"/></td>
-          </tr>
-          <tr>
-            <td colspan="4"><strong>Effect: </strong><xsl:value-of select="@effect"/></td>
-          </tr>
-          </table>
-          </p>
-        </xsl:if>
-      </xsl:for-each>
-  </body>
-  </html>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file