Updated to latest Arbutils.

tests/Integration/BattleIntegrations.cpp

@@ -13,9 +13,8 @@ using namespace Battling;
 
 TEST_CASE("Create Party", "[Integrations]") {
     auto library = TestLibrary::Get();
-    auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c1 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party1{c1};
     auto battleParty = BattleParty(&party1, {CreatureIndex(0, 0)});
     REQUIRE(battleParty.GetParty()->GetAtIndex(0) == c1);
@@ -23,14 +22,12 @@ TEST_CASE("Create Party", "[Integrations]") {
 
 TEST_CASE("Create Battle", "[Integrations]") {
     auto library = TestLibrary::Get();
-    auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c1 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party1{c1};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
-    auto c2 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c2 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c2};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
 
@@ -39,14 +36,12 @@ TEST_CASE("Create Battle", "[Integrations]") {
 
 TEST_CASE("Use damaging move", "[Integrations]") {
     auto library = TestLibrary::Get();
-    auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c1 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party1{c1};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
-    auto c2 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c2 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c2};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
 
@@ -63,14 +58,12 @@ TEST_CASE("Use damaging move", "[Integrations]") {
 
 TEST_CASE("Finish battle when all battle of one side have fainted", "[Integrations]") {
     auto library = TestLibrary::Get();
-    auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c1 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party1{c1};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
-    auto c2 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c2 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c2};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
 
@@ -82,7 +75,6 @@ TEST_CASE("Finish battle when all battle of one side have fainted", "[Integratio
     battle.SwitchCreature(1, 0, c2);
 
     REQUIRE_FALSE(battle.HasEnded());
-
     REQUIRE(battle.TrySetChoice(new AttackTurnChoice(c1, c1->GetAttacks()[0], CreatureIndex(1, 0))));
     REQUIRE(battle.TrySetChoice(new PassTurnChoice(c2)));
 
@@ -102,11 +94,11 @@ TEST_CASE("When creature is dealt enough damage, faint it and mark battle as end
     auto library = TestLibrary::Get();
     auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
                   .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+                  .Create();
     CreatureParty party1{c1};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
     auto c2 =
-        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown)->Create();
+        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c2};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
 
@@ -132,13 +124,13 @@ TEST_CASE("When another creature is available on faint, make sure the battle has
     auto library = TestLibrary::Get();
     auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
                   .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+                  .Create();
     CreatureParty party1{c1};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
     auto c2 =
-        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown)->Create();
+        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     auto c3 =
-        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown)->Create();
+        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c2, c3};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
 
@@ -171,13 +163,13 @@ TEST_CASE("Switch Creature in", "[Integrations]") {
     auto library = TestLibrary::Get();
     auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
                   .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+                  .Create();
     auto c2 =
-        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown)->Create();
+        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party1{c1, c2};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
     auto c3 =
-        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown)->Create();
+        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c3};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
 
@@ -196,17 +188,14 @@ TEST_CASE("Switch Creature in", "[Integrations]") {
 
 TEST_CASE("Switch Creature in, but have attack aimed at it. Attack should hit new creature", "[Integrations]") {
     auto library = TestLibrary::Get();
-    auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
-    auto c2 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c1 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
+    auto c2 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party1{c1, c2};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
-    auto c3 = CreateCreature(library, "testSpecies1"_cnc, 50)
-                  .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+    auto c3 =
+        CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c3};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
 
@@ -226,13 +215,13 @@ TEST_CASE("Switch Creature in, mark as seen opponent for opponent", "[Integratio
     auto library = TestLibrary::Get();
     auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
                   .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+                  .Create();
     auto c2 =
-        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown)->Create();
+        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party1{c1, c2};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
     auto c3 =
-        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown)->Create();
+        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c3};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
 
@@ -266,11 +255,11 @@ TEST_CASE("Flee Battle", "[Integrations]") {
     auto library = TestLibrary::Get();
     auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
                   .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
-                  ->Create();
+                  .Create();
     CreatureParty party1{c1};
     auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
     auto c2 =
-        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown)->Create();
+        CreateCreature(library, "testSpecies1"_cnc, 1).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
     CreatureParty party2{c2};
     auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});