Update to newer Arbutils version.

src/Battling/ScriptHandling/Script.hpp

@@ -5,8 +5,6 @@
 #include <Arbutils/ConstString.hpp>
 #include "../../Library/EffectParameter.hpp"
 
-using ConstString = Arbutils::CaseInsensitiveConstString;
-
 namespace CreatureLib::Battling {
     class BaseTurnChoice;
     class AttackTurnChoice;
@@ -21,13 +19,12 @@ namespace CreatureLib::Battling {
         virtual void Stack(){};
         virtual void OnRemove(){};
 
-        virtual const ConstString& GetName() const noexcept = 0;
+        virtual const ArbUt::CaseInsensitiveConstString& GetName() const noexcept = 0;
 
-        virtual void
-        OnInitialize(const Arbutils::Collections::List<CreatureLib::Library::EffectParameter*>& parameters){};
+        virtual void OnInitialize(const ArbUt::List<CreatureLib::Library::EffectParameter*>& parameters){};
         virtual void OnBeforeTurn(const BaseTurnChoice* choice){};
 
-        virtual void ChangeAttack(AttackTurnChoice* choice, ConstString* outAttack){};
+        virtual void ChangeAttack(AttackTurnChoice* choice, ArbUt::CaseInsensitiveConstString* outAttack){};
         virtual void PreventAttack(ExecutingAttack* attack, bool* outResult){};
         virtual void FailAttack(ExecutingAttack* attack, bool* outFailed){};
         virtual void StopBeforeAttack(ExecutingAttack* attack, bool* outResult){};

src/Battling/ScriptHandling/ScriptAggregator.hpp

@@ -7,8 +7,6 @@
 #include "ScriptSet.hpp"
 #include "ScriptWrapper.hpp"
 
-using namespace Arbutils::Collections;
-
 namespace CreatureLib::Battling {
     class ScriptAggregator {
         const ScriptWrapper* _scripts;
@@ -18,7 +16,7 @@ namespace CreatureLib::Battling {
 
     public:
         ScriptAggregator(){};
-        explicit ScriptAggregator(const List<ScriptWrapper>& scripts)
+        explicit ScriptAggregator(const ArbUt::List<ScriptWrapper>& scripts)
             : _scripts(scripts.RawData()), _size(scripts.Count()){};
 
         inline void Reset() {

src/Battling/ScriptHandling/ScriptResolver.hpp

@@ -14,7 +14,9 @@ namespace CreatureLib::Battling {
         virtual ~ScriptResolver() = default;
 
         virtual void Initialize(BattleLibrary* library){};
-        virtual Script* LoadScript(ScriptCategory category, const ConstString& scriptName) const { return nullptr; };
+        virtual Script* LoadScript(ScriptCategory category, const ArbUt::CaseInsensitiveConstString& scriptName) const {
+            return nullptr;
+        };
     };
 }
 

src/Battling/ScriptHandling/ScriptSet.hpp

@@ -8,8 +8,8 @@
 
 namespace CreatureLib::Battling {
     class ScriptSet {
-        Arbutils::Collections::List<Script*> _scripts;
-        Arbutils::Collections::Dictionary<uint32_t, size_t> _lookup;
+        ArbUt::List<Script*> _scripts;
+        ArbUt::Dictionary<uint32_t, size_t> _lookup;
 
     public:
         ~ScriptSet() {
@@ -33,7 +33,7 @@ namespace CreatureLib::Battling {
             _lookup.Insert(script->GetName(), _scripts.Count() - 1);
         }
 
-        Script* Get(const ConstString& key) const { return Get(key.GetHash()); }
+        Script* Get(const ArbUt::CaseInsensitiveConstString& key) const { return Get(key.GetHash()); }
 
         Script* Get(uint32_t keyHash) const noexcept {
             size_t v;
@@ -43,7 +43,7 @@ namespace CreatureLib::Battling {
             return nullptr;
         }
 
-        void Remove(const ConstString& key) { Remove(key.GetHash()); }
+        void Remove(const ArbUt::CaseInsensitiveConstString& key) { Remove(key.GetHash()); }
 
         void Remove(uint32_t keyHash) {
             size_t v;
@@ -65,13 +65,13 @@ namespace CreatureLib::Battling {
             _lookup.Clear();
         }
 
-        bool Has(const ConstString& key) const { return _lookup.Has(key); }
+        bool Has(const ArbUt::CaseInsensitiveConstString& key) const { return _lookup.Has(key); }
 
         bool Has(uint32_t keyHash) const { return _lookup.Has(keyHash); }
 
         inline size_t Count() const { return _scripts.Count(); }
 
-        const Arbutils::Collections::List<Script*>* GetIterator() const { return &_scripts; }
+        const ArbUt::List<Script*>* GetIterator() const { return &_scripts; }
     };
 }
 

src/Battling/ScriptHandling/ScriptSource.hpp

@@ -8,11 +8,11 @@
 namespace CreatureLib::Battling {
     class ScriptSource {
         bool _areScriptsInitialized = false;
-        List<ScriptWrapper> _scripts;
+        ArbUt::List<ScriptWrapper> _scripts;
         ScriptAggregator _scriptsIterator;
 
     protected:
-        virtual void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) = 0;
+        virtual void GetActiveScripts(ArbUt::List<ScriptWrapper>& scripts) = 0;
         void ResetActiveScripts() { _areScriptsInitialized = false; }
 
     public: