Mercurial > repos > IBDev-IBBoard.WarFoundry.API
changeset 166:6902f49e16e0
Re #198: Add slots with counts to units
* Add definition to race schema
Also:
* white-space changes in .csproj file
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Tue, 06 Oct 2009 14:47:06 +0000 |
parents | 71e50c0884a2 |
children | 9ba56a8e5096 |
files | IBBoard.WarFoundry.API.csproj dtds/race.xsd |
diffstat | 2 files changed, 189 insertions(+), 171 deletions(-) [+] |
line wrap: on
line diff
--- a/IBBoard.WarFoundry.API.csproj Tue Oct 06 10:37:08 2009 +0000 +++ b/IBBoard.WarFoundry.API.csproj Tue Oct 06 14:47:06 2009 +0000 @@ -1,178 +1,178 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>8.0.50727</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>IBBoard.WarFoundry.API</RootNamespace> - <AssemblyName>IBBoard.WarFoundry.API</AssemblyName> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>8.0.50727</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>IBBoard.WarFoundry.API</RootNamespace> + <AssemblyName>IBBoard.WarFoundry.API</AssemblyName> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> </Target> <Target Name="AfterBuild"> </Target> - --> - <ItemGroup> - <None Include="dtds\system.xsd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="dtds\race.xsd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - <SubType> - </SubType> - </None> - <None Include="dtds\warfoundry-core.xsd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="dtds\warfoundry-cats.xsd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="dtds\army.xsd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - <SubType> - </SubType> - </None> - <None Include="COPYING" /> - <None Include="dtds\xhtml-lat1.ent"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="dtds\xhtml-special.ent"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="dtds\xhtml-symbol.ent"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="dtds\xhtml1-strict.dtd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <Compile Include="api\Objects\ICostedWarFoundryObject.cs" /> - </ItemGroup> - <ItemGroup> - <Compile Include="api\Commands\CreateAndAddUnitCommand.cs" /> - <Compile Include="api\Commands\RemoveUnitCommand.cs" /> - <Compile Include="api\Commands\AbstractReplaceUnitEquipmentCommand.cs" /> - <Compile Include="api\Commands\SetNameCommand.cs" /> - <Compile Include="api\Commands\SetUnitEquipmentNumericAmountCommand.cs" /> - <Compile Include="api\Commands\SetUnitSizeCommand.cs" /> - <Compile Include="api\Delegates.cs" /> - <Compile Include="api\Factories\AbstractNativeWarFoundryFactory.cs" /> - <Compile Include="api\Factories\AbstractNonNativeFileExtensionWarFoundryFactory.cs" /> - <Compile Include="api\Factories\AbstractNonNativeWarFoundryFactory.cs" /> - <Compile Include="api\Factories\AbstractWarFoundryFactory.cs" /> - <Compile Include="api\Factories\INativeWarFoundryFactory.cs" /> - <Compile Include="api\Factories\INonNativeWarFoundryFactory.cs" /> - <Compile Include="api\Factories\IWarFoundryFactory.cs" /> - <Compile Include="api\Factories\Xml\WarFoundryXmlElementName.cs" /> - <Compile Include="api\Factories\Xml\WarFoundryXmlFactory.cs" /> - <Compile Include="api\Factories\Xml\WarFoundryXmlSaver.cs" /> - <Compile Include="api\FileLoadFailure.cs" /> - <Compile Include="api\Objects\Ability.cs" /> - <Compile Include="api\Objects\ArmourType.cs" /> - <Compile Include="api\Objects\Army.cs" /> - <Compile Include="api\Objects\ArmyCategory.cs" /> - <Compile Include="api\Objects\Category.cs" /> - <Compile Include="api\Objects\DuplicateItemException.cs" /> - <Compile Include="api\Objects\EquipmentItem.cs" /> - <Compile Include="api\Objects\GameSystem.cs" /> - <Compile Include="api\Objects\IWarFoundryNativeSourceObject.cs" /> - <Compile Include="api\Objects\IWarFoundryObject.cs" /> - <Compile Include="api\Objects\IWarFoundryStagedLoadObject.cs" /> - <Compile Include="api\Objects\Race.cs" /> - <Compile Include="api\Objects\Stat.cs" /> - <Compile Include="api\Objects\Stats.cs" /> - <Compile Include="api\Objects\StatSlot.cs" /> - <Compile Include="api\Objects\SystemStats.cs" /> - <Compile Include="api\Objects\Unit.cs" /> - <Compile Include="api\Objects\UnitEquipmentItem.cs" /> - <Compile Include="api\Objects\UnitType.cs" /> - <Compile Include="api\Objects\WarFoundryObject.cs" /> - <Compile Include="api\Objects\WarFoundryStagedLoadingObject.cs" /> - <Compile Include="api\Requirements\AbstractArmyRequirement.cs" /> - <Compile Include="api\Requirements\AbstractFailedRequirement.cs" /> - <Compile Include="api\Requirements\AbstractRequirement.cs" /> - <Compile Include="api\Requirements\AbstractUnitRequirement.cs" /> - <Compile Include="api\Requirements\Delegates.cs" /> - <Compile Include="api\Requirements\FailedRequirement.cs" /> - <Compile Include="api\Requirements\FailedUnitRequirement.cs" /> - <Compile Include="api\Requirements\RequirementAND.cs" /> - <Compile Include="api\Requirements\RequirementOR.cs" /> - <Compile Include="api\Requirements\UnitExcludesRequirement.cs" /> - <Compile Include="api\Requirements\UnitExclusion.cs" /> - <Compile Include="api\Requirements\UnitMaxNumberReached.cs" /> - <Compile Include="api\Requirements\UnitMinNumberReached.cs" /> - <Compile Include="api\Requirements\UnitRequirement.cs" /> - <Compile Include="api\Requirements\UnitRequirementItem.cs" /> - <Compile Include="api\Requirements\UnitRequirementMaxNumber.cs" /> - <Compile Include="api\Requirements\UnitRequirementMinNumber.cs" /> - <Compile Include="api\Requirements\UnitRequiresAtLeastRequirement.cs" /> - <Compile Include="api\Savers\IWarFoundryFileSaver.cs" /> - <Compile Include="api\Savers\WarFoundrySaver.cs" /> - <Compile Include="api\Util\UnitEquipmentUtil.cs" /> - <Compile Include="api\WarFoundryCore.cs" /> - <Compile Include="api\WarFoundryLoader.cs" /> - <Compile Include="AssemblyInfo.cs" /> - <Compile Include="api\Factories\Xml\WarFoundryXmlGameSystemFactory.cs" /> - <Compile Include="api\Factories\Xml\WarFoundryXmlRaceFactory.cs" /> - <Compile Include="api\Factories\Xml\WarFoundryXmlArmyFactory.cs" /> - <Compile Include="api\Factories\Xml\WarFoundryXmlFactoryUtils.cs" /> - <Compile Include="api\Factories\Xml\AbstractStagedLoadedSubFactory.cs" /> - <Compile Include="api\Objects\InvalidContainershipException.cs" /> - <Compile Include="api\Objects\CompositeEquipmentItem.cs" /> - <Compile Include="api\Objects\AbstractUnitEquipmentItemSelection.cs" /> - <Compile Include="api\Objects\UnitEquipmentNumericForRatioSelection.cs" /> - <Compile Include="api\Objects\UnitEquipmentNumericSelection.cs" /> - <Compile Include="api\Objects\UnitEquipmentRatioSelection.cs" /> - <Compile Include="api\Commands\SetUnitEquipmentRatioAmountCommand.cs" /> - <Compile Include="api\Commands\AbstractSetUnitEquipmentAmountCommand.cs" /> - <Compile Include="api\Commands\ReplaceUnitEquipmentWithNumericAmountItemCommand.cs" /> - <Compile Include="api\Commands\ReplaceUnitEquipmentWithRatioAmountItemCommand.cs" /> - <Compile Include="api\Factories\Xml\Zip\StringZipEntrySource.cs" /> - <Compile Include="api\Factories\RequiredDataMissingException.cs" /> - <Compile Include="api\Factories\Xml\WarFoundryXmlArmyParser.cs" /> - <Compile Include="api\Exporters\IWarFoundryExporter.cs" /> - <Compile Include="api\Exporters\WarFoundryHtmlExporter.cs" /> - </ItemGroup> - <ItemGroup> - <Content Include="libs\ICSharpCode.SharpZipLib.dll" /> - <Content Include="libs\log4net.dll" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\IBBoard\IBBoard.csproj"> - <Project>{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}</Project> - <Name>IBBoard</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - <Reference Include="System" /> - <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"> - <SpecificVersion>False</SpecificVersion> - <HintPath>libs\ICSharpCode.SharpZipLib.dll</HintPath> - </Reference> - </ItemGroup> + --> + <ItemGroup> + <None Include="dtds\system.xsd"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="dtds\race.xsd"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <SubType> + </SubType> + </None> + <None Include="dtds\warfoundry-core.xsd"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="dtds\warfoundry-cats.xsd"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="dtds\army.xsd"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <SubType> + </SubType> + </None> + <None Include="COPYING" /> + <None Include="dtds\xhtml-lat1.ent"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="dtds\xhtml-special.ent"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="dtds\xhtml-symbol.ent"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="dtds\xhtml1-strict.dtd"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <Compile Include="api\Objects\ICostedWarFoundryObject.cs" /> + </ItemGroup> + <ItemGroup> + <Compile Include="api\Commands\CreateAndAddUnitCommand.cs" /> + <Compile Include="api\Commands\RemoveUnitCommand.cs" /> + <Compile Include="api\Commands\AbstractReplaceUnitEquipmentCommand.cs" /> + <Compile Include="api\Commands\SetNameCommand.cs" /> + <Compile Include="api\Commands\SetUnitEquipmentNumericAmountCommand.cs" /> + <Compile Include="api\Commands\SetUnitSizeCommand.cs" /> + <Compile Include="api\Delegates.cs" /> + <Compile Include="api\Factories\AbstractNativeWarFoundryFactory.cs" /> + <Compile Include="api\Factories\AbstractNonNativeFileExtensionWarFoundryFactory.cs" /> + <Compile Include="api\Factories\AbstractNonNativeWarFoundryFactory.cs" /> + <Compile Include="api\Factories\AbstractWarFoundryFactory.cs" /> + <Compile Include="api\Factories\INativeWarFoundryFactory.cs" /> + <Compile Include="api\Factories\INonNativeWarFoundryFactory.cs" /> + <Compile Include="api\Factories\IWarFoundryFactory.cs" /> + <Compile Include="api\Factories\Xml\WarFoundryXmlElementName.cs" /> + <Compile Include="api\Factories\Xml\WarFoundryXmlFactory.cs" /> + <Compile Include="api\Factories\Xml\WarFoundryXmlSaver.cs" /> + <Compile Include="api\FileLoadFailure.cs" /> + <Compile Include="api\Objects\Ability.cs" /> + <Compile Include="api\Objects\ArmourType.cs" /> + <Compile Include="api\Objects\Army.cs" /> + <Compile Include="api\Objects\ArmyCategory.cs" /> + <Compile Include="api\Objects\Category.cs" /> + <Compile Include="api\Objects\DuplicateItemException.cs" /> + <Compile Include="api\Objects\EquipmentItem.cs" /> + <Compile Include="api\Objects\GameSystem.cs" /> + <Compile Include="api\Objects\IWarFoundryNativeSourceObject.cs" /> + <Compile Include="api\Objects\IWarFoundryObject.cs" /> + <Compile Include="api\Objects\IWarFoundryStagedLoadObject.cs" /> + <Compile Include="api\Objects\Race.cs" /> + <Compile Include="api\Objects\Stat.cs" /> + <Compile Include="api\Objects\Stats.cs" /> + <Compile Include="api\Objects\StatSlot.cs" /> + <Compile Include="api\Objects\SystemStats.cs" /> + <Compile Include="api\Objects\Unit.cs" /> + <Compile Include="api\Objects\UnitEquipmentItem.cs" /> + <Compile Include="api\Objects\UnitType.cs" /> + <Compile Include="api\Objects\WarFoundryObject.cs" /> + <Compile Include="api\Objects\WarFoundryStagedLoadingObject.cs" /> + <Compile Include="api\Requirements\AbstractArmyRequirement.cs" /> + <Compile Include="api\Requirements\AbstractFailedRequirement.cs" /> + <Compile Include="api\Requirements\AbstractRequirement.cs" /> + <Compile Include="api\Requirements\AbstractUnitRequirement.cs" /> + <Compile Include="api\Requirements\Delegates.cs" /> + <Compile Include="api\Requirements\FailedRequirement.cs" /> + <Compile Include="api\Requirements\FailedUnitRequirement.cs" /> + <Compile Include="api\Requirements\RequirementAND.cs" /> + <Compile Include="api\Requirements\RequirementOR.cs" /> + <Compile Include="api\Requirements\UnitExcludesRequirement.cs" /> + <Compile Include="api\Requirements\UnitExclusion.cs" /> + <Compile Include="api\Requirements\UnitMaxNumberReached.cs" /> + <Compile Include="api\Requirements\UnitMinNumberReached.cs" /> + <Compile Include="api\Requirements\UnitRequirement.cs" /> + <Compile Include="api\Requirements\UnitRequirementItem.cs" /> + <Compile Include="api\Requirements\UnitRequirementMaxNumber.cs" /> + <Compile Include="api\Requirements\UnitRequirementMinNumber.cs" /> + <Compile Include="api\Requirements\UnitRequiresAtLeastRequirement.cs" /> + <Compile Include="api\Savers\IWarFoundryFileSaver.cs" /> + <Compile Include="api\Savers\WarFoundrySaver.cs" /> + <Compile Include="api\Util\UnitEquipmentUtil.cs" /> + <Compile Include="api\WarFoundryCore.cs" /> + <Compile Include="api\WarFoundryLoader.cs" /> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="api\Factories\Xml\WarFoundryXmlGameSystemFactory.cs" /> + <Compile Include="api\Factories\Xml\WarFoundryXmlRaceFactory.cs" /> + <Compile Include="api\Factories\Xml\WarFoundryXmlArmyFactory.cs" /> + <Compile Include="api\Factories\Xml\WarFoundryXmlFactoryUtils.cs" /> + <Compile Include="api\Factories\Xml\AbstractStagedLoadedSubFactory.cs" /> + <Compile Include="api\Objects\InvalidContainershipException.cs" /> + <Compile Include="api\Objects\CompositeEquipmentItem.cs" /> + <Compile Include="api\Objects\AbstractUnitEquipmentItemSelection.cs" /> + <Compile Include="api\Objects\UnitEquipmentNumericForRatioSelection.cs" /> + <Compile Include="api\Objects\UnitEquipmentNumericSelection.cs" /> + <Compile Include="api\Objects\UnitEquipmentRatioSelection.cs" /> + <Compile Include="api\Commands\SetUnitEquipmentRatioAmountCommand.cs" /> + <Compile Include="api\Commands\AbstractSetUnitEquipmentAmountCommand.cs" /> + <Compile Include="api\Commands\ReplaceUnitEquipmentWithNumericAmountItemCommand.cs" /> + <Compile Include="api\Commands\ReplaceUnitEquipmentWithRatioAmountItemCommand.cs" /> + <Compile Include="api\Factories\Xml\Zip\StringZipEntrySource.cs" /> + <Compile Include="api\Factories\RequiredDataMissingException.cs" /> + <Compile Include="api\Factories\Xml\WarFoundryXmlArmyParser.cs" /> + <Compile Include="api\Exporters\IWarFoundryExporter.cs" /> + <Compile Include="api\Exporters\WarFoundryHtmlExporter.cs" /> + </ItemGroup> + <ItemGroup> + <Content Include="libs\ICSharpCode.SharpZipLib.dll" /> + <Content Include="libs\log4net.dll" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\IBBoard\IBBoard.csproj"> + <Project>{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}</Project> + <Name>IBBoard</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + <Reference Include="System" /> + <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"> + <SpecificVersion>False</SpecificVersion> + <HintPath>libs\ICSharpCode.SharpZipLib.dll</HintPath> + </Reference> + </ItemGroup> </Project> \ No newline at end of file
--- a/dtds/race.xsd Tue Oct 06 10:37:08 2009 +0000 +++ b/dtds/race.xsd Tue Oct 06 14:47:06 2009 +0000 @@ -28,6 +28,23 @@ <xs:anyAttribute/> </xs:complexType> </xs:element> + <xs:element name="equipmentSlots" minOccurs="0"> + <xs:complexType> + <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:positiveInteger" use="required"/> + <xs:anyAttribute/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="unitEquipment" minOccurs="0"> <xs:complexType> <xs:sequence> @@ -38,6 +55,7 @@ <!-- exclusivityGroup is deprecated in favour of the comma-separated exclusivityGroups --> <xs:attribute name="exclusivityGroup" type="xs:string" default=""/> <xs:attribute name="exclusivityGroups" type="xs:string" default=""/> + <xs:attribute name="equipmentSlot" type="xs:string"/> <xs:attribute name="minNum" type="core:nonNegativeOrInfiniteInteger" default="-1"/> <xs:attribute name="maxNum" type="core:nonNegativeOrInfiniteInteger" default="-1"/> <xs:attribute name="minPercentage" type="core:percentage" default="100"/>