Updated to latest Arbutils.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-04-25 10:41:15 +02:00
parent df37558ec0
commit 1eb751538d
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
7 changed files with 66 additions and 77 deletions

View File

@ -38,12 +38,12 @@ namespace CreatureLib::Battling {
uint8_t creaturesPerSide = 1) uint8_t creaturesPerSide = 1)
: _library(library), _parties(std::move(parties)), _canFlee(canFlee), _numberOfSides(numberOfSides), : _library(library), _parties(std::move(parties)), _canFlee(canFlee), _numberOfSides(numberOfSides),
_creaturesPerSide(creaturesPerSide) { _creaturesPerSide(creaturesPerSide) {
AssertNotNull(_library) AssertNotNull(_library);
AssertAllNotNull(parties) AssertAllNotNull(parties);
_sides = List<BattleSide*>(numberOfSides); _sides = List<BattleSide*>(numberOfSides);
for (size_t i = 0; i < numberOfSides; i++) { for (size_t i = 0; i < numberOfSides; i++) {
_sides[i] = new BattleSide(i, this, creaturesPerSide); _sides.Append(new BattleSide(i, this, creaturesPerSide));
} }
} }

View File

@ -26,9 +26,9 @@ namespace CreatureLib::Battling {
: _index(index), _creaturesPerSide(creaturesPerSide), _creatures(creaturesPerSide), : _index(index), _creaturesPerSide(creaturesPerSide), _creatures(creaturesPerSide),
_choices(creaturesPerSide), _fillableSlots(creaturesPerSide), _battle(battle) { _choices(creaturesPerSide), _fillableSlots(creaturesPerSide), _battle(battle) {
for (size_t i = 0; i < creaturesPerSide; i++) { for (size_t i = 0; i < creaturesPerSide; i++) {
_creatures[i] = nullptr; _creatures.Append(nullptr);
_choices[i] = nullptr; _choices.Append(nullptr);
_fillableSlots[i] = true; _fillableSlots.Append(true);
} }
ResetChoices(); ResetChoices();
} }

View File

@ -5,29 +5,29 @@
using namespace CreatureLib::Battling; using namespace CreatureLib::Battling;
CreateCreature* CreateCreature::WithVariant(const Arbutils::CaseInsensitiveConstString& variant) { CreateCreature CreateCreature::WithVariant(const Arbutils::CaseInsensitiveConstString& variant) {
this->_variant = variant; this->_variant = variant;
return this; return *this;
} }
CreateCreature* CreateCreature::WithNickname(std::string nickname) { CreateCreature CreateCreature::WithNickname(std::string nickname) {
this->_nickname = std::move(nickname); this->_nickname = std::move(nickname);
return this; return *this;
} }
CreateCreature* CreateCreature::WithGender(Library::Gender gender) { CreateCreature CreateCreature::WithGender(Library::Gender gender) {
this->_gender = gender; this->_gender = gender;
return this; return *this;
} }
CreateCreature* CreateCreature::WithAttack(const Arbutils::CaseInsensitiveConstString& attackName, CreateCreature CreateCreature::WithAttack(const Arbutils::CaseInsensitiveConstString& attackName,
AttackLearnMethod learnMethod) { AttackLearnMethod learnMethod) {
if (_attacks.Count() >= _library->GetSettings()->GetMaximalMoves()) if (_attacks.Count() >= _library->GetSettings()->GetMaximalMoves())
throw CreatureException("You have already set the maximum amount of allowed moves."); throw CreatureException("You have already set the maximum amount of allowed moves.");
auto attackData = _library->GetAttackLibrary()->Get(attackName); auto attackData = _library->GetAttackLibrary()->Get(attackName);
_attacks.Append(std::tuple(attackData, learnMethod)); _attacks.Append(std::tuple(attackData, learnMethod));
return this; return *this;
} }
Creature* CreateCreature::Create() { Creature* CreateCreature::Create() {
@ -57,9 +57,9 @@ Creature* CreateCreature::Create() {
auto experience = _library->GetGrowthRateLibrary()->CalculateExperience(species->GetGrowthRate(), _level); auto experience = _library->GetGrowthRateLibrary()->CalculateExperience(species->GetGrowthRate(), _level);
auto attacks = List<LearnedAttack*>(_attacks.Count()); auto attacks = List<LearnedAttack*>(_attacks.Count());
for (size_t i = 0; i < attacks.Count(); i++) { for (size_t i = 0; i < _attacks.Count(); i++) {
auto kv = _attacks[i]; auto kv = _attacks[i];
attacks[i] = new LearnedAttack(std::get<0>(kv), std::get<1>(kv)); attacks.Append(new LearnedAttack(std::get<0>(kv), std::get<1>(kv)));
} }
auto c = new Creature(_library, species, variant, _level, experience, identifier, gender, _coloring, heldItem, auto c = new Creature(_library, species, variant, _level, experience, identifier, gender, _coloring, heldItem,
_nickname, talent, attacks); _nickname, talent, attacks);

View File

@ -3,6 +3,7 @@
#include <Arbutils/Collections/List.hpp> #include <Arbutils/Collections/List.hpp>
#include "../../Library/DataLibrary.hpp" #include "../../Library/DataLibrary.hpp"
#include "../Library/BattleLibrary.hpp"
#include "Creature.hpp" #include "Creature.hpp"
using namespace Arbutils::Collections; using namespace Arbutils::Collections;
@ -20,16 +21,17 @@ namespace CreatureLib::Battling {
uint8_t _coloring = 0; uint8_t _coloring = 0;
Arbutils::CaseInsensitiveConstString _heldItem = ""_cnc; Arbutils::CaseInsensitiveConstString _heldItem = ""_cnc;
uint32_t _identifier = 0; uint32_t _identifier = 0;
List<std::tuple<const Library::AttackData*, AttackLearnMethod>> _attacks = {}; List<std::tuple<const Library::AttackData*, AttackLearnMethod>> _attacks;
public: public:
CreateCreature(const BattleLibrary* library, const Arbutils::CaseInsensitiveConstString& species, uint8_t level) CreateCreature(const BattleLibrary* library, const Arbutils::CaseInsensitiveConstString& species, uint8_t level)
: _library(library), _species(species), _level(level) {} : _library(library), _species(species), _level(level), _attacks(library->GetSettings()->GetMaximalMoves()) {
}
CreateCreature* WithVariant(const Arbutils::CaseInsensitiveConstString& variant); CreateCreature WithVariant(const Arbutils::CaseInsensitiveConstString& variant);
CreateCreature* WithNickname(std::string nickname); CreateCreature WithNickname(std::string nickname);
CreateCreature* WithGender(Library::Gender gender); CreateCreature WithGender(Library::Gender gender);
CreateCreature* WithAttack(const Arbutils::CaseInsensitiveConstString& attackName, CreateCreature WithAttack(const Arbutils::CaseInsensitiveConstString& attackName,
AttackLearnMethod learnMethod); AttackLearnMethod learnMethod);
Creature* Create(); Creature* Create();

View File

@ -42,11 +42,7 @@ namespace CreatureLib::Battling {
List<HitData> _hits; List<HitData> _hits;
public: public:
explicit TargetData(uint8_t numberOfHits) : _hits(numberOfHits) { explicit TargetData(uint8_t numberOfHits) : _hits(numberOfHits) { _hits.Resize(numberOfHits, HitData()); }
for (uint8_t i = 0; i < numberOfHits; i++) {
_hits[i] = HitData();
}
}
TargetData() = default; TargetData() = default;
HitData* GetHit(uint8_t index) { return &_hits[index]; } HitData* GetHit(uint8_t index) { return &_hits[index]; }

View File

@ -16,7 +16,9 @@ namespace CreatureLib::Library {
size_t _index; size_t _index;
public: public:
BaseLibrary(size_t initialCapacity = 32) : _values(initialCapacity), _listValues(initialCapacity) {} BaseLibrary(size_t initialCapacity = 32) : _values(initialCapacity), _listValues(0) {
_listValues.Resize(initialCapacity);
}
virtual ~BaseLibrary() { virtual ~BaseLibrary() {
for (const auto& v : _values) { for (const auto& v : _values) {
@ -28,12 +30,12 @@ namespace CreatureLib::Library {
inline void Insert(const Arbutils::CaseInsensitiveConstString& key, const T* value) { inline void Insert(const Arbutils::CaseInsensitiveConstString& key, const T* value) {
AssertNotNull(value) AssertNotNull(value)
_values.Insert(key.GetHash(), value); _values.Insert(key.GetHash(), value);
_listValues[_index++] = key; _listValues.Append(key);
} }
inline void Insert(uint32_t hashedKey, const T* value) { inline void Insert(uint32_t hashedKey, const T* value) {
AssertNotNull(value) AssertNotNull(value)
_values.Insert(hashedKey, value); _values.Insert(hashedKey, value);
_listValues[_index++] = hashedKey; _listValues.Append(hashedKey);
} }
inline void Delete(const Arbutils::CaseInsensitiveConstString& key) { inline void Delete(const Arbutils::CaseInsensitiveConstString& key) {

View File

@ -13,9 +13,8 @@ using namespace Battling;
TEST_CASE("Create Party", "[Integrations]") { TEST_CASE("Create Party", "[Integrations]") {
auto library = TestLibrary::Get(); auto library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c1 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create();
CreatureParty party1{c1}; CreatureParty party1{c1};
auto battleParty = BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty = BattleParty(&party1, {CreatureIndex(0, 0)});
REQUIRE(battleParty.GetParty()->GetAtIndex(0) == c1); REQUIRE(battleParty.GetParty()->GetAtIndex(0) == c1);
@ -23,14 +22,12 @@ TEST_CASE("Create Party", "[Integrations]") {
TEST_CASE("Create Battle", "[Integrations]") { TEST_CASE("Create Battle", "[Integrations]") {
auto library = TestLibrary::Get(); auto library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c1 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create();
CreatureParty party1{c1}; CreatureParty party1{c1};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c2 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c2 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create();
CreatureParty party2{c2}; CreatureParty party2{c2};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
@ -39,14 +36,12 @@ TEST_CASE("Create Battle", "[Integrations]") {
TEST_CASE("Use damaging move", "[Integrations]") { TEST_CASE("Use damaging move", "[Integrations]") {
auto library = TestLibrary::Get(); auto library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c1 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create();
CreatureParty party1{c1}; CreatureParty party1{c1};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c2 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c2 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create();
CreatureParty party2{c2}; CreatureParty party2{c2};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); 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]") { TEST_CASE("Finish battle when all battle of one side have fainted", "[Integrations]") {
auto library = TestLibrary::Get(); auto library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c1 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create();
CreatureParty party1{c1}; CreatureParty party1{c1};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c2 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c2 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create();
CreatureParty party2{c2}; CreatureParty party2{c2};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); 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); battle.SwitchCreature(1, 0, c2);
REQUIRE_FALSE(battle.HasEnded()); REQUIRE_FALSE(battle.HasEnded());
REQUIRE(battle.TrySetChoice(new AttackTurnChoice(c1, c1->GetAttacks()[0], CreatureIndex(1, 0)))); REQUIRE(battle.TrySetChoice(new AttackTurnChoice(c1, c1->GetAttacks()[0], CreatureIndex(1, 0))));
REQUIRE(battle.TrySetChoice(new PassTurnChoice(c2))); 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 library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100) auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
->Create(); .Create();
CreatureParty party1{c1}; CreatureParty party1{c1};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c2 = 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}; CreatureParty party2{c2};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); 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 library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100) auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
->Create(); .Create();
CreatureParty party1{c1}; CreatureParty party1{c1};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c2 = 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 = 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}; CreatureParty party2{c2, c3};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
@ -171,13 +163,13 @@ TEST_CASE("Switch Creature in", "[Integrations]") {
auto library = TestLibrary::Get(); auto library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100) auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
->Create(); .Create();
auto c2 = 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}; CreatureParty party1{c1, c2};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c3 = 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}; CreatureParty party2{c3};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); 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]") { TEST_CASE("Switch Creature in, but have attack aimed at it. Attack should hit new creature", "[Integrations]") {
auto library = TestLibrary::Get(); auto library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c1 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create(); auto c2 =
auto c2 = CreateCreature(library, "testSpecies1"_cnc, 50) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
->Create();
CreatureParty party1{c1, c2}; CreatureParty party1{c1, c2};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c3 = CreateCreature(library, "testSpecies1"_cnc, 50) auto c3 =
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) CreateCreature(library, "testSpecies1"_cnc, 50).WithAttack("standard"_cnc, AttackLearnMethod::Unknown).Create();
->Create();
CreatureParty party2{c3}; CreatureParty party2{c3};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); 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 library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100) auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
->Create(); .Create();
auto c2 = 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}; CreatureParty party1{c1, c2};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c3 = 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}; CreatureParty party2{c3};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});
@ -266,11 +255,11 @@ TEST_CASE("Flee Battle", "[Integrations]") {
auto library = TestLibrary::Get(); auto library = TestLibrary::Get();
auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100) auto c1 = CreateCreature(library, "testSpecies1"_cnc, 100)
.WithAttack("standard"_cnc, AttackLearnMethod::Unknown) .WithAttack("standard"_cnc, AttackLearnMethod::Unknown)
->Create(); .Create();
CreatureParty party1{c1}; CreatureParty party1{c1};
auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)}); auto battleParty1 = new BattleParty(&party1, {CreatureIndex(0, 0)});
auto c2 = 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}; CreatureParty party2{c2};
auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)}); auto battleParty2 = new BattleParty(&party2, {CreatureIndex(1, 0)});