Mercurial > repos > IBDev-IBBoard.WarFoundry.API
changeset 460:025319b6fa7a
Re #379: Fix validation of requirements to check for unit
* Create max count requirement object
* Re-add code for min/max counts as requirements
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sun, 04 Mar 2012 21:13:52 +0000 |
| parents | 7a00aeba3d2f |
| children | f0594621e4a0 |
| files | API/Objects/Requirement/RaceRequiresNoMoreThanNUnitsRequirement.cs API/Objects/UnitType.cs IBBoard.WarFoundry.API.csproj |
| diffstat | 3 files changed, 64 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/API/Objects/Requirement/RaceRequiresNoMoreThanNUnitsRequirement.cs Sun Mar 04 21:13:52 2012 +0000 @@ -0,0 +1,57 @@ +// This file (RaceRequiresNoMoreThanNUnitsRequirement.cs) is a part of the IBBoard.WarFoundry.API project and is copyright 2012 IBBoard +// +// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license. +using System; +using IBBoard.Collections; + +namespace IBBoard.WarFoundry.API.Objects.Requirement +{ + public class RaceRequiresNoMoreThanNUnitsRequirement : RequiresNoMoreThanNOfUnitTypeRequirement<Race> + { + private static readonly string REQUIREMENT_ID_RACE = "RaceRequiresNoMoreThanNUnits"; + + public RaceRequiresNoMoreThanNUnitsRequirement(Race requirementOn, params UnitType[] requiredUnitTypes) : base(requirementOn, requiredUnitTypes) + { + //Do nothing special + } + + protected override int GetObjectCountFromArmy(Army toArmy, Race obj) + { + return toArmy.Race == AllowedObject ? 1 : 0; + } + + protected override bool IsApplicable(Army toArmy) + { + bool isApplicable = false; + SimpleSet<UnitType> checkedTypes = new SimpleSet<UnitType>(); + + foreach (UnitCountRequirementData limit in ConstraintTypes) + { + foreach (UnitType unitType in limit.UnitTypes) + { + if (!checkedTypes.Contains(unitType)) + { + if (toArmy.GetUnitTypeCount(unitType) > 0) + { + isApplicable = true; + break; + } + + checkedTypes.Add(unitType); + } + } + } + + return isApplicable; + } + + public override string RequirementID + { + get + { + return REQUIREMENT_ID_RACE; + } + } + } +} +
--- a/API/Objects/UnitType.cs Sun Mar 04 20:27:33 2012 +0000 +++ b/API/Objects/UnitType.cs Sun Mar 04 21:13:52 2012 +0000 @@ -498,16 +498,16 @@ if (MinNumber != 0) { - //RequiresAtLeastNUnitsRequirement<Army> req = new RequiresAtLeastNUnitsRequirement<Army>(); - //req.AddUnitTypeRequirement(this, MinNumber); - //reqs.Add(req); + RaceRequiresAtLeastNUnitsRequirement req = new RaceRequiresAtLeastNUnitsRequirement(Race); + req.AddUnitTypeRequirement(this, MinNumber); + reqs.Add(req); } if (MaxNumber != WarFoundryCore.INFINITY) { - //RequiresNoMoreThanNOfUnitTypeRequirement<IWarFoundryObject> req = new RequiresNoMoreThanNOfUnitTypeRequirement<IWarFoundryObject>(); - //req.AddUnitTypeRequirement(this, MaxNumber); - //reqs.Add(req); + RaceRequiresNoMoreThanNUnitsRequirement req = new RaceRequiresNoMoreThanNUnitsRequirement(Race); + req.AddUnitTypeRequirement(this, MaxNumber); + reqs.Add(req); } return reqs.ToArray();
--- a/IBBoard.WarFoundry.API.csproj Sun Mar 04 20:27:33 2012 +0000 +++ b/IBBoard.WarFoundry.API.csproj Sun Mar 04 21:13:52 2012 +0000 @@ -195,6 +195,7 @@ <Compile Include="API\Objects\Requirement\RequiresNUnitsForMObjectsRequirement.cs" /> <Compile Include="API\Objects\Requirement\AbstractUnitRequirement.cs" /> <Compile Include="API\Objects\Requirement\RaceRequiresAtLeastNUnitsRequirement.cs" /> + <Compile Include="API\Objects\Requirement\RaceRequiresNoMoreThanNUnitsRequirement.cs" /> </ItemGroup> <ItemGroup> <Reference Include="System.Xml" />