# HG changeset patch # User IBBoard # Date 1330892853 0 # Node ID 7a00aeba3d2ffea552d371a14de42b08bdcfefeb # Parent 680db2462e34827b3b21e87fb364b4e25a2f687e Re #379: Fix validation of requirements to check for unit * Re-add requirement for handling numbers of units in an army diff -r 680db2462e34 -r 7a00aeba3d2f API/Objects/Requirement/RaceRequiresAtLeastNUnitsRequirement.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/API/Objects/Requirement/RaceRequiresAtLeastNUnitsRequirement.cs Sun Mar 04 20:27:33 2012 +0000 @@ -0,0 +1,57 @@ +// This file (RaceRequiresAtLeastNUnitsRequirement.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 RaceRequiresAtLeastNUnitsRequirement : RequiresAtLeastNUnitsRequirement + { + private static readonly string REQUIREMENT_ID_RACE = "RaceRequiresAtLeastNUnits"; + + public RaceRequiresAtLeastNUnitsRequirement(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 checkedTypes = new SimpleSet(); + + 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; + } + } + } +} + diff -r 680db2462e34 -r 7a00aeba3d2f IBBoard.WarFoundry.API.csproj --- a/IBBoard.WarFoundry.API.csproj Sun Feb 26 20:16:33 2012 +0000 +++ b/IBBoard.WarFoundry.API.csproj Sun Mar 04 20:27:33 2012 +0000 @@ -194,6 +194,7 @@ +