Update to new Arbutils

CInterface/Battling/Battle.cpp

@@ -56,21 +56,21 @@ export BattleParty* const* CreatureLib_Battle_GetParties(const Battle* p) {
 }
 
 export Script* CreatureLib_Battle_GetVolatileScript(Battle* p, const char* key) {
-    return p->GetVolatileScript(ConstString::GetHash(key)).GetRaw();
+    return p->GetVolatileScript(ArbUt::StringView::CalculateHash(key)).GetRaw();
 }
 export uint8_t CreatureLib_Battle_AddVolatileScriptByName(Battle* p, const char* key) {
-    Try(p->AddVolatileScript(ConstString(key));)
+    Try(p->AddVolatileScript(ArbUt::StringView(key));)
 }
 export uint8_t CreatureLib_Battle_AddVolatileScript(Battle* p, Script* script) { Try(p->AddVolatileScript(script);) }
 
 export uint8_t CreatureLib_Battle_RemoveVolatileScript(Battle* p, const char* key) {
-    Try(p->RemoveVolatileScript(ConstString::GetHash(key));)
+    Try(p->RemoveVolatileScript(ArbUt::StringView::CalculateHash(key));)
 }
 export uint8_t CreatureLib_Battle_RemoveVolatileScriptWithScript(Battle* p, Script* script) {
     Try(p->RemoveVolatileScript(script);)
 }
 export bool CreatureLib_Battle_HasVolatileScript(Battle* p, const char* key) {
-    return p->HasVolatileScript(ConstString::GetHash(key));
+    return p->HasVolatileScript(ArbUt::StringView::CalculateHash(key));
 }
 
 export uint8_t CreatureLib_Battle_RegisterEventListener(Battle* p, void (*func)(const EventData*)) {

CInterface/Battling/Creature.cpp

@@ -36,12 +36,12 @@ SIMPLE_GET_FUNC(Creature, GetGender, CreatureLib::Library::Gender);
 SIMPLE_GET_FUNC(Creature, GetColoring, uint8_t);
 
 export bool CreatureLib_Creature_HasHeldItem(const Creature* p, const char* name) {
-    return p->HasHeldItem(ArbUt::CaseInsensitiveConstString(name));
+    return p->HasHeldItem(ArbUt::StringView(name));
 }
 export bool CreatureLib_Creature_HasHeldItemWithHash(const Creature* p, uint32_t hash) { return p->HasHeldItem(hash); }
 SIMPLE_GET_FUNC_SMART_PTR(Creature, GetHeldItem, const CreatureLib::Library::Item*);
 export uint8_t CreatureLib_Creature_SetHeldItem(Creature* p, const char* name) {
-    Try(p->SetHeldItem(ArbUt::CaseInsensitiveConstString(name));)
+    Try(p->SetHeldItem(ArbUt::StringView(name));)
 }
 export uint8_t CreatureLib_Creature_SetHeldItemWithHash(Creature* p, uint32_t hash) { Try(p->SetHeldItem(hash);) }
 export void CreatureLib_Creature_SetHeldItemFromItem(Creature* p, const CreatureLib::Library::Item* item) {
@@ -51,7 +51,7 @@ SIMPLE_GET_FUNC(Creature, GetCurrentHealth, uint32_t);
 SIMPLE_GET_FUNC_SMART_PTR(Creature, GetBattle, Battle*);
 SIMPLE_GET_FUNC_SMART_PTR(Creature, GetBattleSide, BattleSide*);
 SIMPLE_GET_FUNC(Creature, IsOnBattleField, bool);
-export const char* CreatureLib_Creature_GetNickname(Creature* p) { return p->GetNickname().c_str(); }
+export const char* CreatureLib_Creature_GetNickname(Creature* p) { return p->GetNickname().data(); }
 export bool CreatureLib_Creature_HasType(Creature* p, uint8_t type) { return p->HasType(type); }
 SIMPLE_GET_FUNC(Creature, GetMaxHealth, uint32_t);
 export uint8_t CreatureLib_Creature_ChangeLevelBy(Creature* p, int8_t level) { Try(p->ChangeLevelBy(level);) }
@@ -62,26 +62,26 @@ export uint8_t CreatureLib_Creature_Heal(Creature* p, uint32_t health, bool canR
     Try(p->Heal(health, canRevive);)
 }
 export uint8_t CreatureLib_Creature_OverrideActiveTalent(Creature* p, const char* talent) {
-    Try(p->OverrideActiveTalent(ArbUt::CaseInsensitiveConstString(talent));)
+    Try(p->OverrideActiveTalent(ArbUt::StringView(talent));)
 }
 export uint8_t CreatureLib_Creature_AddExperience(Creature* p, uint32_t experience) {
     Try(p->AddExperience(experience);)
 }
 export uint8_t CreatureLib_Creature_ClearVolatileScripts(Creature* p) { Try(p->ClearVolatileScripts();) }
 export uint8_t CreatureLib_Creature_AddVolatileScriptByName(Creature* p, const char* scriptName) {
-    Try(p->AddVolatileScript(ArbUt::CaseInsensitiveConstString(scriptName));)
+    Try(p->AddVolatileScript(ArbUt::StringView(scriptName));)
 }
 export uint8_t CreatureLib_Creature_AddVolatileScript(Creature* p, Script* script) {
     Try(p->AddVolatileScript(script);)
 }
 export uint8_t CreatureLib_Creature_RemoveVolatileScriptByName(Creature* p, const char* scriptName) {
-    Try(p->RemoveVolatileScript(ArbUt::CaseInsensitiveConstString(scriptName));)
+    Try(p->RemoveVolatileScript(ArbUt::StringView(scriptName));)
 }
 export uint8_t CreatureLib_Creature_RemoveVolatileScript(Creature* p, Script* script) {
     Try(p->RemoveVolatileScript(script);)
 }
 export bool CreatureLib_Creature_HasVolatileScript(Creature* p, const char* scriptName) {
-    return p->HasVolatileScript(ArbUt::CaseInsensitiveConstString(scriptName));
+    return p->HasVolatileScript(ArbUt::StringView(scriptName));
 }
 export size_t CreatureLib_Creature_GetAttacksCount(Creature* p) { return p->GetAttacks().Count(); }
 export LearnedAttack* const* CreatureLib_Creature_GetAttack(Creature* p, size_t index) {

CInterface/Battling/Script.cpp

@@ -11,8 +11,7 @@ export const char* CreatureLib_Script_GetName(Script* p) { return p->GetName().c
 export uint8_t CreatureLib_Script_OnBeforeTurn(Script* p, const BaseTurnChoice* choice) {
     Try(p->OnBeforeTurn(choice));
 }
-export uint8_t CreatureLib_Script_ChangeAttack(Script* p, AttackTurnChoice* choice,
-                                               ArbUt::CaseInsensitiveConstString* outAttack) {
+export uint8_t CreatureLib_Script_ChangeAttack(Script* p, AttackTurnChoice* choice, ArbUt::StringView* outAttack) {
     Try(p->ChangeAttack(choice, outAttack));
 }
 export uint8_t CreatureLib_Script_PreventAttack(Script* p, ExecutingAttack* attack, bool* outResult) {

CInterface/Battling/ScriptResolver.cpp

@@ -11,5 +11,5 @@ export uint8_t CreatureLib_ScriptResolver_Initialize(ScriptResolver* p, BattleLi
 };
 export uint8_t CreatureLib_ScriptResolver_LoadScript(Script*& out, ScriptResolver* p, ScriptCategory category,
                                                      const char* scriptName) {
-    Try(out = p->LoadScript(category, ArbUt::CaseInsensitiveConstString(scriptName));)
+    Try(out = p->LoadScript(category, ArbUt::StringView(scriptName));)
 };