Some schema updates

- Store timers as a type instead of an element in the common schema
- Fix errors in terrain and monster schemas

rsrc/schemas/common.xsd

@@ -16,13 +16,11 @@
 		<xs:attribute name="x" use="required" type="xs:integer"/>
 		<xs:attribute name="y" use="required" type="xs:integer"/>
 	</xs:attributeGroup>
-	<xs:element name="timer">
-		<xs:complexType>
-			<xs:simpleContent>
-				<xs:extension base="xs:integer">
-					<xs:attribute name="freq" type="xs:integer" use="required"/>
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-	</xs:element>
+	<xs:complexType name="timer">
+		<xs:simpleContent>
+			<xs:extension base="xs:integer">
+				<xs:attribute name="freq" type="xs:integer" use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 </xs:schema>

rsrc/schemas/monsters.xsd

@@ -193,7 +193,7 @@
 	</xs:element>
 	<xs:element name="summon">
 		<xs:complexType>
-			<xs:all>
+			<xs:sequence>
 				<xs:choice minOccurs="1" maxOccurs="1">
 					<xs:element name="type" type="xs:integer"/>
 					<xs:element name="lvl" type="xs:integer"/>
@@ -203,7 +203,7 @@
 				<xs:element name="max" type="xs:integer"/>
 				<xs:element name="duration" type="xs:integer"/>
 				<xs:element name="chance" type="permille"/>
-			</xs:all>
+			</xs:sequence>
 			<xs:attribute name="type" use="required">
 				<xs:simpleType>
 					<xs:restriction base="xs:string">

rsrc/schemas/scenario.xsd

@@ -264,7 +264,7 @@
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
-				<xs:element ref="timer" minOccurs="0" maxOccurs="20"/>
+				<xs:element name="timer" type="timer" minOccurs="0" maxOccurs="20"/>
 				<xs:element name="string" minOccurs="0" maxOccurs="unbounded">
 					<xs:complexType>
 						<xs:simpleContent>

rsrc/schemas/terrain.xsd

@@ -85,9 +85,13 @@
 			<xs:all>
 				<xs:element name="shortcut" minOccurs="0" type="key"/>
 				<xs:element name="frill" minOccurs="0">
-					<xs:extension base="xs:integer">
-						<xs:attribute name="chance" type="xs:integer" use="optional" default="10"/>
-					</xs:extension>
+					<xs:complexType>
+						<xs:simpleContent>
+							<xs:extension base="xs:integer">
+								<xs:attribute name="chance" type="xs:integer" use="optional" default="10"/>
+							</xs:extension>
+						</xs:simpleContent>
+					</xs:complexType>
 				</xs:element>
 				<xs:element name="object" minOccurs="0">
 					<xs:complexType>

rsrc/schemas/town.xsd

@@ -80,7 +80,7 @@
 					</xs:complexType>
 				</xs:element>
 				<xs:element name="onoffend" minOccurs="0" type="xs:integer"/>
-				<xs:element ref="timer" minOccurs="0" maxOccurs="8"/>
+				<xs:element name="timer" type="timer" minOccurs="0" maxOccurs="8"/>
 				<xs:element name="flags">
 					<xs:complexType>
 						<xs:all>