diff dtds/race.xsd @ 176:22429737cd77

Re #198: Add slots with counts to units * Migrate to using new Limit objects from ibboard:ticket:24 * Parse new objects * Move more data type definitions in to Core schema for re-use * Make UnitType just return limit objects
author IBBoard <dev@ibboard.co.uk>
date Thu, 22 Oct 2009 19:51:42 +0000
parents 8e7bbea333d8
children 36adabb1c3ea
line wrap: on
line diff
--- a/dtds/race.xsd	Wed Oct 21 19:01:13 2009 +0000
+++ b/dtds/race.xsd	Thu Oct 22 19:51:42 2009 +0000
@@ -33,14 +33,11 @@
 											<xs:sequence>
 												<xs:element name="equipmentSlot" maxOccurs="unbounded">
 													<xs:complexType>
-														<xs:simpleContent>
-															<xs:extension base="xs:string">
-																<xs:attribute name="name" type="xs:string" use="required"/>
-																<xs:attribute name="limit" type="xs:integer" default="0"/>
-																<xs:attribute name="isPercentage" type="xs:boolean" default="false"/>
-																<xs:anyAttribute/>
-															</xs:extension>
-														</xs:simpleContent>
+														<xs:all>
+															<xs:element name="maxLimit" minOccurs="0" type="core:limit" />															
+														</xs:all>
+														<xs:attribute name="name" type="xs:string" use="required"/>
+														<xs:anyAttribute/>
 													</xs:complexType>
 												</xs:element>
 											</xs:sequence>
@@ -61,7 +58,7 @@
 														<xs:attribute name="maxNum" type="core:nonNegativeOrInfiniteInteger" default="-1"/>
 														<xs:attribute name="minPercentage" type="core:percentage" default="100"/>
 														<xs:attribute name="maxPercentage" type="core:percentage" default="100"/>
-														<xs:attribute name="roundDirection" type="updowntype" default="up"/>
+														<xs:attribute name="roundDirection" type="core:updowntype" default="up"/>
 														<xs:attribute name="costMultiplier" type="core:nonNegativeDouble" default="1"/>
 														<xs:attribute name="costRounding" type="costroundingtype" default="UpToHalf"/>
 														<xs:anyAttribute/>
@@ -199,12 +196,6 @@
 		<xs:anyAttribute/>
 	</xs:complexType>
 </xs:element>
-<xs:simpleType name="updowntype">
-	<xs:restriction base="xs:string">
-		<xs:enumeration value="up"/>
-		<xs:enumeration value="down"/>
-	</xs:restriction>
-</xs:simpleType>
 <xs:simpleType name="costroundingtype">
 	<xs:restriction base="xs:string">
 		<xs:enumeration value="Up"/>