Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
#ifndef CREATURELIB_EVENTDATAKIND_HPP
|
||||
#define CREATURELIB_EVENTDATAKIND_HPP
|
||||
#include <Arbutils/Enum.hpp>
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
ENUM(EventDataKind, uint8_t, Damage, Heal, Faint, Switch, TurnStart, TurnEnd, ExperienceGain, Miss, DisplayText,
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
#include <functional>
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
#include "../../Library/Exceptions/CreatureException.hpp"
|
||||
#include "Events/EventData.hpp"
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef CREATURELIB_EVENTDATA_HPP
|
||||
#define CREATURELIB_EVENTDATA_HPP
|
||||
|
||||
#include <Arbutils/Memory/BorrowedPtr.hpp>
|
||||
#include "../EventDataKind.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "ChoiceQueue.hpp"
|
||||
#include <Arbutils/Assert.hpp>
|
||||
|
||||
bool CreatureLib::Battling::ChoiceQueue::MoveCreatureChoiceNext(CreatureLib::Battling::Creature* creature) {
|
||||
AssertNotNull(creature)
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
#ifndef CREATURELIB_CHOICEQUEUE_HPP
|
||||
#define CREATURELIB_CHOICEQUEUE_HPP
|
||||
|
||||
#include <Arbutils/Memory/UniquePtrList.hpp>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
#include "../TurnChoices/BaseTurnChoice.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
#ifndef CREATURELIB_RESOLVETARGET_HPP
|
||||
#define CREATURELIB_RESOLVETARGET_HPP
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include <Arbutils/Memory/BorrowedPtr.hpp>
|
||||
#include <vector>
|
||||
#include "../../Library/Attacks/AttackTarget.hpp"
|
||||
#include "../Models/Battle.hpp"
|
||||
#include "../Models/Creature.hpp"
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
#include "TurnHandler.hpp"
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include <unordered_set>
|
||||
#include "../EventHooks/EventDataClasses.hpp"
|
||||
#include "../History/HistoryElements/AttackUseHistory.hpp"
|
||||
#include "../ScriptHandling/ScriptMacros.hpp"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "TurnOrdering.hpp"
|
||||
#include <algorithm>
|
||||
#include "../Models/Battle.hpp"
|
||||
#include "../TurnChoices/AttackTurnChoice.hpp"
|
||||
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
#ifndef CREATURELIB_TURNORDERING_HPP
|
||||
#define CREATURELIB_TURNORDERING_HPP
|
||||
|
||||
#include <Arbutils/Random.hpp>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
#include "../TurnChoices/BaseTurnChoice.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#ifndef CREATURELIB_HISTORYELEMENTKIND_HPP
|
||||
#define CREATURELIB_HISTORYELEMENTKIND_HPP
|
||||
#include <Arbutils/Enum.hpp>
|
||||
|
||||
ENUM(HistoryElementKind, uint8_t, AttackUse)
|
||||
#endif // CREATURELIB_HISTORYELEMENTKIND_HPP
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef CREATURELIB_HISTORYELEMENT_HPP
|
||||
#define CREATURELIB_HISTORYELEMENT_HPP
|
||||
|
||||
#include <Arbutils/Memory/BorrowedPtr.hpp>
|
||||
#include "../HistoryElementKind.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
class HistoryElement {
|
||||
friend class HistoryHolder;
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef CREATURELIB_HISTORYHOLDER_HPP
|
||||
#define CREATURELIB_HISTORYHOLDER_HPP
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include "../../Library/Exceptions/CreatureException.hpp"
|
||||
#include "HistoryElements/HistoryElement.hpp"
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "BattleLibrary.hpp"
|
||||
#include <Arbutils/Assert.hpp>
|
||||
|
||||
using namespace CreatureLib::Battling;
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "BattleStatCalculator.hpp"
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include "../Models/Creature.hpp"
|
||||
|
||||
using namespace CreatureLib;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "DamageLibrary.hpp"
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include "../ScriptHandling/ScriptMacros.hpp"
|
||||
|
||||
using namespace CreatureLib::Battling;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#ifndef CREATURELIB_EXPERIENCELIBRARY_HPP
|
||||
#define CREATURELIB_EXPERIENCELIBRARY_HPP
|
||||
#include <Arbutils/Memory/BorrowedPtr.hpp>
|
||||
#include <unordered_set>
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
class Creature;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "MiscLibrary.hpp"
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include "../Models/Battle.hpp"
|
||||
#include "../TurnChoices/AttackTurnChoice.hpp"
|
||||
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
#include "Battle.hpp"
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include <memory>
|
||||
#include "../EventHooks/EventDataClasses.hpp"
|
||||
#include "../Flow/TurnHandler.hpp"
|
||||
#include "../Flow/TurnOrdering.hpp"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
#ifndef CREATURELIB_BATTLE_HPP
|
||||
#define CREATURELIB_BATTLE_HPP
|
||||
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include <memory>
|
||||
#include "../EventHooks/EventHook.hpp"
|
||||
#include "../Flow/ChoiceQueue.hpp"
|
||||
#include "../History/HistoryHolder.hpp"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef CREATURELIB_BATTLEPARTY_HPP
|
||||
#define CREATURELIB_BATTLEPARTY_HPP
|
||||
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include "CreatureIndex.hpp"
|
||||
#include "CreatureParty.hpp"
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef CREATURELIB_BATTLERESULT_HPP
|
||||
#define CREATURELIB_BATTLERESULT_HPP
|
||||
|
||||
#include <cstdint>
|
||||
namespace CreatureLib::Battling {
|
||||
class BattleResult {
|
||||
bool _conclusiveResult;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "BattleSide.hpp"
|
||||
#include <algorithm>
|
||||
#include "../EventHooks/EventDataClasses.hpp"
|
||||
#include "Battle.hpp"
|
||||
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
#ifndef CREATURELIB_BATTLESIDE_HPP
|
||||
#define CREATURELIB_BATTLESIDE_HPP
|
||||
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include <vector>
|
||||
#include "../TurnChoices/BaseTurnChoice.hpp"
|
||||
#include "Creature.hpp"
|
||||
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
|
||||
#include "CreateCreature.hpp"
|
||||
#include <sstream>
|
||||
#include <utility>
|
||||
#include "../Library/BattleLibrary.hpp"
|
||||
|
||||
using namespace CreatureLib::Battling;
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef CREATURELIB_CREATECREATURE_HPP
|
||||
#define CREATURELIB_CREATECREATURE_HPP
|
||||
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include "../../Library/DataLibrary.hpp"
|
||||
#include "../Library/BattleLibrary.hpp"
|
||||
#include "Creature.hpp"
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
#include "Creature.hpp"
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
#include "../EventHooks/EventDataClasses.hpp"
|
||||
#include "../Models/Battle.hpp"
|
||||
#include "../ScriptHandling/ScriptMacros.hpp"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
#ifndef CREATURELIB_BATTLECREATURE_HPP
|
||||
#define CREATURELIB_BATTLECREATURE_HPP
|
||||
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include <Arbutils/Memory/BorrowedPtr.hpp>
|
||||
#include <Arbutils/Memory/UniquePtrList.hpp>
|
||||
#include "../../Defines.hpp"
|
||||
#include "../../Library/ClampedStatisticSet.hpp"
|
||||
#include "../../Library/CreatureData/CreatureSpecies.hpp"
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef CREATURELIB_CREATUREINDEX_HPP
|
||||
#define CREATURELIB_CREATUREINDEX_HPP
|
||||
|
||||
#include <cstdint>
|
||||
#include "Creature.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef CREATURELIB_CREATUREPARTY_HPP
|
||||
#define CREATURELIB_CREATUREPARTY_HPP
|
||||
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include "Creature.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
#ifndef CREATURELIB_DAMAGESOURCE_HPP
|
||||
#define CREATURELIB_DAMAGESOURCE_HPP
|
||||
|
||||
#include <Arbutils/Enum.hpp>
|
||||
#include <cstdint>
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
ENUM(DamageSource, uint8_t, AttackDamage);
|
||||
}
|
||||
|
||||
@@ -1,12 +1,6 @@
|
||||
#ifndef CREATURELIB_EXECUTINGATTACK_HPP
|
||||
#define CREATURELIB_EXECUTINGATTACK_HPP
|
||||
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include <Arbutils/Collections/Dictionary.hpp>
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include <cstdint>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
#include "Creature.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "LearnedAttack.hpp"
|
||||
#include <Arbutils/Assert.hpp>
|
||||
|
||||
CreatureLib::Battling::LearnedAttack::LearnedAttack(
|
||||
const ArbUt::BorrowedPtr<const CreatureLib::Library::AttackData>& attack, uint8_t maxUses,
|
||||
AttackLearnMethod learnMethod)
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef CREATURELIB_LEARNEDATTACK_HPP
|
||||
#define CREATURELIB_LEARNEDATTACK_HPP
|
||||
|
||||
#include <Arbutils/Memory/BorrowedPtr.hpp>
|
||||
#include <memory>
|
||||
#include "../../Library/Attacks/AttackData.hpp"
|
||||
#include "AttackLearnMethod.hpp"
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef CREATURELIB_SCRIPT_HPP
|
||||
#define CREATURELIB_SCRIPT_HPP
|
||||
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include <Arbutils/StringView.hpp>
|
||||
#include "../../Library/EffectParameter.hpp"
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef CREATURELIB_SCRIPTAGGREGATOR_HPP
|
||||
#define CREATURELIB_SCRIPTAGGREGATOR_HPP
|
||||
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include "Script.hpp"
|
||||
#include "ScriptSet.hpp"
|
||||
#include "ScriptWrapper.hpp"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef CREATURELIB_SCRIPTRESOLVER_HPP
|
||||
#define CREATURELIB_SCRIPTRESOLVER_HPP
|
||||
|
||||
#include <Arbutils/Enum.hpp>
|
||||
#include <string>
|
||||
#include "Script.hpp"
|
||||
#include "ScriptCategory.hpp"
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef CREATURELIB_SCRIPTSET_HPP
|
||||
#define CREATURELIB_SCRIPTSET_HPP
|
||||
|
||||
#include <Arbutils/Collections/Dictionary.hpp>
|
||||
#include <Arbutils/Memory/UniquePtrList.hpp>
|
||||
#include <any>
|
||||
#include "Script.hpp"
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef CREATURELIB_SCRIPTWRAPPER_HPP
|
||||
#define CREATURELIB_SCRIPTWRAPPER_HPP
|
||||
|
||||
#include <memory>
|
||||
#include "Script.hpp"
|
||||
#include "ScriptSet.hpp"
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef CREATURELIB_BASETURNCHOICE_HPP
|
||||
#define CREATURELIB_BASETURNCHOICE_HPP
|
||||
|
||||
#include <Arbutils/Assert.hpp>
|
||||
#include "../ScriptHandling/ScriptSource.hpp"
|
||||
#include "TurnChoiceKind.hpp"
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#ifndef CREATURELIB_TURNCHOICEKIND_HPP
|
||||
#define CREATURELIB_TURNCHOICEKIND_HPP
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace CreatureLib::Battling {
|
||||
ENUM(TurnChoiceKind, uint8_t, Pass, Attack, Item, Switch, Flee);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user