Skip to content

Commit

Permalink
Fix to most tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@samsmithnz
samsmithnz committed Jul 24, 2021
1 parent b372d3b commit ea1237b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 23 deletions.
6 changes: 3 additions & 3 deletions src/Battle.Logic/Characters/Character.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ public Vector3 Location
}
public void SetLocation(Vector3 location, string[,,] map)
{
//if (map != null)
//{
if (map != null)
{
map[(int)_location.X, (int)_location.Y, (int)_location.Z] = "";
map[(int)location.X, (int)location.Y, (int)location.Z] = "P";
//}
}
_location = location;
}
public int MobilityRange { get; set; }
Expand Down
18 changes: 9 additions & 9 deletions src/Battle.Tests/Encounters/AreaAttackTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ public void FOVFredThrowsGrenadeAndDestoriesCoverUpdatingFOVTest()
// . . . . .
// . . . . .
// . . P . .
string[,,] map = MapUtility.InitializeMap(5, 1, 5);
string[,,] map = MapUtility.InitializeMap(10, 1, 10);
map[2, 0, 3] = CoverType.FullCover; //Add cover
Character fred = CharacterPool.CreateFredHero(map);
fred.SetLocation(new Vector3(2, 0, 0), map);
Expand All @@ -522,12 +522,12 @@ public void FOVFredThrowsGrenadeAndDestoriesCoverUpdatingFOVTest()
List<Character> characterList = new List<Character>() { fred, jeff };

//Act 1: get the FOV
List<Vector3> results = FieldOfView.GetFieldOfView(map, fred.Location, 10);
List<Vector3> fov = FieldOfView.GetFieldOfView(map, fred.Location, 10);

//Assert: check the initial FOV
Assert.AreEqual(22, results.Count);
Assert.AreEqual(85, fov.Count);
bool foundItem = false;
foreach (Vector3 item in results)
foreach (Vector3 item in fov)
{
if (item.X == 2 && item.Z == 3)
{
Expand All @@ -536,7 +536,7 @@ public void FOVFredThrowsGrenadeAndDestoriesCoverUpdatingFOVTest()
}
Assert.IsTrue(foundItem == false);
foundItem = false;
foreach (Vector3 item in results)
foreach (Vector3 item in fov)
{
if (item.X == 2 && item.Z == 4)
{
Expand All @@ -548,12 +548,12 @@ public void FOVFredThrowsGrenadeAndDestoriesCoverUpdatingFOVTest()

//Act 2: Now destroy the cover
EncounterResult result = Encounter.AttackCharacterWithAreaOfEffect(fred, fred.UtilityWeaponEquipped, characterList, map, diceRolls, targetThrowingLocation);
results = FieldOfView.GetFieldOfView(map, fred.Location, 10);
fov = FieldOfView.GetFieldOfView(map, fred.Location, 10);

//Assert 2: Check the FOV now
Assert.AreEqual(24, results.Count);
Assert.AreEqual(98, fov.Count);
foundItem = false;
foreach (Vector3 item in results)
foreach (Vector3 item in fov)
{
if (item.X == 2 && item.Z == 3)
{
Expand All @@ -562,7 +562,7 @@ public void FOVFredThrowsGrenadeAndDestoriesCoverUpdatingFOVTest()
}
Assert.IsTrue(foundItem == true);
foundItem = false;
foreach (Vector3 item in results)
foreach (Vector3 item in fov)
{
if (item.X == 2 && item.Z == 4)
{
Expand Down
4 changes: 1 addition & 3 deletions src/Battle.Tests/Encounters/RegularAttackTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ public void FredAttacksPlayerWhoIsOffMapTest()
// . . . . .
// . . . . .
// . . P . .
string[,,] map = MapUtility.InitializeMap(5, 1, 5);
string[,,] map = MapUtility.InitializeMap(10, 1, 10);
map[2, 0, 3] = CoverType.FullCover; //Add cover
Character fred = CharacterPool.CreateFredHero(map);
fred.SetLocation(new Vector3(2, 0, 0), map);
Expand Down Expand Up @@ -694,7 +694,6 @@ public void FredAttacksWithRifleJeffBehindFullCoverAndHunkeredDownMissingHimTest
string log = @"
Fred is attacking with Rifle, targeted on Jeff
Missed: Chance to hit: 24, (dice roll: 65)
High cover downgraded to low cover at <2, 0, 3>
0 XP added to character Fred, for a total of 0 XP
";
Assert.AreEqual(log, result.LogString);
Expand Down Expand Up @@ -738,7 +737,6 @@ public void FredAttacksWithRifleJeffBehindHalfCoverAndHunkeredDownMissingHimTest
string log = @"
Fred is attacking with Rifle, targeted on Jeff
Missed: Chance to hit: 24, (dice roll: 65)
Low cover downgraded to no cover at <2, 0, 3>
0 XP added to character Fred, for a total of 0 XP
";
Assert.AreEqual(log, result.LogString);
Expand Down
6 changes: 3 additions & 3 deletions src/Battle.Tests/Map/MovementTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public void MovementRange8Test()
. . . . . . . . . . . . . . o o o o o o o o o o o o o . . . . . . . . . . . . .
. . . . . . . . . . . . . o o o o o o o o o o o o o o o . . . . . . . . . . . .
. . . . . . . . . . . . . o o o o o o o o o o o o o o o . . . . . . . . . . . .
. . . . . . . . . . . . o o o o o o o o . o o o o o o o o . . . . . . . . . . .
. . . . . . . . . . . . P o o o o o o o . o o o o o o o o . . . . . . . . . . .
. . . . . . . . . . . . . o o o o o o o o o o o o o o o . . . . . . . . . . . .
. . . . . . . . . . . . . o o o o o o o o o o o o o o o . . . . . . . . . . . .
. . . . . . . . . . . . . . o o o o o o o o o o o o o . . . . . . . . . . . . .
Expand Down Expand Up @@ -258,7 +258,7 @@ public void MovementRange16Test()
. . . . . . o o o o o o o o o o o o o o o o o o o o o o o o o o o o o . . . . .
. . . . . o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o . . . .
. . . . . o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o . . . .
. . . . o o o o o o o o o o o o o o o o . o o o o o o o o o o o o o o o o . . .
. . . . o o P o o o o o o o o o o o o o . o o o o o o o o o o o o o o o o . . .
. . . . . o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o . . . .
. . . . . o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o . . . .
. . . . . . o o o o o o o o o o o o o o o o o o o o o o o o o o o o o . . . . .
Expand Down Expand Up @@ -349,7 +349,7 @@ public void MovementRange8AndRange16LayedTest()
. . . . . . o o o o o o o o O O O O O O O O O O O O O o o o o o o o o . . . . .
. . . . . o o o o o o o o O O O O O O O O O O O O O O O o o o o o o o o . . . .
. . . . . o o o o o o o o O O O O O O O O O O O O O O O o o o o o o o o . . . .
. . . . o o o o o o o o O O O O O O O O . O O O O O O O O o o o o o o o o . . .
. . . . o o P o o o o o O O O O O O O O . O O O O O O O O o o o o o o o o . . .
. . . . . o o o o o o o o O O O O O O O O O O O O O O O o o o o o o o o . . . .
. . . . . o o o o o o o o O O O O O O O O O O O O O O O o o o o o o o o . . . .
. . . . . . o o o o o o o o O O O O O O O O O O O O O o o o o o o o o . . . . .
Expand Down
8 changes: 3 additions & 5 deletions src/Battle.Tests/Scenarios/ScenarioTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ public void JeffMovesToCoverAndExchangesFireOver2TurnsToWinTest()
. . . . . o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
. . . o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
. o o o o o o o o o . . . . . . . . . . ■ . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o . . . . . . . . . P . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o . ■ o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o P ■ o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
o o o o o o o o o o o o . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
Expand Down Expand Up @@ -523,16 +523,14 @@ public void JeffMovesAndFOVUpdatesTest()
mission.Map[5, 0, 9] = CoverType.FullCover;
Character fred = CharacterPool.CreateFredHero(mission.Map);
fred.SetLocation(new Vector3(1, 0, 1), mission.Map);
mission.Map[1, 0, 1] = "P";
Team team1 = new Team()
{
Name = "Good guys",
Characters = new List<Character>() { fred }
};
mission.Teams.Add(team1);
Character jeff = CharacterPool.CreateJeffBaddie(mission.Map);
jeff.SetLocation(new Vector3(6, 0, 7), mission.Map);
mission.Map[9, 0, 7] = "P";
jeff.SetLocation(new Vector3(9, 0, 7), mission.Map);
jeff.HitpointsCurrent = 5;
Team team2 = new Team()
{
Expand Down

0 comments on commit ea1237b

Please sign in to comment.