From a27bb3e6877a3450a792172edb2092cfc6542041 Mon Sep 17 00:00:00 2001 From: Mordred Date: Thu, 27 Jan 2022 21:24:54 +0100 Subject: [PATCH] Remove Component namespace --- deps/datReader/Exd.h | 4 +- deps/datReader/Exd/Common.h | 6 +- deps/datReader/Exd/Structs.h | 550 +++++++++--------- deps/datReaderPs3/Exd.h | 4 +- deps/datReaderPs3/Exd/Common.h | 6 +- deps/datReaderPs3/Exd/Structs.h | 550 +++++++++--------- src/api/PlayerMinimal.cpp | 18 +- src/api/main.cpp | 2 +- src/common/Exd/ExdData.h | 2 +- src/scripts/common/aethernet/Aetheryte.cpp | 2 +- .../common/aethernet/HousingAethernet.cpp | 2 +- src/scripts/common/warptaxi/WarpTaxi.cpp | 4 +- src/tools/BattleNpcParserPs3/ExdData.h | 2 +- src/tools/BattleNpcParserPs3/main.cpp | 6 +- src/tools/action_parse/main.cpp | 6 +- src/tools/event_object_parser/main.cpp | 8 +- src/tools/exd_struct_test/main.cpp | 2 +- src/tools/quest_parser/main.cpp | 6 +- src/world/Action/Action.cpp | 6 +- src/world/Action/Action.h | 4 +- src/world/Action/EventAction.cpp | 2 +- src/world/Action/EventItemAction.cpp | 4 +- src/world/Action/EventItemAction.h | 4 +- src/world/Action/ItemAction.cpp | 2 +- src/world/Action/ItemAction.h | 4 +- src/world/Action/MountAction.cpp | 2 +- src/world/Action/MountAction.h | 2 +- src/world/Actor/BNpc.cpp | 26 +- src/world/Actor/Chara.cpp | 2 +- src/world/Actor/Player.cpp | 52 +- src/world/Actor/PlayerInventory.cpp | 10 +- src/world/Actor/PlayerSql.cpp | 4 +- src/world/ContentFinder/ContentFinder.cpp | 16 +- src/world/Inventory/Item.cpp | 2 +- src/world/Manager/ActionMgr.cpp | 14 +- src/world/Manager/ActionMgr.h | 12 +- src/world/Manager/DebugCommandMgr.cpp | 2 +- src/world/Manager/EventMgr.cpp | 20 +- src/world/Manager/HousingMgr.cpp | 4 +- src/world/Manager/InventoryMgr.cpp | 2 +- src/world/Manager/ItemMgr.cpp | 2 +- src/world/Manager/PartyMgr.cpp | 2 +- src/world/Manager/PlayerMgr.cpp | 4 +- src/world/Manager/QuestMgr.cpp | 4 +- src/world/Manager/ShopMgr.cpp | 12 +- src/world/Manager/TerritoryMgr.cpp | 28 +- src/world/Manager/TerritoryMgr.h | 4 +- src/world/Math/CalcBattle.cpp | 4 +- src/world/Math/CalcStats.cpp | 14 +- src/world/Network/Handlers/ActionHandler.cpp | 12 +- src/world/Network/Handlers/CFHandlers.cpp | 4 +- src/world/Network/Handlers/EventHandlers.cpp | 2 +- .../Network/Handlers/GMCommandHandlers.cpp | 4 +- .../Network/Handlers/PacketCommandHandler.cpp | 2 +- src/world/Script/ScriptMgr.cpp | 2 +- src/world/StatusEffect/StatusEffect.cpp | 2 +- src/world/Territory/HousingZone.cpp | 2 +- src/world/Territory/InstanceContent.cpp | 6 +- src/world/Territory/InstanceContent.h | 6 +- src/world/Territory/InstanceObjectCache.cpp | 4 +- src/world/Territory/Land.cpp | 4 +- src/world/Territory/Land.h | 4 +- src/world/Territory/QuestBattle.cpp | 6 +- src/world/Territory/QuestBattle.h | 6 +- src/world/Territory/Territory.cpp | 8 +- src/world/Territory/Territory.h | 4 +- 66 files changed, 764 insertions(+), 764 deletions(-) diff --git a/deps/datReader/Exd.h b/deps/datReader/Exd.h index 81365e2e..8cf40658 100644 --- a/deps/datReader/Exd.h +++ b/deps/datReader/Exd.h @@ -54,7 +54,7 @@ namespace xiv::exd const std::vector< Field > get_row( uint32_t id ); template< typename T > - std::shared_ptr< Component::Excel::ExcelStruct< T > > get_row( uint32_t id ) + std::shared_ptr< Excel::ExcelStruct< T > > get_row( uint32_t id ) { using namespace xiv::utils; auto cacheEntryIt = _idCache.find( id ); @@ -75,7 +75,7 @@ namespace xiv::exd std::vector< char > dataCpy = file_ptr->get_data_sections().front(); std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) ); - auto pSheet = std::make_shared< Component::Excel::ExcelStruct< T > >(); + auto pSheet = std::make_shared< Excel::ExcelStruct< T > >(); // Get the vector fields for the given record and preallocate it auto fields = _data[ id ]; diff --git a/deps/datReader/Exd/Common.h b/deps/datReader/Exd/Common.h index 754d7392..b0acf8b1 100644 --- a/deps/datReader/Exd/Common.h +++ b/deps/datReader/Exd/Common.h @@ -1,6 +1,6 @@ #pragma once -namespace Component::Excel +namespace Excel { struct ExcelDataRowHeader @@ -29,8 +29,8 @@ namespace Component::Excel /* struct LinkList::Holder { - Common::Component::Excel::LinkList m_begin; - Common::Component::Excel::LinkList m_end; + Common::Excel::LinkList m_begin; + Common::Excel::LinkList m_end; uint32_t m_size; };*/ diff --git a/deps/datReader/Exd/Structs.h b/deps/datReader/Exd/Structs.h index 4ffa0a1a..b86726d1 100644 --- a/deps/datReader/Exd/Structs.h +++ b/deps/datReader/Exd/Structs.h @@ -3,7 +3,7 @@ #include "Common.h" #include -namespace Component::Excel +namespace Excel { template< typename T > @@ -23,14 +23,14 @@ namespace Component::Excel return reinterpret_cast< uint8_t* >( &_data ); }; - const std::string& getString( Component::Excel::StringOffset offset ) + const std::string& getString( Excel::StringOffset offset ) { return _strings[ offset.m_offset ]; }; }; template< class T > - using ExcelStructPtr = std::shared_ptr< Component::Excel::ExcelStruct< T > >; + using ExcelStructPtr = std::shared_ptr< Excel::ExcelStruct< T > >; ///////////////////////////////////////////////////////// @@ -57,10 +57,10 @@ namespace Component::Excel /* 33329 */ struct ItemTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset Help; - Component::Excel::StringOffset UIName; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset Help; + Excel::StringOffset UIName; int8_t SGG; int8_t PLG; int8_t VOW; @@ -140,7 +140,7 @@ namespace Component::Excel /* 35156 */ struct AddonTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 35157 */ @@ -152,7 +152,7 @@ namespace Component::Excel /* 35338 */ struct InstanceContentTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 35339 */ @@ -220,9 +220,9 @@ namespace Component::Excel /* 63505 */ struct ClassJobTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Abbreviation; - Component::Excel::StringOffset NameFemale; + Excel::StringOffset Name; + Excel::StringOffset Abbreviation; + Excel::StringOffset NameFemale; }; /* 63506 */ @@ -231,7 +231,7 @@ namespace Component::Excel ClassJobTextStruct Text; int8_t padding0[4]; uint64_t ModelJobStone; - Component::Excel::StringOffset EnText; + Excel::StringOffset EnText; uint32_t JobCrystalItemId; uint32_t ARRRelicQuestId; uint32_t ARRFinalJobQuest; @@ -264,8 +264,8 @@ namespace Component::Excel /* 63507 */ struct TribeTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset NameFemale; + Excel::StringOffset Name; + Excel::StringOffset NameFemale; }; /* 63508 */ @@ -285,7 +285,7 @@ namespace Component::Excel /* 66076 */ struct ActionTimeline { - Component::Excel::StringOffset Filename; + Excel::StringOffset Filename; uint8_t Type; uint8_t Priority; uint8_t Stance; @@ -308,8 +308,8 @@ namespace Component::Excel /* 67373 */ struct ActionTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 67374 */ @@ -418,10 +418,10 @@ namespace Component::Excel /* 86192 */ struct EventItemTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset Help; - Component::Excel::StringOffset UIName; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset Help; + Excel::StringOffset UIName; int8_t SGG; int8_t PLG; int8_t VOW; @@ -448,7 +448,7 @@ namespace Component::Excel /* 100766 */ struct WeatherTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 100767 */ @@ -461,7 +461,7 @@ namespace Component::Excel /* 139964 */ struct WeaponTimeline { - Component::Excel::StringOffset File; + Excel::StringOffset File; int16_t NextWeaponTimeline; int8_t padding0[2]; }; @@ -469,7 +469,7 @@ namespace Component::Excel /* 161452 */ struct MotionTimeline { - Component::Excel::StringOffset filename; + Excel::StringOffset filename; uint8_t BlendGroup; uint8_t padding0 : 5; uint8_t IsLipEnable : 1; @@ -611,7 +611,7 @@ namespace Component::Excel /* 195168 */ struct EmoteTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 195169 */ @@ -649,8 +649,8 @@ namespace Component::Excel /* 195171 */ struct AetheryteTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; + Excel::StringOffset SGL; + Excel::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -687,8 +687,8 @@ namespace Component::Excel /* 195176 */ struct TerritoryType { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset LVB; + Excel::StringOffset Name; + Excel::StringOffset LVB; uint32_t EventHandler; int32_t RegionIcon; int32_t AreaIcon; @@ -721,7 +721,7 @@ namespace Component::Excel /* 195177 */ struct ItemUICategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 195178 */ @@ -750,7 +750,7 @@ namespace Component::Excel /* 195793 */ struct HowToTextStruct { - Component::Excel::StringOffset Title; + Excel::StringOffset Title; }; /* 195794 */ @@ -769,8 +769,8 @@ namespace Component::Excel /* 195795 */ struct AchievementTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 195796 */ @@ -792,7 +792,7 @@ namespace Component::Excel /* 200982 */ struct Jingle { - Component::Excel::StringOffset Path; + Excel::StringOffset Path; }; /* 200983 */ @@ -816,8 +816,8 @@ namespace Component::Excel /* 200985 */ struct GeneralActionTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 200986 */ @@ -835,8 +835,8 @@ namespace Component::Excel /* 200987 */ struct CraftActionTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 200988 */ @@ -857,8 +857,8 @@ namespace Component::Excel /* 200989 */ struct TraitTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 200990 */ @@ -880,8 +880,8 @@ namespace Component::Excel /* 200991 */ struct FCRightsTextStruct { - Component::Excel::StringOffset Text; - Component::Excel::StringOffset Help; + Excel::StringOffset Text; + Excel::StringOffset Help; }; /* 200992 */ @@ -913,7 +913,7 @@ namespace Component::Excel /* 200994 */ struct MonsterNoteTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 200995 */ @@ -968,8 +968,8 @@ namespace Component::Excel /* 201001 */ struct PetActionTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 201002 */ @@ -987,7 +987,7 @@ namespace Component::Excel /* 201003 */ struct EquipSlotCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 201004 */ @@ -1010,7 +1010,7 @@ namespace Component::Excel /* 201007 */ struct MarkerTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 201008 */ @@ -1023,8 +1023,8 @@ namespace Component::Excel /* 201009 */ struct BuddyActionTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 201010 */ @@ -1040,8 +1040,8 @@ namespace Component::Excel /* 201011 */ struct MainCommandTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 201012 */ @@ -1058,7 +1058,7 @@ namespace Component::Excel /* 201013 */ struct FieldMarkerTextStruct { - Component::Excel::StringOffset Help; + Excel::StringOffset Help; }; /* 201014 */ @@ -1073,11 +1073,11 @@ namespace Component::Excel /* 201015 */ struct CompanionTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset Help; - Component::Excel::StringOffset Expository; - Component::Excel::StringOffset Cry; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset Help; + Excel::StringOffset Expository; + Excel::StringOffset Cry; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1116,11 +1116,11 @@ namespace Component::Excel /* 201017 */ struct MountTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset Help; - Component::Excel::StringOffset Expository; - Component::Excel::StringOffset Cry; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset Help; + Excel::StringOffset Expository; + Excel::StringOffset Cry; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1133,9 +1133,9 @@ namespace Component::Excel struct Mount { MountTextStruct Text; - Component::Excel::StringOffset CallSE; - Component::Excel::StringOffset CallFalseSE; - Component::Excel::StringOffset ExitSE; + Excel::StringOffset CallSE; + Excel::StringOffset CallFalseSE; + Excel::StringOffset ExitSE; float Slowdown; float MoveAccel_Run; float MoveAccel_Walk; @@ -1167,7 +1167,7 @@ namespace Component::Excel /* 201019 */ struct OnlineStatusTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 201020 */ @@ -1184,8 +1184,8 @@ namespace Component::Excel /* 201021 */ struct TitleTextStruct { - Component::Excel::StringOffset Male; - Component::Excel::StringOffset Female; + Excel::StringOffset Male; + Excel::StringOffset Female; uint8_t padding0 : 7; uint8_t Front : 1; int8_t padding1[3]; @@ -1200,9 +1200,9 @@ namespace Component::Excel /* 201023 */ struct ENpcTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset Title; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset Title; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1234,8 +1234,8 @@ namespace Component::Excel /* 201026 */ struct LogFilterTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 201027 */ @@ -1262,9 +1262,9 @@ namespace Component::Excel /* 201029 */ struct PlaceNameTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset SWT; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset SWT; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1309,7 +1309,7 @@ namespace Component::Excel /* 201034 */ struct FCHierarchyTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 201035 */ @@ -1321,7 +1321,7 @@ namespace Component::Excel /* 201036 */ struct FCReputationTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 201037 */ @@ -1338,7 +1338,7 @@ namespace Component::Excel /* 201038 */ struct TownTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 201039 */ @@ -1374,8 +1374,8 @@ namespace Component::Excel /* 223113 */ struct BNpcTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; + Excel::StringOffset SGL; + Excel::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1394,8 +1394,8 @@ namespace Component::Excel /* 223115 */ struct EObjTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; + Excel::StringOffset SGL; + Excel::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1423,8 +1423,8 @@ namespace Component::Excel /* 223117 */ struct TreasureTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; + Excel::StringOffset SGL; + Excel::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1452,13 +1452,13 @@ namespace Component::Excel /* 223119 */ struct ExportedSG { - Component::Excel::StringOffset SGFilePath; + Excel::StringOffset SGFilePath; }; /* 223120 */ struct Festival { - Component::Excel::StringOffset name; + Excel::StringOffset name; }; /* 228343 */ @@ -1494,14 +1494,14 @@ namespace Component::Excel /* 257957 */ struct WorldTextStruct { - Component::Excel::StringOffset Help; + Excel::StringOffset Help; }; /* 257958 */ struct World { WorldTextStruct Text; - Component::Excel::StringOffset Name; + Excel::StringOffset Name; uint8_t UserType; uint8_t DCGroup; uint8_t padding0 : 7; @@ -1512,8 +1512,8 @@ namespace Component::Excel /* 258037 */ struct GuardianDeityTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 258038 */ @@ -1527,7 +1527,7 @@ namespace Component::Excel /* 258039 */ struct MainCommandCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 258040 */ @@ -1554,37 +1554,37 @@ namespace Component::Excel /* 258043 */ struct CharaMakeNameTextStruct { - Component::Excel::StringOffset HuM_M_; - Component::Excel::StringOffset HuM_F_; - Component::Excel::StringOffset HuM_L_; - Component::Excel::StringOffset HuH_M_; - Component::Excel::StringOffset HuH_F_; - Component::Excel::StringOffset HuH_L_; - Component::Excel::StringOffset El_M_; - Component::Excel::StringOffset El_F_; - Component::Excel::StringOffset ElF_L_; - Component::Excel::StringOffset ElS_L_; - Component::Excel::StringOffset MqS_M_; - Component::Excel::StringOffset MqS_F_; - Component::Excel::StringOffset MqS_ML_; - Component::Excel::StringOffset MqS_FL_; - Component::Excel::StringOffset MqM_M_; - Component::Excel::StringOffset MqM_F_; - Component::Excel::StringOffset MqM_L_; - Component::Excel::StringOffset LaP_MF_; - Component::Excel::StringOffset LaP_ML_; - Component::Excel::StringOffset LaP_MR_; - Component::Excel::StringOffset LaD_MN_; - Component::Excel::StringOffset LaD_MR_; - Component::Excel::StringOffset LaD_FN_; - Component::Excel::StringOffset LaD_FR_; - Component::Excel::StringOffset RoZ_MF_; - Component::Excel::StringOffset RoZ_ML_; - Component::Excel::StringOffset RoZ_FF_; - Component::Excel::StringOffset RoZ_FL_; - Component::Excel::StringOffset RoR_F_; - Component::Excel::StringOffset RoR_ML_; - Component::Excel::StringOffset RoR_FL_; + Excel::StringOffset HuM_M_; + Excel::StringOffset HuM_F_; + Excel::StringOffset HuM_L_; + Excel::StringOffset HuH_M_; + Excel::StringOffset HuH_F_; + Excel::StringOffset HuH_L_; + Excel::StringOffset El_M_; + Excel::StringOffset El_F_; + Excel::StringOffset ElF_L_; + Excel::StringOffset ElS_L_; + Excel::StringOffset MqS_M_; + Excel::StringOffset MqS_F_; + Excel::StringOffset MqS_ML_; + Excel::StringOffset MqS_FL_; + Excel::StringOffset MqM_M_; + Excel::StringOffset MqM_F_; + Excel::StringOffset MqM_L_; + Excel::StringOffset LaP_MF_; + Excel::StringOffset LaP_ML_; + Excel::StringOffset LaP_MR_; + Excel::StringOffset LaD_MN_; + Excel::StringOffset LaD_MR_; + Excel::StringOffset LaD_FN_; + Excel::StringOffset LaD_FR_; + Excel::StringOffset RoZ_MF_; + Excel::StringOffset RoZ_ML_; + Excel::StringOffset RoZ_FF_; + Excel::StringOffset RoZ_FL_; + Excel::StringOffset RoR_F_; + Excel::StringOffset RoR_ML_; + Excel::StringOffset RoR_FL_; }; /* 258044 */ @@ -1596,9 +1596,9 @@ namespace Component::Excel /* 258046 */ struct LobbyTextStruct { - Component::Excel::StringOffset Text; - Component::Excel::StringOffset Sub; - Component::Excel::StringOffset Help; + Excel::StringOffset Text; + Excel::StringOffset Sub; + Excel::StringOffset Help; }; /* 258047 */ @@ -1626,7 +1626,7 @@ namespace Component::Excel /* 258050 */ struct WorldDCGroupType { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264223 */ @@ -1668,7 +1668,7 @@ namespace Component::Excel /* 264226 */ struct ClassJobCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264227 */ @@ -1701,7 +1701,7 @@ namespace Component::Excel /* 264229 */ struct HowToPageTextStruct { - Component::Excel::StringOffset Text[3]; + Excel::StringOffset Text[3]; }; /* 264230 */ @@ -1718,7 +1718,7 @@ namespace Component::Excel /* 264231 */ struct Map { - Component::Excel::StringOffset Path; + Excel::StringOffset Path; uint32_t DiscoveryFlag; uint16_t Unknown; uint16_t Scale; @@ -1742,8 +1742,8 @@ namespace Component::Excel /* 264233 */ struct ContentsNoteTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 264234 */ @@ -1762,7 +1762,7 @@ namespace Component::Excel /* 264240 */ struct FCActivityTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 264241 */ @@ -1789,13 +1789,13 @@ namespace Component::Excel /* 264319 */ struct QuestTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264320 */ struct QuestDefineStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; uint32_t Value; }; @@ -1857,7 +1857,7 @@ namespace Component::Excel QuestEventListenerStruct EventListener[64]; // 594 QuestTodoStruct QuestTodo[24]; // 8f4 QuestRewardStruct Reward; - Component::Excel::StringOffset Script; + Excel::StringOffset Script; uint32_t PrevQuest[3]; uint32_t ExcludeQuest[2]; uint32_t InstanceContent[3]; @@ -1924,9 +1924,9 @@ namespace Component::Excel /* 264325 */ struct ContentRouletteTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Description; - Component::Excel::StringOffset Contents; + Excel::StringOffset Name; + Excel::StringOffset Description; + Excel::StringOffset Contents; }; /* 264326 */ @@ -1951,7 +1951,7 @@ namespace Component::Excel /* 264329 */ struct ActionCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264330 */ @@ -1963,8 +1963,8 @@ namespace Component::Excel /* 264331 */ struct StatusTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 264332 */ @@ -1998,7 +1998,7 @@ namespace Component::Excel /* 264333 */ struct AchievementKindTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264334 */ @@ -2010,7 +2010,7 @@ namespace Component::Excel /* 264335 */ struct AchievementCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264336 */ @@ -2027,8 +2027,8 @@ namespace Component::Excel /* 264337 */ struct RaceTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset NameFemale; + Excel::StringOffset Name; + Excel::StringOffset NameFemale; }; /* 264338 */ @@ -2044,8 +2044,8 @@ namespace Component::Excel /* 264339 */ struct BaseParamTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 264340 */ @@ -2067,7 +2067,7 @@ namespace Component::Excel /* 264342 */ struct ItemSearchCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264343 */ @@ -2084,7 +2084,7 @@ namespace Component::Excel /* 264344 */ struct ItemSearchClassFilterTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264345 */ @@ -2110,7 +2110,7 @@ namespace Component::Excel /* 264347 */ struct CompanionMoveTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264348 */ @@ -2122,8 +2122,8 @@ namespace Component::Excel /* 264349 */ struct RoleTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset ShortName; + Excel::StringOffset Name; + Excel::StringOffset ShortName; }; /* 264350 */ @@ -2136,9 +2136,9 @@ namespace Component::Excel /* 264351 */ struct BuddyEquipTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset UIName; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset UIName; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2209,7 +2209,7 @@ namespace Component::Excel /* 264358 */ struct RelicNoteCategoryTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 264359 */ @@ -2272,8 +2272,8 @@ namespace Component::Excel /* 264367 */ struct GatheringPointNameTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; + Excel::StringOffset SGL; + Excel::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2292,7 +2292,7 @@ namespace Component::Excel /* 264369 */ struct CraftTypeTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264370 */ @@ -2307,7 +2307,7 @@ namespace Component::Excel /* 264371 */ struct NotebookDivisionTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264372 */ @@ -2323,8 +2323,8 @@ namespace Component::Excel /* 264373 */ struct LeveTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Objective; + Excel::StringOffset Name; + Excel::StringOffset Objective; }; /* 264374 */ @@ -2403,7 +2403,7 @@ namespace Component::Excel /* 264379 */ struct ContentTypeTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264380 */ @@ -2417,9 +2417,9 @@ namespace Component::Excel /* 264381 */ struct GrandCompanyTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset SWT; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset SWT; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2440,7 +2440,7 @@ namespace Component::Excel /* 264383 */ struct HowToCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264384 */ @@ -2452,14 +2452,14 @@ namespace Component::Excel /* 264385 */ struct ConfigurationKeyTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 264386 */ struct ConfigKey { ConfigurationKeyTextStruct Text; - Component::Excel::StringOffset Label; + Excel::StringOffset Label; uint8_t Param; uint8_t Platform; uint8_t Category; @@ -2486,9 +2486,9 @@ namespace Component::Excel /* 264389 */ struct AdventureTextStruct { - Component::Excel::StringOffset TitleText; - Component::Excel::StringOffset HintText; - Component::Excel::StringOffset FlavorText; + Excel::StringOffset TitleText; + Excel::StringOffset HintText; + Excel::StringOffset FlavorText; }; /* 264390 */ @@ -2529,7 +2529,7 @@ namespace Component::Excel /* 264393 */ struct RetainerTaskRandomTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264394 */ @@ -2552,12 +2552,12 @@ namespace Component::Excel /* 264396 */ struct FateTextStruct { - Component::Excel::StringOffset TitleText; - Component::Excel::StringOffset DescriptionText; - Component::Excel::StringOffset DescriptionText2; - Component::Excel::StringOffset TodoName1; - Component::Excel::StringOffset TodoName2; - Component::Excel::StringOffset TodoName3; + Excel::StringOffset TitleText; + Excel::StringOffset DescriptionText; + Excel::StringOffset DescriptionText2; + Excel::StringOffset TodoName1; + Excel::StringOffset TodoName2; + Excel::StringOffset TodoName3; }; /* 264397 */ @@ -2595,7 +2595,7 @@ namespace Component::Excel /* 264399 */ struct FCActivityCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264400 */ @@ -2609,7 +2609,7 @@ namespace Component::Excel /* 264401 */ struct FCAuthorityTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264402 */ @@ -2624,7 +2624,7 @@ namespace Component::Excel /* 264403 */ struct FCAuthorityCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264404 */ @@ -2636,8 +2636,8 @@ namespace Component::Excel /* 264405 */ struct CompanyActionTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Help; + Excel::StringOffset Name; + Excel::StringOffset Help; }; /* 264406 */ @@ -2662,7 +2662,7 @@ namespace Component::Excel /* 264408 */ struct FCProfileTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264409 */ @@ -2676,7 +2676,7 @@ namespace Component::Excel /* 264410 */ struct ItemSeriesTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264411 */ @@ -2688,7 +2688,7 @@ namespace Component::Excel /* 264412 */ struct ItemSpecialBonusTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 264413 */ @@ -2751,9 +2751,9 @@ namespace Component::Excel /* 264418 */ struct BeastTribeTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; - Component::Excel::StringOffset ReputationValue; + Excel::StringOffset SGL; + Excel::StringOffset PLR; + Excel::StringOffset ReputationValue; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2774,8 +2774,8 @@ namespace Component::Excel /* 264420 */ struct BeastReputationRankTextStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; + Excel::StringOffset SGL; + Excel::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2797,8 +2797,8 @@ namespace Component::Excel /* 271695 */ struct HousingPresetNameStruct { - Component::Excel::StringOffset SGL; - Component::Excel::StringOffset PLR; + Excel::StringOffset SGL; + Excel::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2888,7 +2888,7 @@ namespace Component::Excel /* 326984 */ struct Channeling { - Component::Excel::StringOffset File; + Excel::StringOffset File; float WidthScale; uint8_t LimitDist; int8_t padding0[3]; @@ -2908,7 +2908,7 @@ namespace Component::Excel /* 326986 */ struct BNpcState { - Component::Excel::StringOffset Attribute[3]; + Excel::StringOffset Attribute[3]; float Scale; int32_t LoopTimeline; uint16_t Idle; @@ -2950,7 +2950,7 @@ namespace Component::Excel /* 326989 */ struct BNpcParts { - Component::Excel::StringOffset Attribute[4]; + Excel::StringOffset Attribute[4]; float OffsetX[4]; float OffsetZ[4]; uint16_t Parts[4]; @@ -3007,7 +3007,7 @@ namespace Component::Excel /* 326996 */ struct EventActionTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 326997 */ @@ -3025,8 +3025,8 @@ namespace Component::Excel /* 326998 */ struct Omen { - Component::Excel::StringOffset Path; - Component::Excel::StringOffset PathAlly; + Excel::StringOffset Path; + Excel::StringOffset PathAlly; uint8_t Type; uint8_t padding0 : 6; uint8_t LargeScale : 1; @@ -3121,13 +3121,13 @@ namespace Component::Excel /* 342296 */ struct VFX { - Component::Excel::StringOffset Path; + Excel::StringOffset Path; }; /* 342297 */ struct Lockon { - Component::Excel::StringOffset File; + Excel::StringOffset File; }; /* 342298 */ @@ -3142,14 +3142,14 @@ namespace Component::Excel /* 342313 */ struct MotionTimelineAdvanceBlend { - Component::Excel::StringOffset MotionTimelineName; - Component::Excel::StringOffset NextMotionTimelineName; + Excel::StringOffset MotionTimelineName; + Excel::StringOffset NextMotionTimelineName; }; /* 342406 */ struct BGM { - Component::Excel::StringOffset Path; + Excel::StringOffset Path; float DisableRestartResetTime; uint8_t Priority; uint8_t SpecialMode; @@ -3249,7 +3249,7 @@ namespace Component::Excel /* 362339 */ struct GuildleveAssignmentTalkTextStruct { - Component::Excel::StringOffset Talk[8]; + Excel::StringOffset Talk[8]; }; /* 362340 */ @@ -3293,7 +3293,7 @@ namespace Component::Excel /* 362344 */ struct DefaultTalkTextStruct { - Component::Excel::StringOffset Talk[3]; + Excel::StringOffset Talk[3]; }; /* 362345 */ @@ -3318,7 +3318,7 @@ namespace Component::Excel /* 362347 */ struct CraftLeveTalkTextStruct { - Component::Excel::StringOffset Talk[6]; + Excel::StringOffset Talk[6]; }; /* 362348 */ @@ -3425,7 +3425,7 @@ namespace Component::Excel /* 362360 */ struct QuestBattleDefineStruct { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; uint32_t DefineValue; }; @@ -3443,14 +3443,14 @@ namespace Component::Excel /* 362362 */ struct CustomTalkDefineStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; uint32_t Value; }; /* 362363 */ struct CustomTalkTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 362364 */ @@ -3458,7 +3458,7 @@ namespace Component::Excel { CustomTalkDefineStruct Define[30]; CustomTalkTextStruct Text; - Component::Excel::StringOffset Script; + Excel::StringOffset Script; uint32_t MapIcon; uint8_t padding0 : 1; uint8_t ListenHousing : 1; @@ -3487,7 +3487,7 @@ namespace Component::Excel /* 362366 */ struct StoryDefineStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; uint32_t Value; }; @@ -3505,14 +3505,14 @@ namespace Component::Excel StoryDefineStruct Define[40]; StorySequenceStruct Sequence[110]; StoryVisibleListenerStruct VisibleListener[80]; - Component::Excel::StringOffset Script; + Excel::StringOffset Script; uint16_t LayerSetTerritoryType[2]; }; /* 362369 */ struct CompanyLeveRule { - Component::Excel::StringOffset Script; + Excel::StringOffset Script; uint16_t Objective; uint16_t Help; }; @@ -3528,14 +3528,14 @@ namespace Component::Excel /* 362451 */ struct AetheryteSystemDefine { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; uint32_t DefineValue; }; /* 362452 */ struct GatheringTypeTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 362453 */ @@ -3549,7 +3549,7 @@ namespace Component::Excel /* 362454 */ struct GatheringConditionTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 362455 */ @@ -3561,7 +3561,7 @@ namespace Component::Excel /* 362456 */ struct GatheringPointBonusTypeTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 362457 */ @@ -3587,21 +3587,21 @@ namespace Component::Excel /* 362460 */ struct QuestSystemDefine { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; int32_t DefineValue; }; /* 362461 */ struct EventSystemDefine { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; uint32_t DefineValue; }; /* 362462 */ struct JournalGenreTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 362463 */ @@ -3616,27 +3616,27 @@ namespace Component::Excel /* 362464 */ struct LeveSystemDefine { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; int32_t DefineValue; }; /* 362465 */ struct BattleLeveRule { - Component::Excel::StringOffset Script; + Excel::StringOffset Script; }; /* 362466 */ struct LeveVfx { - Component::Excel::StringOffset Path; + Excel::StringOffset Path; int32_t Icon; }; /* 362467 */ struct LeveStringTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 362468 */ @@ -3648,13 +3648,13 @@ namespace Component::Excel /* 362469 */ struct GatheringLeveRule { - Component::Excel::StringOffset Script; + Excel::StringOffset Script; }; /* 362470 */ struct LeveClientTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 362471 */ @@ -3687,7 +3687,7 @@ namespace Component::Excel /* 362475 */ struct LeveAssignmentTypeTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 362476 */ @@ -3703,7 +3703,7 @@ namespace Component::Excel /* 362477 */ struct GuildleveEvaluationTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 362478 */ @@ -3715,14 +3715,14 @@ namespace Component::Excel /* 362479 */ struct OpeningSystemDefine { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; uint32_t DefineValue; }; /* 362480 */ struct StorySystemDefine { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; uint32_t DefineValue; }; @@ -3763,20 +3763,20 @@ namespace Component::Excel /* 362483 */ struct Cutscene { - Component::Excel::StringOffset Path; + Excel::StringOffset Path; }; /* 362484 */ struct DirectorSystemDefine { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; int32_t DefineValue; }; /* 362485 */ struct SE { - Component::Excel::StringOffset Path; + Excel::StringOffset Path; }; /* 362486 */ @@ -3792,7 +3792,7 @@ namespace Component::Excel /* 362487 */ struct ChocoboTaxiStandTextStruct { - Component::Excel::StringOffset Destination; + Excel::StringOffset Destination; }; /* 362488 */ @@ -3811,7 +3811,7 @@ namespace Component::Excel /* 362490 */ struct GCShopItemCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 362491 */ @@ -3830,14 +3830,14 @@ namespace Component::Excel /* 362493 */ struct QuestBattleSystemDefine { - Component::Excel::StringOffset DefineName; + Excel::StringOffset DefineName; uint32_t DefineValue; }; /* 363134 */ struct ContentTalkTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 363135 */ @@ -3903,8 +3903,8 @@ namespace Component::Excel /* 367152 */ struct ScenarioTextStruct { - Component::Excel::StringOffset Label; - Component::Excel::StringOffset Text; + Excel::StringOffset Label; + Excel::StringOffset Text; }; /* 367156 */ @@ -3916,7 +3916,7 @@ namespace Component::Excel /* 367157 */ struct ShopTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 367158 */ @@ -3963,8 +3963,8 @@ namespace Component::Excel /* 367161 */ struct WarpTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Question; + Excel::StringOffset Name; + Excel::StringOffset Question; }; /* 367162 */ @@ -3987,16 +3987,16 @@ namespace Component::Excel /* 367163 */ struct WarpLogicDefineStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; uint32_t Value; }; /* 367164 */ struct WarpLogicTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Yes; - Component::Excel::StringOffset No; + Excel::StringOffset Name; + Excel::StringOffset Yes; + Excel::StringOffset No; }; /* 367165 */ @@ -4004,7 +4004,7 @@ namespace Component::Excel { WarpLogicDefineStruct Define[10]; WarpLogicTextStruct Text; - Component::Excel::StringOffset Script; + Excel::StringOffset Script; uint32_t MapIcon; uint8_t padding0 : 7; uint8_t AcceptCallback : 1; @@ -4026,7 +4026,7 @@ namespace Component::Excel /* 367167 */ struct SpecialShopTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 367168 */ @@ -4060,7 +4060,7 @@ namespace Component::Excel /* 367169 */ struct OpeningDefineStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; uint32_t Value; }; @@ -4068,7 +4068,7 @@ namespace Component::Excel struct Opening { OpeningDefineStruct Define[40]; - Component::Excel::StringOffset Script; + Excel::StringOffset Script; uint32_t Quest; }; @@ -4119,7 +4119,7 @@ namespace Component::Excel /* 370979 */ struct Buddy { - Component::Excel::StringOffset ActionSE[4]; + Excel::StringOffset ActionSE[4]; int32_t BaseEquip[3]; uint8_t Base; int8_t padding0[3]; @@ -4138,8 +4138,8 @@ namespace Component::Excel /* 370981 */ struct PvPRankTextStruct { - Component::Excel::StringOffset PvPTitleMale[3]; - Component::Excel::StringOffset PvPTitleFemale[3]; + Excel::StringOffset PvPTitleMale[3]; + Excel::StringOffset PvPTitleFemale[3]; }; /* 370982 */ @@ -4165,7 +4165,7 @@ namespace Component::Excel /* 370987 */ struct RecipeElementTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 370988 */ @@ -4183,7 +4183,7 @@ namespace Component::Excel /* 370990 */ struct FishParameterTextStruct { - Component::Excel::StringOffset NoteHelp; + Excel::StringOffset NoteHelp; }; /* 370991 */ @@ -4202,7 +4202,7 @@ namespace Component::Excel /* 370992 */ struct FishingSpotTextStruct { - Component::Excel::StringOffset SpotName; + Excel::StringOffset SpotName; }; /* 370993 */ @@ -4227,7 +4227,7 @@ namespace Component::Excel /* 370994 */ struct JournalCategoryTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 370995 */ @@ -4305,7 +4305,7 @@ namespace Component::Excel /* 374116 */ struct CompleteJournalTextStruct { - Component::Excel::StringOffset Name; + Excel::StringOffset Name; }; /* 374117 */ @@ -4324,8 +4324,8 @@ namespace Component::Excel /* 374118 */ struct LegacyQuestTextStruct { - Component::Excel::StringOffset Name; - Component::Excel::StringOffset Journal; + Excel::StringOffset Name; + Excel::StringOffset Journal; }; /* 374119 */ @@ -4445,9 +4445,9 @@ namespace Component::Excel /* 374133 */ struct GuildOrderTextStruct { - Component::Excel::StringOffset OperationText; - Component::Excel::StringOffset OrderText[2]; - Component::Excel::StringOffset SummaryText; + Excel::StringOffset OperationText; + Excel::StringOffset OrderText[2]; + Excel::StringOffset SummaryText; }; /* 374134 */ @@ -4512,7 +4512,7 @@ namespace Component::Excel /* 383306 */ struct BalloonTextStruct { - Component::Excel::StringOffset Message; + Excel::StringOffset Message; }; /* 383307 */ @@ -4548,7 +4548,7 @@ namespace Component::Excel /* 391161 */ struct InstanceContentTextDataTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 391162 */ @@ -4567,9 +4567,9 @@ namespace Component::Excel /* 397676 */ struct GimmickYesNoTextStruct { - Component::Excel::StringOffset Text1; - Component::Excel::StringOffset Text2; - Component::Excel::StringOffset Text3; + Excel::StringOffset Text1; + Excel::StringOffset Text2; + Excel::StringOffset Text3; }; /* 397677 */ @@ -4581,7 +4581,7 @@ namespace Component::Excel /* 397678 */ struct GimmickBillTextStruct { - Component::Excel::StringOffset Message; + Excel::StringOffset Message; }; /* 397679 */ @@ -4607,7 +4607,7 @@ namespace Component::Excel /* 399530 */ struct FateEventTextStruct { - Component::Excel::StringOffset MessageText[8]; + Excel::StringOffset MessageText[8]; }; /* 399531 */ @@ -4620,7 +4620,7 @@ namespace Component::Excel /* 399532 */ struct NpcYellTextStruct { - Component::Excel::StringOffset Text; + Excel::StringOffset Text; }; /* 399533 */ diff --git a/deps/datReaderPs3/Exd.h b/deps/datReaderPs3/Exd.h index 0884ce8d..f40a2161 100644 --- a/deps/datReaderPs3/Exd.h +++ b/deps/datReaderPs3/Exd.h @@ -55,7 +55,7 @@ namespace xivps3::exd const std::vector< Field > get_row( uint32_t id ); template< typename T > - std::shared_ptr< Component::Excel::Ps3::ExcelStruct< T > > get_row( uint32_t id ) + std::shared_ptr< Excel::Ps3::ExcelStruct< T > > get_row( uint32_t id ) { using namespace xivps3::utils; auto cacheEntryIt = _idCache.find( id ); @@ -76,7 +76,7 @@ namespace xivps3::exd std::vector< char > dataCpy = file_ptr->get_data_sections().front(); std::istringstream iss( std::string( dataCpy.begin(), dataCpy.end() ) ); - auto pSheet = std::make_shared< Component::Excel::Ps3::ExcelStruct< T > >(); + auto pSheet = std::make_shared< Excel::Ps3::ExcelStruct< T > >(); // Get the vector fields for the given record and preallocate it auto fields = _data[ id ]; diff --git a/deps/datReaderPs3/Exd/Common.h b/deps/datReaderPs3/Exd/Common.h index 83fb1382..df9e79f7 100644 --- a/deps/datReaderPs3/Exd/Common.h +++ b/deps/datReaderPs3/Exd/Common.h @@ -1,7 +1,7 @@ #ifndef SAPPHIRE_EXD_COMMON_H #define SAPPHIRE_EXD_COMMON_H -namespace Component::Excel::Ps3 +namespace Excel::Ps3 { struct ExcelDataRowHeader @@ -30,8 +30,8 @@ namespace Component::Excel::Ps3 /* struct LinkList::Holder { - Common::Component::Excel::LinkList m_begin; - Common::Component::Excel::LinkList m_end; + Common::Excel::LinkList m_begin; + Common::Excel::LinkList m_end; uint32_t m_size; };*/ diff --git a/deps/datReaderPs3/Exd/Structs.h b/deps/datReaderPs3/Exd/Structs.h index 8602ce38..bb0f3550 100644 --- a/deps/datReaderPs3/Exd/Structs.h +++ b/deps/datReaderPs3/Exd/Structs.h @@ -4,7 +4,7 @@ #include "Common.h" #include -namespace Component::Excel::Ps3 +namespace Excel::Ps3 { template< typename T > @@ -24,7 +24,7 @@ namespace Component::Excel::Ps3 return reinterpret_cast< uint8_t* >( &_data ); }; - const std::string& getString( Component::Excel::Ps3::StringOffset offset ) + const std::string& getString( Excel::Ps3::StringOffset offset ) { return _strings[ offset.m_offset ]; }; @@ -56,10 +56,10 @@ namespace Component::Excel::Ps3 /* 33329 */ struct ItemTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset Help; - Component::Excel::Ps3::StringOffset UIName; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset UIName; int8_t SGG; int8_t PLG; int8_t VOW; @@ -140,7 +140,7 @@ namespace Component::Excel::Ps3 /* 35156 */ struct AddonTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 35157 */ @@ -152,8 +152,8 @@ namespace Component::Excel::Ps3 /* 35338 */ struct InstanceContentTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Description; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Description; }; /* 35339 */ @@ -218,9 +218,9 @@ namespace Component::Excel::Ps3 /* 63505 */ struct ClassJobTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Abbreviation; - Component::Excel::Ps3::StringOffset NameFemale; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Abbreviation; + Excel::Ps3::StringOffset NameFemale; }; /* 63506 */ @@ -229,7 +229,7 @@ namespace Component::Excel::Ps3 ClassJobTextStruct Text; int8_t padding0[4]; uint64_t ModelJobStone; - Component::Excel::Ps3::StringOffset EnText; + Excel::Ps3::StringOffset EnText; int32_t Kind; int32_t InitWeapon[2]; uint16_t Hp; @@ -258,8 +258,8 @@ namespace Component::Excel::Ps3 /* 63507 */ struct TribeTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset NameFemale; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset NameFemale; }; /* 63508 */ @@ -279,7 +279,7 @@ namespace Component::Excel::Ps3 /* 66076 */ struct ActionTimeline { - Component::Excel::Ps3::StringOffset Filename; + Excel::Ps3::StringOffset Filename; uint8_t Type; uint8_t Priority; uint8_t Stance; @@ -302,8 +302,8 @@ namespace Component::Excel::Ps3 /* 67373 */ struct ActionTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 67374 */ @@ -408,10 +408,10 @@ namespace Component::Excel::Ps3 /* 86192 */ struct EventItemTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset Help; - Component::Excel::Ps3::StringOffset UIName; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset UIName; int8_t SGG; int8_t PLG; int8_t VOW; @@ -438,7 +438,7 @@ namespace Component::Excel::Ps3 /* 100766 */ struct WeatherTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 100767 */ @@ -451,7 +451,7 @@ namespace Component::Excel::Ps3 /* 139964 */ struct WeaponTimeline { - Component::Excel::Ps3::StringOffset File; + Excel::Ps3::StringOffset File; int16_t NextWeaponTimeline; int8_t padding0[2]; }; @@ -459,7 +459,7 @@ namespace Component::Excel::Ps3 /* 161452 */ struct MotionTimeline { - Component::Excel::Ps3::StringOffset filename; + Excel::Ps3::StringOffset filename; uint8_t BlendGroup; uint8_t padding0 : 5; uint8_t IsLipEnable : 1; @@ -601,7 +601,7 @@ namespace Component::Excel::Ps3 /* 195168 */ struct EmoteTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 195169 */ @@ -638,8 +638,8 @@ namespace Component::Excel::Ps3 /* 195171 */ struct AetheryteTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -673,8 +673,8 @@ namespace Component::Excel::Ps3 /* 195176 */ struct TerritoryType { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset LVB; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset LVB; uint32_t EventHandler; int32_t RegionIcon; int32_t AreaIcon; @@ -703,7 +703,7 @@ namespace Component::Excel::Ps3 /* 195177 */ struct ItemUICategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 195178 */ @@ -732,7 +732,7 @@ namespace Component::Excel::Ps3 /* 195793 */ struct HowToTextStruct { - Component::Excel::Ps3::StringOffset Title; + Excel::Ps3::StringOffset Title; }; /* 195794 */ @@ -751,8 +751,8 @@ namespace Component::Excel::Ps3 /* 195795 */ struct AchievementTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 195796 */ @@ -774,7 +774,7 @@ namespace Component::Excel::Ps3 /* 200982 */ struct Jingle { - Component::Excel::Ps3::StringOffset Path; + Excel::Ps3::StringOffset Path; }; /* 200983 */ @@ -798,8 +798,8 @@ namespace Component::Excel::Ps3 /* 200985 */ struct GeneralActionTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 200986 */ @@ -817,8 +817,8 @@ namespace Component::Excel::Ps3 /* 200987 */ struct CraftActionTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 200988 */ @@ -839,8 +839,8 @@ namespace Component::Excel::Ps3 /* 200989 */ struct TraitTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 200990 */ @@ -862,8 +862,8 @@ namespace Component::Excel::Ps3 /* 200991 */ struct FCRightsTextStruct { - Component::Excel::Ps3::StringOffset Text; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Help; }; /* 200992 */ @@ -895,7 +895,7 @@ namespace Component::Excel::Ps3 /* 200994 */ struct MonsterNoteTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 200995 */ @@ -950,8 +950,8 @@ namespace Component::Excel::Ps3 /* 201001 */ struct PetActionTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 201002 */ @@ -969,7 +969,7 @@ namespace Component::Excel::Ps3 /* 201003 */ struct EquipSlotCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 201004 */ @@ -992,7 +992,7 @@ namespace Component::Excel::Ps3 /* 201007 */ struct MarkerTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 201008 */ @@ -1005,8 +1005,8 @@ namespace Component::Excel::Ps3 /* 201009 */ struct BuddyActionTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 201010 */ @@ -1022,8 +1022,8 @@ namespace Component::Excel::Ps3 /* 201011 */ struct MainCommandTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 201012 */ @@ -1040,7 +1040,7 @@ namespace Component::Excel::Ps3 /* 201013 */ struct FieldMarkerTextStruct { - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Help; }; /* 201014 */ @@ -1055,11 +1055,11 @@ namespace Component::Excel::Ps3 /* 201015 */ struct CompanionTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset Help; - Component::Excel::Ps3::StringOffset Expository; - Component::Excel::Ps3::StringOffset Cry; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Expository; + Excel::Ps3::StringOffset Cry; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1098,11 +1098,11 @@ namespace Component::Excel::Ps3 /* 201017 */ struct MountTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset Help; - Component::Excel::Ps3::StringOffset Expository; - Component::Excel::Ps3::StringOffset Cry; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Expository; + Excel::Ps3::StringOffset Cry; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1116,9 +1116,9 @@ namespace Component::Excel::Ps3 struct Mount { MountTextStruct Text; - Component::Excel::Ps3::StringOffset CallSE; - Component::Excel::Ps3::StringOffset CallFalseSE; - Component::Excel::Ps3::StringOffset ExitSE; + Excel::Ps3::StringOffset CallSE; + Excel::Ps3::StringOffset CallFalseSE; + Excel::Ps3::StringOffset ExitSE; float Slowdown; float MoveAccel_Run; float MoveAccel_Walk; @@ -1165,7 +1165,7 @@ namespace Component::Excel::Ps3 /* 201019 */ struct OnlineStatusTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 201020 */ @@ -1182,8 +1182,8 @@ namespace Component::Excel::Ps3 /* 201021 */ struct TitleTextStruct { - Component::Excel::Ps3::StringOffset Male; - Component::Excel::Ps3::StringOffset Female; + Excel::Ps3::StringOffset Male; + Excel::Ps3::StringOffset Female; uint8_t padding0 : 7; uint8_t Front : 1; int8_t padding1[3]; @@ -1198,9 +1198,9 @@ namespace Component::Excel::Ps3 /* 201023 */ struct ENpcTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset Title; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset Title; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1232,8 +1232,8 @@ namespace Component::Excel::Ps3 /* 201026 */ struct LogFilterTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 201027 */ @@ -1260,9 +1260,9 @@ namespace Component::Excel::Ps3 /* 201029 */ struct PlaceNameTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset SWT; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SWT; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1307,7 +1307,7 @@ namespace Component::Excel::Ps3 /* 201034 */ struct FCHierarchyTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 201035 */ @@ -1319,7 +1319,7 @@ namespace Component::Excel::Ps3 /* 201036 */ struct FCReputationTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 201037 */ @@ -1336,7 +1336,7 @@ namespace Component::Excel::Ps3 /* 201038 */ struct TownTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 201039 */ @@ -1372,8 +1372,8 @@ namespace Component::Excel::Ps3 /* 223113 */ struct BNpcTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1392,8 +1392,8 @@ namespace Component::Excel::Ps3 /* 223115 */ struct EObjTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1422,8 +1422,8 @@ namespace Component::Excel::Ps3 /* 223117 */ struct TreasureTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -1451,13 +1451,13 @@ namespace Component::Excel::Ps3 /* 223119 */ struct ExportedSG { - Component::Excel::Ps3::StringOffset SGFilePath; + Excel::Ps3::StringOffset SGFilePath; }; /* 223120 */ struct Festival { - Component::Excel::Ps3::StringOffset name; + Excel::Ps3::StringOffset name; }; /* 228343 */ @@ -1493,14 +1493,14 @@ namespace Component::Excel::Ps3 /* 257957 */ struct WorldTextStruct { - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Help; }; /* 257958 */ struct World { WorldTextStruct Text; - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; uint8_t UserType; uint8_t DCGroup; uint8_t padding0 : 7; @@ -1511,8 +1511,8 @@ namespace Component::Excel::Ps3 /* 258037 */ struct GuardianDeityTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 258038 */ @@ -1526,7 +1526,7 @@ namespace Component::Excel::Ps3 /* 258039 */ struct MainCommandCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 258040 */ @@ -1553,37 +1553,37 @@ namespace Component::Excel::Ps3 /* 258043 */ struct CharaMakeNameTextStruct { - Component::Excel::Ps3::StringOffset HuM_M_; - Component::Excel::Ps3::StringOffset HuM_F_; - Component::Excel::Ps3::StringOffset HuM_L_; - Component::Excel::Ps3::StringOffset HuH_M_; - Component::Excel::Ps3::StringOffset HuH_F_; - Component::Excel::Ps3::StringOffset HuH_L_; - Component::Excel::Ps3::StringOffset El_M_; - Component::Excel::Ps3::StringOffset El_F_; - Component::Excel::Ps3::StringOffset ElF_L_; - Component::Excel::Ps3::StringOffset ElS_L_; - Component::Excel::Ps3::StringOffset MqS_M_; - Component::Excel::Ps3::StringOffset MqS_F_; - Component::Excel::Ps3::StringOffset MqS_ML_; - Component::Excel::Ps3::StringOffset MqS_FL_; - Component::Excel::Ps3::StringOffset MqM_M_; - Component::Excel::Ps3::StringOffset MqM_F_; - Component::Excel::Ps3::StringOffset MqM_L_; - Component::Excel::Ps3::StringOffset LaP_MF_; - Component::Excel::Ps3::StringOffset LaP_ML_; - Component::Excel::Ps3::StringOffset LaP_MR_; - Component::Excel::Ps3::StringOffset LaD_MN_; - Component::Excel::Ps3::StringOffset LaD_MR_; - Component::Excel::Ps3::StringOffset LaD_FN_; - Component::Excel::Ps3::StringOffset LaD_FR_; - Component::Excel::Ps3::StringOffset RoZ_MF_; - Component::Excel::Ps3::StringOffset RoZ_ML_; - Component::Excel::Ps3::StringOffset RoZ_FF_; - Component::Excel::Ps3::StringOffset RoZ_FL_; - Component::Excel::Ps3::StringOffset RoR_F_; - Component::Excel::Ps3::StringOffset RoR_ML_; - Component::Excel::Ps3::StringOffset RoR_FL_; + Excel::Ps3::StringOffset HuM_M_; + Excel::Ps3::StringOffset HuM_F_; + Excel::Ps3::StringOffset HuM_L_; + Excel::Ps3::StringOffset HuH_M_; + Excel::Ps3::StringOffset HuH_F_; + Excel::Ps3::StringOffset HuH_L_; + Excel::Ps3::StringOffset El_M_; + Excel::Ps3::StringOffset El_F_; + Excel::Ps3::StringOffset ElF_L_; + Excel::Ps3::StringOffset ElS_L_; + Excel::Ps3::StringOffset MqS_M_; + Excel::Ps3::StringOffset MqS_F_; + Excel::Ps3::StringOffset MqS_ML_; + Excel::Ps3::StringOffset MqS_FL_; + Excel::Ps3::StringOffset MqM_M_; + Excel::Ps3::StringOffset MqM_F_; + Excel::Ps3::StringOffset MqM_L_; + Excel::Ps3::StringOffset LaP_MF_; + Excel::Ps3::StringOffset LaP_ML_; + Excel::Ps3::StringOffset LaP_MR_; + Excel::Ps3::StringOffset LaD_MN_; + Excel::Ps3::StringOffset LaD_MR_; + Excel::Ps3::StringOffset LaD_FN_; + Excel::Ps3::StringOffset LaD_FR_; + Excel::Ps3::StringOffset RoZ_MF_; + Excel::Ps3::StringOffset RoZ_ML_; + Excel::Ps3::StringOffset RoZ_FF_; + Excel::Ps3::StringOffset RoZ_FL_; + Excel::Ps3::StringOffset RoR_F_; + Excel::Ps3::StringOffset RoR_ML_; + Excel::Ps3::StringOffset RoR_FL_; }; /* 258044 */ @@ -1595,9 +1595,9 @@ namespace Component::Excel::Ps3 /* 258046 */ struct LobbyTextStruct { - Component::Excel::Ps3::StringOffset Text; - Component::Excel::Ps3::StringOffset Sub; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Sub; + Excel::Ps3::StringOffset Help; }; /* 258047 */ @@ -1625,7 +1625,7 @@ namespace Component::Excel::Ps3 /* 258050 */ struct WorldDCGroupType { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264223 */ @@ -1667,7 +1667,7 @@ namespace Component::Excel::Ps3 /* 264226 */ struct ClassJobCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264227 */ @@ -1700,7 +1700,7 @@ namespace Component::Excel::Ps3 /* 264229 */ struct HowToPageTextStruct { - Component::Excel::Ps3::StringOffset Text[3]; + Excel::Ps3::StringOffset Text[3]; }; /* 264230 */ @@ -1717,7 +1717,7 @@ namespace Component::Excel::Ps3 /* 264231 */ struct Map { - Component::Excel::Ps3::StringOffset Path; + Excel::Ps3::StringOffset Path; float Scale; uint32_t DiscoveryFlag; int32_t CategoryNameUI; @@ -1739,8 +1739,8 @@ namespace Component::Excel::Ps3 /* 264233 */ struct ContentsNoteTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 264234 */ @@ -1759,7 +1759,7 @@ namespace Component::Excel::Ps3 /* 264240 */ struct FCActivityTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 264241 */ @@ -1786,13 +1786,13 @@ namespace Component::Excel::Ps3 /* 264319 */ struct QuestTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264320 */ struct QuestDefineStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; uint32_t Value; }; @@ -1852,7 +1852,7 @@ namespace Component::Excel::Ps3 QuestEventListenerStruct EventListener[64]; QuestTodoStruct QuestTodo[24]; QuestRewardStruct Reward; - Component::Excel::Ps3::StringOffset Script; + Excel::Ps3::StringOffset Script; uint32_t PrevQuest[3]; uint32_t ExcludeQuest[2]; uint32_t InstanceContent[3]; @@ -1919,9 +1919,9 @@ namespace Component::Excel::Ps3 /* 264325 */ struct ContentRouletteTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Description; - Component::Excel::Ps3::StringOffset Contents; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Description; + Excel::Ps3::StringOffset Contents; }; /* 264326 */ @@ -1946,7 +1946,7 @@ namespace Component::Excel::Ps3 /* 264329 */ struct ActionCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264330 */ @@ -1958,8 +1958,8 @@ namespace Component::Excel::Ps3 /* 264331 */ struct StatusTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 264332 */ @@ -1993,7 +1993,7 @@ namespace Component::Excel::Ps3 /* 264333 */ struct AchievementKindTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264334 */ @@ -2005,7 +2005,7 @@ namespace Component::Excel::Ps3 /* 264335 */ struct AchievementCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264336 */ @@ -2022,8 +2022,8 @@ namespace Component::Excel::Ps3 /* 264337 */ struct RaceTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset NameFemale; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset NameFemale; }; /* 264338 */ @@ -2039,8 +2039,8 @@ namespace Component::Excel::Ps3 /* 264339 */ struct BaseParamTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 264340 */ @@ -2062,7 +2062,7 @@ namespace Component::Excel::Ps3 /* 264342 */ struct ItemSearchCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264343 */ @@ -2079,7 +2079,7 @@ namespace Component::Excel::Ps3 /* 264344 */ struct ItemSearchClassFilterTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264345 */ @@ -2105,7 +2105,7 @@ namespace Component::Excel::Ps3 /* 264347 */ struct CompanionMoveTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264348 */ @@ -2117,8 +2117,8 @@ namespace Component::Excel::Ps3 /* 264349 */ struct RoleTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset ShortName; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset ShortName; }; /* 264350 */ @@ -2131,9 +2131,9 @@ namespace Component::Excel::Ps3 /* 264351 */ struct BuddyEquipTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset UIName; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset UIName; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2204,7 +2204,7 @@ namespace Component::Excel::Ps3 /* 264358 */ struct RelicNoteCategoryTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 264359 */ @@ -2267,8 +2267,8 @@ namespace Component::Excel::Ps3 /* 264367 */ struct GatheringPointNameTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2287,7 +2287,7 @@ namespace Component::Excel::Ps3 /* 264369 */ struct CraftTypeTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264370 */ @@ -2302,7 +2302,7 @@ namespace Component::Excel::Ps3 /* 264371 */ struct NotebookDivisionTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264372 */ @@ -2318,8 +2318,8 @@ namespace Component::Excel::Ps3 /* 264373 */ struct LeveTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Objective; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Objective; }; /* 264374 */ @@ -2398,7 +2398,7 @@ namespace Component::Excel::Ps3 /* 264379 */ struct ContentTypeTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264380 */ @@ -2412,9 +2412,9 @@ namespace Component::Excel::Ps3 /* 264381 */ struct GrandCompanyTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset SWT; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SWT; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2435,7 +2435,7 @@ namespace Component::Excel::Ps3 /* 264383 */ struct HowToCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264384 */ @@ -2447,14 +2447,14 @@ namespace Component::Excel::Ps3 /* 264385 */ struct ConfigurationKeyTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 264386 */ struct ConfigKey { ConfigurationKeyTextStruct Text; - Component::Excel::Ps3::StringOffset Label; + Excel::Ps3::StringOffset Label; uint8_t Param; uint8_t Platform; uint8_t Category; @@ -2481,9 +2481,9 @@ namespace Component::Excel::Ps3 /* 264389 */ struct AdventureTextStruct { - Component::Excel::Ps3::StringOffset TitleText; - Component::Excel::Ps3::StringOffset HintText; - Component::Excel::Ps3::StringOffset FlavorText; + Excel::Ps3::StringOffset TitleText; + Excel::Ps3::StringOffset HintText; + Excel::Ps3::StringOffset FlavorText; }; /* 264390 */ @@ -2524,7 +2524,7 @@ namespace Component::Excel::Ps3 /* 264393 */ struct RetainerTaskRandomTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264394 */ @@ -2547,12 +2547,12 @@ namespace Component::Excel::Ps3 /* 264396 */ struct FateTextStruct { - Component::Excel::Ps3::StringOffset TitleText; - Component::Excel::Ps3::StringOffset DescriptionText; - Component::Excel::Ps3::StringOffset DescriptionText2; - Component::Excel::Ps3::StringOffset TodoName1; - Component::Excel::Ps3::StringOffset TodoName2; - Component::Excel::Ps3::StringOffset TodoName3; + Excel::Ps3::StringOffset TitleText; + Excel::Ps3::StringOffset DescriptionText; + Excel::Ps3::StringOffset DescriptionText2; + Excel::Ps3::StringOffset TodoName1; + Excel::Ps3::StringOffset TodoName2; + Excel::Ps3::StringOffset TodoName3; }; /* 264397 */ @@ -2590,7 +2590,7 @@ namespace Component::Excel::Ps3 /* 264399 */ struct FCActivityCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264400 */ @@ -2604,7 +2604,7 @@ namespace Component::Excel::Ps3 /* 264401 */ struct FCAuthorityTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264402 */ @@ -2619,7 +2619,7 @@ namespace Component::Excel::Ps3 /* 264403 */ struct FCAuthorityCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264404 */ @@ -2631,8 +2631,8 @@ namespace Component::Excel::Ps3 /* 264405 */ struct CompanyActionTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Help; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Help; }; /* 264406 */ @@ -2657,7 +2657,7 @@ namespace Component::Excel::Ps3 /* 264408 */ struct FCProfileTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264409 */ @@ -2671,7 +2671,7 @@ namespace Component::Excel::Ps3 /* 264410 */ struct ItemSeriesTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264411 */ @@ -2683,7 +2683,7 @@ namespace Component::Excel::Ps3 /* 264412 */ struct ItemSpecialBonusTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 264413 */ @@ -2746,9 +2746,9 @@ namespace Component::Excel::Ps3 /* 264418 */ struct BeastTribeTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; - Component::Excel::Ps3::StringOffset ReputationValue; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset ReputationValue; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2769,8 +2769,8 @@ namespace Component::Excel::Ps3 /* 264420 */ struct BeastReputationRankTextStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2792,8 +2792,8 @@ namespace Component::Excel::Ps3 /* 271695 */ struct HousingPresetNameStruct { - Component::Excel::Ps3::StringOffset SGL; - Component::Excel::Ps3::StringOffset PLR; + Excel::Ps3::StringOffset SGL; + Excel::Ps3::StringOffset PLR; int8_t SGG; int8_t PLG; int8_t VOW; @@ -2883,7 +2883,7 @@ namespace Component::Excel::Ps3 /* 326984 */ struct Channeling { - Component::Excel::Ps3::StringOffset File; + Excel::Ps3::StringOffset File; float WidthScale; uint8_t LimitDist; int8_t padding0[3]; @@ -2903,7 +2903,7 @@ namespace Component::Excel::Ps3 /* 326986 */ struct BNpcState { - Component::Excel::Ps3::StringOffset Attribute[3]; + Excel::Ps3::StringOffset Attribute[3]; float Scale; int32_t LoopTimeline; uint16_t Idle; @@ -2945,7 +2945,7 @@ namespace Component::Excel::Ps3 /* 326989 */ struct BNpcParts { - Component::Excel::Ps3::StringOffset Attribute[4]; + Excel::Ps3::StringOffset Attribute[4]; float OffsetX[4]; float OffsetZ[4]; uint16_t Parts[4]; @@ -3002,7 +3002,7 @@ namespace Component::Excel::Ps3 /* 326996 */ struct EventActionTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 326997 */ @@ -3020,8 +3020,8 @@ namespace Component::Excel::Ps3 /* 326998 */ struct Omen { - Component::Excel::Ps3::StringOffset Path; - Component::Excel::Ps3::StringOffset PathAlly; + Excel::Ps3::StringOffset Path; + Excel::Ps3::StringOffset PathAlly; uint8_t Type; uint8_t padding0 : 6; uint8_t LargeScale : 1; @@ -3116,13 +3116,13 @@ namespace Component::Excel::Ps3 /* 342296 */ struct VFX { - Component::Excel::Ps3::StringOffset Path; + Excel::Ps3::StringOffset Path; }; /* 342297 */ struct Lockon { - Component::Excel::Ps3::StringOffset File; + Excel::Ps3::StringOffset File; }; /* 342298 */ @@ -3137,14 +3137,14 @@ namespace Component::Excel::Ps3 /* 342313 */ struct MotionTimelineAdvanceBlend { - Component::Excel::Ps3::StringOffset MotionTimelineName; - Component::Excel::Ps3::StringOffset NextMotionTimelineName; + Excel::Ps3::StringOffset MotionTimelineName; + Excel::Ps3::StringOffset NextMotionTimelineName; }; /* 342406 */ struct BGM { - Component::Excel::Ps3::StringOffset Path; + Excel::Ps3::StringOffset Path; float DisableRestartResetTime; uint8_t Priority; uint8_t SpecialMode; @@ -3244,7 +3244,7 @@ namespace Component::Excel::Ps3 /* 362339 */ struct GuildleveAssignmentTalkTextStruct { - Component::Excel::Ps3::StringOffset Talk[8]; + Excel::Ps3::StringOffset Talk[8]; }; /* 362340 */ @@ -3288,7 +3288,7 @@ namespace Component::Excel::Ps3 /* 362344 */ struct DefaultTalkTextStruct { - Component::Excel::Ps3::StringOffset Talk[3]; + Excel::Ps3::StringOffset Talk[3]; }; /* 362345 */ @@ -3313,7 +3313,7 @@ namespace Component::Excel::Ps3 /* 362347 */ struct CraftLeveTalkTextStruct { - Component::Excel::Ps3::StringOffset Talk[6]; + Excel::Ps3::StringOffset Talk[6]; }; /* 362348 */ @@ -3420,7 +3420,7 @@ namespace Component::Excel::Ps3 /* 362360 */ struct QuestBattleDefineStruct { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; uint32_t DefineValue; }; @@ -3438,14 +3438,14 @@ namespace Component::Excel::Ps3 /* 362362 */ struct CustomTalkDefineStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; uint32_t Value; }; /* 362363 */ struct CustomTalkTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 362364 */ @@ -3453,7 +3453,7 @@ namespace Component::Excel::Ps3 { CustomTalkDefineStruct Define[30]; CustomTalkTextStruct Text; - Component::Excel::Ps3::StringOffset Script; + Excel::Ps3::StringOffset Script; uint32_t MapIcon; uint8_t padding0 : 1; uint8_t ListenHousing : 1; @@ -3482,7 +3482,7 @@ namespace Component::Excel::Ps3 /* 362366 */ struct StoryDefineStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; uint32_t Value; }; @@ -3500,14 +3500,14 @@ namespace Component::Excel::Ps3 StoryDefineStruct Define[40]; StorySequenceStruct Sequence[110]; StoryVisibleListenerStruct VisibleListener[80]; - Component::Excel::Ps3::StringOffset Script; + Excel::Ps3::StringOffset Script; uint16_t LayerSetTerritoryType[2]; }; /* 362369 */ struct CompanyLeveRule { - Component::Excel::Ps3::StringOffset Script; + Excel::Ps3::StringOffset Script; uint16_t Objective; uint16_t Help; }; @@ -3523,14 +3523,14 @@ namespace Component::Excel::Ps3 /* 362451 */ struct AetheryteSystemDefine { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; uint32_t DefineValue; }; /* 362452 */ struct GatheringTypeTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 362453 */ @@ -3544,7 +3544,7 @@ namespace Component::Excel::Ps3 /* 362454 */ struct GatheringConditionTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 362455 */ @@ -3556,7 +3556,7 @@ namespace Component::Excel::Ps3 /* 362456 */ struct GatheringPointBonusTypeTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 362457 */ @@ -3582,21 +3582,21 @@ namespace Component::Excel::Ps3 /* 362460 */ struct QuestSystemDefine { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; int32_t DefineValue; }; /* 362461 */ struct EventSystemDefine { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; uint32_t DefineValue; }; /* 362462 */ struct JournalGenreTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 362463 */ @@ -3611,27 +3611,27 @@ namespace Component::Excel::Ps3 /* 362464 */ struct LeveSystemDefine { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; int32_t DefineValue; }; /* 362465 */ struct BattleLeveRule { - Component::Excel::Ps3::StringOffset Script; + Excel::Ps3::StringOffset Script; }; /* 362466 */ struct LeveVfx { - Component::Excel::Ps3::StringOffset Path; + Excel::Ps3::StringOffset Path; int32_t Icon; }; /* 362467 */ struct LeveStringTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 362468 */ @@ -3643,13 +3643,13 @@ namespace Component::Excel::Ps3 /* 362469 */ struct GatheringLeveRule { - Component::Excel::Ps3::StringOffset Script; + Excel::Ps3::StringOffset Script; }; /* 362470 */ struct LeveClientTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 362471 */ @@ -3682,7 +3682,7 @@ namespace Component::Excel::Ps3 /* 362475 */ struct LeveAssignmentTypeTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 362476 */ @@ -3698,7 +3698,7 @@ namespace Component::Excel::Ps3 /* 362477 */ struct GuildleveEvaluationTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 362478 */ @@ -3710,14 +3710,14 @@ namespace Component::Excel::Ps3 /* 362479 */ struct OpeningSystemDefine { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; uint32_t DefineValue; }; /* 362480 */ struct StorySystemDefine { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; uint32_t DefineValue; }; @@ -3758,20 +3758,20 @@ namespace Component::Excel::Ps3 /* 362483 */ struct Cutscene { - Component::Excel::Ps3::StringOffset Path; + Excel::Ps3::StringOffset Path; }; /* 362484 */ struct DirectorSystemDefine { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; int32_t DefineValue; }; /* 362485 */ struct SE { - Component::Excel::Ps3::StringOffset Path; + Excel::Ps3::StringOffset Path; }; /* 362486 */ @@ -3787,7 +3787,7 @@ namespace Component::Excel::Ps3 /* 362487 */ struct ChocoboTaxiStandTextStruct { - Component::Excel::Ps3::StringOffset Destination; + Excel::Ps3::StringOffset Destination; }; /* 362488 */ @@ -3806,7 +3806,7 @@ namespace Component::Excel::Ps3 /* 362490 */ struct GCShopItemCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 362491 */ @@ -3825,14 +3825,14 @@ namespace Component::Excel::Ps3 /* 362493 */ struct QuestBattleSystemDefine { - Component::Excel::Ps3::StringOffset DefineName; + Excel::Ps3::StringOffset DefineName; uint32_t DefineValue; }; /* 363134 */ struct ContentTalkTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 363135 */ @@ -3898,8 +3898,8 @@ namespace Component::Excel::Ps3 /* 367152 */ struct ScenarioTextStruct { - Component::Excel::Ps3::StringOffset Label; - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Label; + Excel::Ps3::StringOffset Text; }; /* 367156 */ @@ -3911,7 +3911,7 @@ namespace Component::Excel::Ps3 /* 367157 */ struct ShopTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 367158 */ @@ -3958,8 +3958,8 @@ namespace Component::Excel::Ps3 /* 367161 */ struct WarpTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Question; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Question; }; /* 367162 */ @@ -3982,16 +3982,16 @@ namespace Component::Excel::Ps3 /* 367163 */ struct WarpLogicDefineStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; uint32_t Value; }; /* 367164 */ struct WarpLogicTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Yes; - Component::Excel::Ps3::StringOffset No; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Yes; + Excel::Ps3::StringOffset No; }; /* 367165 */ @@ -3999,7 +3999,7 @@ namespace Component::Excel::Ps3 { WarpLogicDefineStruct Define[10]; WarpLogicTextStruct Text; - Component::Excel::Ps3::StringOffset Script; + Excel::Ps3::StringOffset Script; uint32_t MapIcon; uint8_t padding0 : 7; uint8_t AcceptCallback : 1; @@ -4021,7 +4021,7 @@ namespace Component::Excel::Ps3 /* 367167 */ struct SpecialShopTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 367168 */ @@ -4040,7 +4040,7 @@ namespace Component::Excel::Ps3 /* 367169 */ struct OpeningDefineStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; uint32_t Value; }; @@ -4048,7 +4048,7 @@ namespace Component::Excel::Ps3 struct Opening { OpeningDefineStruct Define[40]; - Component::Excel::Ps3::StringOffset Script; + Excel::Ps3::StringOffset Script; uint32_t Quest; }; @@ -4099,7 +4099,7 @@ namespace Component::Excel::Ps3 /* 370979 */ struct Buddy { - Component::Excel::Ps3::StringOffset ActionSE[4]; + Excel::Ps3::StringOffset ActionSE[4]; int32_t BaseEquip[3]; uint8_t Base; int8_t padding0[3]; @@ -4118,8 +4118,8 @@ namespace Component::Excel::Ps3 /* 370981 */ struct PvPRankTextStruct { - Component::Excel::Ps3::StringOffset PvPTitleMale[3]; - Component::Excel::Ps3::StringOffset PvPTitleFemale[3]; + Excel::Ps3::StringOffset PvPTitleMale[3]; + Excel::Ps3::StringOffset PvPTitleFemale[3]; }; /* 370982 */ @@ -4145,7 +4145,7 @@ namespace Component::Excel::Ps3 /* 370987 */ struct RecipeElementTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 370988 */ @@ -4163,7 +4163,7 @@ namespace Component::Excel::Ps3 /* 370990 */ struct FishParameterTextStruct { - Component::Excel::Ps3::StringOffset NoteHelp; + Excel::Ps3::StringOffset NoteHelp; }; /* 370991 */ @@ -4182,7 +4182,7 @@ namespace Component::Excel::Ps3 /* 370992 */ struct FishingSpotTextStruct { - Component::Excel::Ps3::StringOffset SpotName; + Excel::Ps3::StringOffset SpotName; }; /* 370993 */ @@ -4207,7 +4207,7 @@ namespace Component::Excel::Ps3 /* 370994 */ struct JournalCategoryTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 370995 */ @@ -4285,7 +4285,7 @@ namespace Component::Excel::Ps3 /* 374116 */ struct CompleteJournalTextStruct { - Component::Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Name; }; /* 374117 */ @@ -4304,8 +4304,8 @@ namespace Component::Excel::Ps3 /* 374118 */ struct LegacyQuestTextStruct { - Component::Excel::Ps3::StringOffset Name; - Component::Excel::Ps3::StringOffset Journal; + Excel::Ps3::StringOffset Name; + Excel::Ps3::StringOffset Journal; }; /* 374119 */ @@ -4425,9 +4425,9 @@ namespace Component::Excel::Ps3 /* 374133 */ struct GuildOrderTextStruct { - Component::Excel::Ps3::StringOffset OperationText; - Component::Excel::Ps3::StringOffset OrderText[2]; - Component::Excel::Ps3::StringOffset SummaryText; + Excel::Ps3::StringOffset OperationText; + Excel::Ps3::StringOffset OrderText[2]; + Excel::Ps3::StringOffset SummaryText; }; /* 374134 */ @@ -4492,7 +4492,7 @@ namespace Component::Excel::Ps3 /* 383306 */ struct BalloonTextStruct { - Component::Excel::Ps3::StringOffset Message; + Excel::Ps3::StringOffset Message; }; /* 383307 */ @@ -4528,7 +4528,7 @@ namespace Component::Excel::Ps3 /* 391161 */ struct InstanceContentTextDataTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 391162 */ @@ -4547,9 +4547,9 @@ namespace Component::Excel::Ps3 /* 397676 */ struct GimmickYesNoTextStruct { - Component::Excel::Ps3::StringOffset Text1; - Component::Excel::Ps3::StringOffset Text2; - Component::Excel::Ps3::StringOffset Text3; + Excel::Ps3::StringOffset Text1; + Excel::Ps3::StringOffset Text2; + Excel::Ps3::StringOffset Text3; }; /* 397677 */ @@ -4561,7 +4561,7 @@ namespace Component::Excel::Ps3 /* 397678 */ struct GimmickBillTextStruct { - Component::Excel::Ps3::StringOffset Message; + Excel::Ps3::StringOffset Message; }; /* 397679 */ @@ -4587,7 +4587,7 @@ namespace Component::Excel::Ps3 /* 399530 */ struct FateEventTextStruct { - Component::Excel::Ps3::StringOffset MessageText[8]; + Excel::Ps3::StringOffset MessageText[8]; }; /* 399531 */ @@ -4600,7 +4600,7 @@ namespace Component::Excel::Ps3 /* 399532 */ struct NpcYellTextStruct { - Component::Excel::Ps3::StringOffset Text; + Excel::Ps3::StringOffset Text; }; /* 399533 */ diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp index cc91b7b3..41c0fa47 100644 --- a/src/api/PlayerMinimal.cpp +++ b/src/api/PlayerMinimal.cpp @@ -178,7 +178,7 @@ std::string PlayerMinimal::getInfoJson() uint8_t PlayerMinimal::getClassLevel() { - uint8_t classJobIndex = g_exdData.getRow< Component::Excel::ClassJob >( m_class )->data().WorkIndex; + uint8_t classJobIndex = g_exdData.getRow< Excel::ClassJob >( m_class )->data().WorkIndex; return static_cast< uint8_t >( m_classMap[ classJobIndex ] ); } @@ -259,7 +259,7 @@ void PlayerMinimal::saveAsNew() // CharacterId, ClassIdx, Exp, Lvl auto stmtClass = g_charaDb.getPreparedStatement( Db::ZoneDbStatements::CHARA_CLASS_INS ); stmtClass->setUInt64( 1, m_characterId ); - stmtClass->setInt( 2, g_exdData.getRow< Component::Excel::ClassJob >( m_class )->data().WorkIndex ); + stmtClass->setInt( 2, g_exdData.getRow< Excel::ClassJob >( m_class )->data().WorkIndex ); stmtClass->setInt( 3, 0 ); stmtClass->setInt( 4, 1 ); g_charaDb.directExecute( stmtClass ); @@ -320,14 +320,14 @@ void PlayerMinimal::saveAsNew() /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /// SETUP EQUIPMENT / STARTING GEAR - auto classJobInfo = g_exdData.getRow< Component::Excel::ClassJob >( m_class ); + auto classJobInfo = g_exdData.getRow< Excel::ClassJob >( m_class ); uint32_t weaponId = classJobInfo->data().InitWeapon[ 0 ]; uint64_t uniqueId = getNextUId64(); uint8_t race = customize[ CharaLook::Race ]; uint8_t gender = customize[ CharaLook::Gender ]; - auto raceInfo = g_exdData.getRow< Component::Excel::Race >( race ); + auto raceInfo = g_exdData.getRow< Excel::Race >( race ); uint32_t body; uint32_t hands; @@ -343,11 +343,11 @@ void PlayerMinimal::saveAsNew() legs = raceInfo->data().Leg[ gender ]; feet = raceInfo->data().Foot[ gender ]; - auto mainWeaponInfo = g_exdData.getRow< Component::Excel::Item >( weaponId ); - auto bodyInfo = g_exdData.getRow< Component::Excel::Item >( body ); - auto handsInfo = g_exdData.getRow< Component::Excel::Item >( hands ); - auto legsInfo = g_exdData.getRow< Component::Excel::Item >( legs ); - auto feetInfo = g_exdData.getRow< Component::Excel::Item >( feet ); + auto mainWeaponInfo = g_exdData.getRow< Excel::Item >( weaponId ); + auto bodyInfo = g_exdData.getRow< Excel::Item >( body ); + auto handsInfo = g_exdData.getRow< Excel::Item >( hands ); + auto legsInfo = g_exdData.getRow< Excel::Item >( legs ); + auto feetInfo = g_exdData.getRow< Excel::Item >( feet ); uint64_t modelMainWeapon = mainWeaponInfo->data().ModelId; diff --git a/src/api/main.cpp b/src/api/main.cpp index 3623a20c..d0c231ce 100644 --- a/src/api/main.cpp +++ b/src/api/main.cpp @@ -221,7 +221,7 @@ std::string buildHttpResponse( uint16_t rCode, const std::string& content = "", void getZoneName( shared_ptr< HttpServer::Response > response, shared_ptr< HttpServer::Request > request ) { string number = request->path_match[ 1 ]; - auto info = g_exdData.getRow< Component::Excel::TerritoryType >( atoi( number.c_str() ) ); + auto info = g_exdData.getRow< Excel::TerritoryType >( atoi( number.c_str() ) ); std::string responseStr = "Not found!"; if( info ) { diff --git a/src/common/Exd/ExdData.h b/src/common/Exd/ExdData.h index d8d3b6f6..5ba553e5 100644 --- a/src/common/Exd/ExdData.h +++ b/src/common/Exd/ExdData.h @@ -29,7 +29,7 @@ namespace Sapphire::Data bool init( const std::string& path ); template< typename T > - std::shared_ptr< Component::Excel::ExcelStruct< T > > getRow( uint32_t row, uint32_t subrow = 0 ) + std::shared_ptr< Excel::ExcelStruct< T > > getRow( uint32_t row, uint32_t subrow = 0 ) { xiv::exd::Exd sheet; auto needle = m_sheets.find( typeid( T ) ); diff --git a/src/scripts/common/aethernet/Aetheryte.cpp b/src/scripts/common/aethernet/Aetheryte.cpp index e6828929..e4e61520 100644 --- a/src/scripts/common/aethernet/Aetheryte.cpp +++ b/src/scripts/common/aethernet/Aetheryte.cpp @@ -113,7 +113,7 @@ public: { auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); - auto aetherInfo = exdData.getRow< Component::Excel::Aetheryte >( eventId & 0xFFFF ); + auto aetherInfo = exdData.getRow< Excel::Aetheryte >( eventId & 0xFFFF ); if( !aetherInfo ) return; diff --git a/src/scripts/common/aethernet/HousingAethernet.cpp b/src/scripts/common/aethernet/HousingAethernet.cpp index df094c89..14873218 100644 --- a/src/scripts/common/aethernet/HousingAethernet.cpp +++ b/src/scripts/common/aethernet/HousingAethernet.cpp @@ -28,7 +28,7 @@ public: return; // param2 is the index starting from 0 inside housingaethernet.exd, but the ID column starts at 0x001E0000........ wtf - /*auto pHousingAethernet = exdData.getRow< Component::Excel::HousingAethernet >( getId() + result.param2 ); + /*auto pHousingAethernet = exdData.getRow< Excel::HousingAethernet >( getId() + result.param2 ); if( !pHousingAethernet ) return; diff --git a/src/scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp index f849dc2a..c62ac3ce 100644 --- a/src/scripts/common/warptaxi/WarpTaxi.cpp +++ b/src/scripts/common/warptaxi/WarpTaxi.cpp @@ -35,7 +35,7 @@ public: auto& exdData = Common::Service< Data::ExdData >::ref(); auto& popRange = Common::Service< Sapphire::InstanceObjectCache >::ref(); - auto warp = exdData.getRow< Component::Excel::Warp >( getId() ); + auto warp = exdData.getRow< Excel::Warp >( getId() ); if( !warp ) return; @@ -78,7 +78,7 @@ public: { /* auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); - auto warp = exdData.getRow< Component::Excel::Warp >( eventId ); + auto warp = exdData.getRow< Excel::Warp >( eventId ); if( !warp ) return; diff --git a/src/tools/BattleNpcParserPs3/ExdData.h b/src/tools/BattleNpcParserPs3/ExdData.h index f293dd42..7addd884 100644 --- a/src/tools/BattleNpcParserPs3/ExdData.h +++ b/src/tools/BattleNpcParserPs3/ExdData.h @@ -29,7 +29,7 @@ namespace Data bool init( const std::string& path ); template< typename T > - std::shared_ptr< Component::Excel::Ps3::ExcelStruct< T > > getRow( uint32_t row, uint32_t subrow = 0 ) + std::shared_ptr< Excel::Ps3::ExcelStruct< T > > getRow( uint32_t row, uint32_t subrow = 0 ) { xivps3::exd::Exd sheet; auto needle = m_sheets.find( typeid( T ) ); diff --git a/src/tools/BattleNpcParserPs3/main.cpp b/src/tools/BattleNpcParserPs3/main.cpp index 402c8ad2..78d9f1df 100644 --- a/src/tools/BattleNpcParserPs3/main.cpp +++ b/src/tools/BattleNpcParserPs3/main.cpp @@ -371,7 +371,7 @@ int main( int argc, char* argv[] ) } - auto teriIdList = g_exdDataGen.getIdList< Component::Excel::Ps3::TerritoryType >(); + auto teriIdList = g_exdDataGen.getIdList< Excel::Ps3::TerritoryType >(); std::string data = std::string("GroupId, GroupName, TerritoryName, name, instanceId, x, y, z, Rotation, BaseId, PopWeather, PopTimeStart, PopTimeEnd, MoveAI, WanderingRange, Route, ") + @@ -386,7 +386,7 @@ int main( int argc, char* argv[] ) std::set< std::string > zoneNames; for( const auto& id : teriIdList ) { - auto row = g_exdDataGen.getRow< Component::Excel::Ps3::TerritoryType >( id ); + auto row = g_exdDataGen.getRow< Excel::Ps3::TerritoryType >( id ); if( !row ) continue; std::string zonePath = row->getString( row->data().LVB ); @@ -405,7 +405,7 @@ int main( int argc, char* argv[] ) } for( const auto& name : zoneNames ) { - // auto row = g_exdDataGen.getRow< Component::Excel::TerritoryType >( id ); + // auto row = g_exdDataGen.getRow< Excel::TerritoryType >( id ); // if( !row ) // continue; diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp index 1956a25a..ef8817da 100644 --- a/src/tools/action_parse/main.cpp +++ b/src/tools/action_parse/main.cpp @@ -103,7 +103,7 @@ int main( int argc, char* argv[] ) Logger::fatal( "Error setting up EXD data " ); return 0; } - auto idList = g_exdDataGen.getIdList< Component::Excel::Action >(); + auto idList = g_exdDataGen.getIdList< Excel::Action >(); std::map< uint32_t, ActionEntry > actions; std::map< uint32_t, std::vector< uint32_t > > traversedCombos; @@ -117,7 +117,7 @@ int main( int argc, char* argv[] ) if( cursor % 50 == 0 && cursor > 0 ) Logger::info( "Processing {} actions of {} ({:.2f}%)", cursor, total, done ); - auto action = g_exdDataGen.getRow< Component::Excel::Action >( id ); + auto action = g_exdDataGen.getRow< Excel::Action >( id ); //auto actionTransient = g_exdData.get< Sapphire::Data::ActionTransient >( id ); if( action ) @@ -130,7 +130,7 @@ int main( int argc, char* argv[] ) //if( actionData.PvPOnly ) // continue; - // auto classJob = g_exdDataGen.getRow< Component::Excel::ClassJob >( actionData.UseClassJob ); + // auto classJob = g_exdDataGen.getRow< Excel::ClassJob >( actionData.UseClassJob ); // if( !classJob ) // continue; diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp index 5cd7aee6..9e3875f9 100644 --- a/src/tools/event_object_parser/main.cpp +++ b/src/tools/event_object_parser/main.cpp @@ -66,10 +66,10 @@ std::string zoneNameToPath( const std::string& name ) if( it != g_nameMap.end() ) return it->second; - auto teriIdList = g_exdData.getIdList< Component::Excel::TerritoryType >(); + auto teriIdList = g_exdData.getIdList< Excel::TerritoryType >(); for( auto teriId : teriIdList ) { - auto teri = g_exdData.getRow< Component::Excel::TerritoryType >( teriId ); + auto teri = g_exdData.getRow< Excel::TerritoryType >( teriId ); if( !teri ) continue; @@ -102,10 +102,10 @@ std::string zoneNameToPath( const std::string& name ) void loadEobjNames() { - auto nameIdList = g_exdData..getIdList< Component::Excel::EObj >(); + auto nameIdList = g_exdData..getIdList< Excel::EObj >(); for( auto id : nameIdList ) { - auto eObjName = g_exdData.getRow< Component::Excel::EObjName >( id ); + auto eObjName = g_exdData.getRow< Excel::EObjName >( id ); if( !eObjName ) continue; diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp index 695a7191..c471952d 100644 --- a/src/tools/exd_struct_test/main.cpp +++ b/src/tools/exd_struct_test/main.cpp @@ -28,7 +28,7 @@ int main( int argc, char* argv[] ) auto exdData = Data::ExdData(); exdData.init( datLocation ); - auto row = exdData.getRow< Component::Excel::ClassJob >( 1 ); + auto row = exdData.getRow< Excel::ClassJob >( 1 ); return 0; } diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp index 1eb7c655..5b769d83 100644 --- a/src/tools/quest_parser/main.cpp +++ b/src/tools/quest_parser/main.cpp @@ -100,7 +100,7 @@ Container& split( } void -createScript( std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Quest > >& pQuestData, std::set< std::string >& additionalList, int questId, std::vector< std::string >& functions ) +createScript( std::shared_ptr< Excel::ExcelStruct< Excel::Quest > >& pQuestData, std::set< std::string >& additionalList, int questId, std::vector< std::string >& functions ) { std::string header( "// This is an automatically generated C++ script template\n" @@ -492,7 +492,7 @@ int main( int argc, char** argv ) xiv::dat::GameData data( gamePath ); - auto rows = g_exdDataGen.getIdList< Component::Excel::Quest >(); + auto rows = g_exdDataGen.getIdList< Excel::Quest >(); if( !fs::exists( "./generated" ) ) fs::create_directory( "./generated" ); @@ -504,7 +504,7 @@ int main( int argc, char** argv ) for( const auto& row : rows ) { Logger::info( "Generating {0}", row ); - auto questInfo = g_exdDataGen.getRow< Component::Excel::Quest >( row ); + auto questInfo = g_exdDataGen.getRow< Excel::Quest >( row ); if( questInfo->getString( questInfo->data().Text.Name ).empty() || questInfo->getString( questInfo->data().Script ).empty() ) { diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index 5504c8fe..80044b62 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -48,7 +48,7 @@ Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t seq } Action::Action::Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > actionData ) : + std::shared_ptr< Excel::ExcelStruct< Excel::Action > > actionData ) : m_pSource( std::move( caster ) ), m_actionData( std::move( actionData ) ), m_id( actionId ), @@ -72,7 +72,7 @@ bool Action::Action::init() // need to get actionData auto& exdData = Common::Service< Data::ExdData >::ref(); - auto actionData = exdData.getRow< Component::Excel::Action >( m_id ); + auto actionData = exdData.getRow< Excel::Action >( m_id ); if( !actionData ) throw std::runtime_error( "No actiondata found!" ); @@ -638,7 +638,7 @@ bool Action::Action::playerPreCheck( Entity::Player& player ) // check if not a base class action auto& exdData = Common::Service< Data::ExdData >::ref(); - auto classJob = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( currentClass ) ); + auto classJob = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( currentClass ) ); if( !classJob ) return false; diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h index 38799c1b..c5b73dca 100644 --- a/src/world/Action/Action.h +++ b/src/world/Action/Action.h @@ -17,7 +17,7 @@ namespace Sapphire::World::Action Action(); Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence ); - Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > actionData ); + Action( Entity::CharaPtr caster, uint32_t actionId, uint16_t sequence, std::shared_ptr< Excel::ExcelStruct< Excel::Action > > actionData ); virtual ~Action(); @@ -200,7 +200,7 @@ namespace Sapphire::World::Action Common::ActionInterruptType m_interruptType; - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > m_actionData; + std::shared_ptr< Excel::ExcelStruct< Excel::Action > > m_actionData; Common::FFXIVARR_POSITION3 m_pos{}; diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp index c77ddef2..7c7e6249 100644 --- a/src/world/Action/EventAction.cpp +++ b/src/world/Action/EventAction.cpp @@ -34,7 +34,7 @@ Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uin m_eventId = eventId; m_id = action; auto& exdData = Common::Service< Data::ExdData >::ref(); - m_castTimeMs = exdData.getRow< Component::Excel::EventAction >( action )->data().Time * 1000; // TODO: Add security checks. + m_castTimeMs = exdData.getRow< Excel::EventAction >( action )->data().Time * 1000; // TODO: Add security checks. m_onActionFinishClb = std::move( finishRef ); m_onActionInterruptClb = std::move( interruptRef ); m_pSource = std::move( pActor ); diff --git a/src/world/Action/EventItemAction.cpp b/src/world/Action/EventItemAction.cpp index 6988e4a7..d7cb7d67 100644 --- a/src/world/Action/EventItemAction.cpp +++ b/src/world/Action/EventItemAction.cpp @@ -29,7 +29,7 @@ using namespace Sapphire::Network::Packets::WorldPackets::Server; using namespace Sapphire::Network::ActorControl; EventItemAction::EventItemAction( Sapphire::Entity::CharaPtr source, uint32_t eventItemId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::EventItem > > eventItemActionData, + std::shared_ptr< Excel::ExcelStruct< Excel::EventItem > > eventItemActionData, uint32_t sequence, uint64_t targetId ) : m_eventItemAction( std::move( eventItemActionData ) ) { @@ -45,7 +45,7 @@ EventItemAction::EventItemAction( Sapphire::Entity::CharaPtr source, uint32_t ev bool EventItemAction::init() { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto actionInfoPtr = exdData.getRow< Component::Excel::Action >( m_eventItemAction->data().Action ); + auto actionInfoPtr = exdData.getRow< Excel::Action >( m_eventItemAction->data().Action ); m_castTimeMs = static_cast< uint32_t >( m_eventItemAction->data().CastTime * 1000 ); m_recastTimeMs = static_cast< uint32_t >( actionInfoPtr->data().RecastTime * 100 ); diff --git a/src/world/Action/EventItemAction.h b/src/world/Action/EventItemAction.h index 0cc1b457..49f66a17 100644 --- a/src/world/Action/EventItemAction.h +++ b/src/world/Action/EventItemAction.h @@ -14,7 +14,7 @@ namespace Sapphire::World::Action class EventItemAction : public Action { public: - EventItemAction( Entity::CharaPtr source, uint32_t eventItemId, std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::EventItem > > itemActionData, + EventItemAction( Entity::CharaPtr source, uint32_t eventItemId, std::shared_ptr< Excel::ExcelStruct< Excel::EventItem > > itemActionData, uint32_t sequence, uint64_t targetId ); virtual ~EventItemAction() = default; @@ -29,7 +29,7 @@ namespace Sapphire::World::Action private: - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::EventItem > > m_eventItemAction; + std::shared_ptr< Excel::ExcelStruct< Excel::EventItem > > m_eventItemAction; uint32_t m_eventItem; uint32_t m_sequence; }; diff --git a/src/world/Action/ItemAction.cpp b/src/world/Action/ItemAction.cpp index 15edc483..992f46cf 100644 --- a/src/world/Action/ItemAction.cpp +++ b/src/world/Action/ItemAction.cpp @@ -13,7 +13,7 @@ using namespace Sapphire::World::Action; using namespace Sapphire::Network::Packets::WorldPackets::Server; ItemAction::ItemAction( Sapphire::Entity::CharaPtr source, uint32_t itemId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::ItemAction > > itemActionData, uint16_t itemSourceSlot, + std::shared_ptr< Excel::ExcelStruct< Excel::ItemAction > > itemActionData, uint16_t itemSourceSlot, uint16_t itemSourceContainer ) : m_itemAction( std::move( itemActionData ) ), m_itemSourceSlot( itemSourceSlot ), diff --git a/src/world/Action/ItemAction.h b/src/world/Action/ItemAction.h index d4a3d394..b7add735 100644 --- a/src/world/Action/ItemAction.h +++ b/src/world/Action/ItemAction.h @@ -14,7 +14,7 @@ namespace Sapphire::World::Action class ItemAction : public Action { public: - ItemAction( Entity::CharaPtr source, uint32_t itemId, std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::ItemAction > > itemActionData, + ItemAction( Entity::CharaPtr source, uint32_t itemId, std::shared_ptr< Excel::ExcelStruct< Excel::ItemAction > > itemActionData, uint16_t itemSourceSlot, uint16_t itemSourceContainer ); virtual ~ItemAction() = default; @@ -30,7 +30,7 @@ namespace Sapphire::World::Action void handleMountItem(); private: - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::ItemAction > > m_itemAction; + std::shared_ptr< Excel::ExcelStruct< Excel::ItemAction > > m_itemAction; uint16_t m_itemSourceSlot; uint16_t m_itemSourceContainer; diff --git a/src/world/Action/MountAction.cpp b/src/world/Action/MountAction.cpp index 493c72d4..757de387 100644 --- a/src/world/Action/MountAction.cpp +++ b/src/world/Action/MountAction.cpp @@ -21,7 +21,7 @@ using namespace Sapphire::Network::ActorControl; using namespace Sapphire::World::Action; MountAction::MountAction( Sapphire::Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > actionData ) : + std::shared_ptr< Excel::ExcelStruct< Excel::Action > > actionData ) : Action::Action( source, 4, sequence, actionData ), m_mountId( mountId ) { diff --git a/src/world/Action/MountAction.h b/src/world/Action/MountAction.h index 4035586c..8918d538 100644 --- a/src/world/Action/MountAction.h +++ b/src/world/Action/MountAction.h @@ -9,7 +9,7 @@ namespace Sapphire::World::Action { public: MountAction( Entity::CharaPtr source, uint16_t mountId, uint16_t sequence, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > actionData ); + std::shared_ptr< Excel::ExcelStruct< Excel::Action > > actionData ); virtual ~MountAction() = default; bool preCheck() override; diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index 411b39fd..f36eb7e6 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -92,7 +92,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, std::shared_ptr< Common::BNPCInstance auto& exdData = Common::Service< Data::ExdData >::ref(); - auto bNpcBaseData = exdData.getRow< Component::Excel::BNpcBase >( m_bNpcBaseId ); + auto bNpcBaseData = exdData.getRow< Excel::BNpcBase >( m_bNpcBaseId ); if( !bNpcBaseData ) { Logger::debug( "BNpcBase#{0} not found in exd data!", m_bNpcBaseId ); @@ -133,7 +133,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, std::shared_ptr< Common::BNPCInstance m_radius = bNpcBaseData->data().Scale; if( bNpcBaseData->data().Customize != 0 ) { - auto bnpcCustom = exdData.getRow< Component::Excel::BNpcCustomize >( bNpcBaseData->data().Customize ); + auto bnpcCustom = exdData.getRow< Excel::BNpcCustomize >( bNpcBaseData->data().Customize ); if( bnpcCustom ) { memcpy( m_customize, reinterpret_cast< char* >( &bnpcCustom->data() ), sizeof( m_customize ) ); @@ -142,7 +142,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, std::shared_ptr< Common::BNPCInstance if( bNpcBaseData->data().Equipment != 0 ) { - auto bnpcEquip = exdData.getRow< Component::Excel::NpcEquip >( bNpcBaseData->data().Equipment ); + auto bnpcEquip = exdData.getRow< Excel::NpcEquip >( bNpcBaseData->data().Equipment ); if( bnpcEquip ) { m_weaponMain = bnpcEquip->data().WeaponModel; @@ -151,10 +151,10 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, std::shared_ptr< Common::BNPCInstance } } - auto modelChara = exdData.getRow< Component::Excel::ModelChara >( bNpcBaseData->data().Model ); + auto modelChara = exdData.getRow< Excel::ModelChara >( bNpcBaseData->data().Model ); if( modelChara ) { - auto modelSkeleton = exdData.getRow< Component::Excel::ModelSkeleton >( modelChara->data().SkeletonId ); + auto modelSkeleton = exdData.getRow< Excel::ModelSkeleton >( modelChara->data().SkeletonId ); if( modelSkeleton ) { m_radius *= modelSkeleton->data().Radius; @@ -209,7 +209,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, std::shared_ptr< Common::BNPCInstance auto& exdData = Common::Service< Data::ExdData >::ref(); - auto bNpcBaseData = exdData.getRow< Component::Excel::BNpcBase >( m_bNpcBaseId ); + auto bNpcBaseData = exdData.getRow< Excel::BNpcBase >( m_bNpcBaseId ); if( !bNpcBaseData ) { Logger::debug( "BNpcBase#{0} not found in exd data!", m_bNpcBaseId ); @@ -246,7 +246,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, std::shared_ptr< Common::BNPCInstance m_radius = bNpcBaseData->data().Scale; if( bNpcBaseData->data().Customize != 0 ) { - auto bnpcCustom = exdData.getRow< Component::Excel::BNpcCustomize >( bNpcBaseData->data().Customize ); + auto bnpcCustom = exdData.getRow< Excel::BNpcCustomize >( bNpcBaseData->data().Customize ); if( bnpcCustom ) { memcpy( m_customize, reinterpret_cast< char* >( &bnpcCustom->data() ), sizeof( m_customize ) ); @@ -255,7 +255,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, std::shared_ptr< Common::BNPCInstance if( bNpcBaseData->data().Equipment != 0 ) { - auto bnpcEquip = exdData.getRow< Component::Excel::NpcEquip >( bNpcBaseData->data().Equipment ); + auto bnpcEquip = exdData.getRow< Excel::NpcEquip >( bNpcBaseData->data().Equipment ); if( bnpcEquip ) { m_weaponMain = bnpcEquip->data().WeaponModel; @@ -264,10 +264,10 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, std::shared_ptr< Common::BNPCInstance } } - auto modelChara = exdData.getRow< Component::Excel::ModelChara >( bNpcBaseData->data().Model ); + auto modelChara = exdData.getRow< Excel::ModelChara >( bNpcBaseData->data().Model ); if( modelChara ) { - auto modelSkeleton = exdData.getRow< Component::Excel::ModelSkeleton >( modelChara->data().ModelType ); + auto modelSkeleton = exdData.getRow< Excel::ModelSkeleton >( modelChara->data().ModelType ); if( modelSkeleton ) m_radius *= modelSkeleton->data().Radius; } @@ -792,7 +792,7 @@ void Sapphire::Entity::BNpc::onDeath() taskMgr.queueTask( World::makeRemoveBNpcTask( 12000, getAsBNpc() ) ); auto& exdData = Common::Service< Data::ExdData >::ref(); - auto paramGrowthInfo = exdData.getRow< Component::Excel::ParamGrow >( m_level ); + auto paramGrowthInfo = exdData.getRow< Excel::ParamGrow >( m_level ); for( auto& pHateEntry : m_hateList ) { @@ -965,8 +965,8 @@ void Sapphire::Entity::BNpc::calculateStats() auto& exdData = Common::Service< Data::ExdData >::ref(); - auto classInfo = exdData.getRow< Component::Excel::ClassJob >( job ); - auto paramGrowthInfo = exdData.getRow< Component::Excel::ParamGrow >( level ); + auto classInfo = exdData.getRow< Excel::ClassJob >( job ); + auto paramGrowthInfo = exdData.getRow< Excel::ParamGrow >( level ); float base = Math::CalcStats::calculateBaseStat( *this ); diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp index 4c50acc1..25c3cfcf 100644 --- a/src/world/Actor/Chara.cpp +++ b/src/world/Actor/Chara.cpp @@ -748,7 +748,7 @@ Sapphire::Common::BaseParam Sapphire::Entity::Chara::getPrimaryStat() const { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto classJob = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint16_t >( getClass() ) ); + auto classJob = exdData.getRow< Excel::ClassJob >( static_cast< uint16_t >( getClass() ) ); assert( classJob ); return static_cast< Sapphire::Common::BaseParam >( classJob->data().Role ); diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index 012cdac1..f0811f88 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -219,7 +219,7 @@ Sapphire::Common::OnlineStatus Sapphire::Entity::Player::getOnlineStatus() const if( !bit ) continue; - auto pOnlineStatus = exdData.getRow< Component::Excel::OnlineStatus >( i ); + auto pOnlineStatus = exdData.getRow< Excel::OnlineStatus >( i ); if( !pOnlineStatus ) continue; @@ -323,9 +323,9 @@ void Sapphire::Entity::Player::calculateStats() auto& exdData = Common::Service< Data::ExdData >::ref(); - auto classInfo = exdData.getRow< Component::Excel::ClassJob >( job ); - auto tribeInfo = exdData.getRow< Component::Excel::Tribe >( tribe ); - auto paramGrowthInfo = exdData.getRow< Component::Excel::ParamGrow >( level ); + auto classInfo = exdData.getRow< Excel::ClassJob >( job ); + auto tribeInfo = exdData.getRow< Excel::Tribe >( tribe ); + auto paramGrowthInfo = exdData.getRow< Excel::ParamGrow >( level ); float base = Math::CalcStats::calculateBaseStat( *this ); @@ -404,7 +404,7 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type ) auto& exdData = Common::Service< Data::ExdData >::ref(); auto& terriMgr = Common::Service< TerritoryMgr >::ref(); - auto aetherData = exdData.getRow< Component::Excel::Aetheryte >( aetheryteId ); + auto aetherData = exdData.getRow< Excel::Aetheryte >( aetheryteId ); if( !aetherData ) return; @@ -433,8 +433,8 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type ) PlayerMgr::sendDebug( *this, "Teleport: popRange {0} not found in {1}!", data.PopRange[ 0 ], data.TerritoryType ); } - auto townPlace = exdData.getRow< Component::Excel::PlaceName >( data.TelepoName ); - auto aetherytePlace = exdData.getRow< Component::Excel::PlaceName >( data.TransferName ); + auto townPlace = exdData.getRow< Excel::PlaceName >( data.TelepoName ); + auto aetherytePlace = exdData.getRow< Excel::PlaceName >( data.TransferName ); PlayerMgr::sendDebug( *this, "Teleport: {0} - {1} ({2})", townPlace->getString( townPlace->data().Text.SGL ), @@ -617,7 +617,7 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id ) int32_t offset; - auto info = exdData.getRow< Component::Excel::Map >( map_id ); + auto info = exdData.getRow< Excel::Map >( map_id ); if( !info ) { PlayerMgr::sendDebug( *this, "discover(): Could not obtain map data for map_id == {0}", map_id ); @@ -638,7 +638,7 @@ void Sapphire::Entity::Player::discover( int16_t map_id, int16_t sub_id ) uint16_t level = getLevel(); - uint32_t exp = ( exdData.getRow< Component::Excel::ParamGrow >( level )->data().NextExp * 5 / 100 ); + uint32_t exp = ( exdData.getRow< Excel::ParamGrow >( level )->data().NextExp * 5 / 100 ); gainExp( exp ); @@ -744,8 +744,8 @@ void Sapphire::Entity::Player::gainExp( uint32_t amount ) auto& exdData = Common::Service< Data::ExdData >::ref(); - uint32_t neededExpToLevel = exdData.getRow< Component::Excel::ParamGrow >( level )->data().NextExp; - uint32_t neededExpToLevelPlus1 = exdData.getRow< Component::Excel::ParamGrow >( level + 1 )->data().NextExp; + uint32_t neededExpToLevel = exdData.getRow< Excel::ParamGrow >( level )->data().NextExp; + uint32_t neededExpToLevelPlus1 = exdData.getRow< Excel::ParamGrow >( level + 1 )->data().NextExp; if( ( currentExp + amount ) >= neededExpToLevel ) { @@ -785,7 +785,7 @@ void Sapphire::Entity::Player::sendStatusUpdate() uint8_t Sapphire::Entity::Player::getLevel() const { auto& exdData = Common::Service< Data::ExdData >::ref(); - uint8_t classJobIndex = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( getClass() ) )->data().WorkIndex; + uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( getClass() ) )->data().WorkIndex; return static_cast< uint8_t >( m_classArray[ classJobIndex ] ); } @@ -798,7 +798,7 @@ uint8_t Sapphire::Entity::Player::getLevelSync() const uint8_t Sapphire::Entity::Player::getLevelForClass( Common::ClassJob pClass ) const { auto& exdData = Common::Service< Data::ExdData >::ref(); - uint8_t classJobIndex = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( pClass ) )->data().WorkIndex; + uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( pClass ) )->data().WorkIndex; return static_cast< uint8_t >( m_classArray[ classJobIndex ] ); } @@ -811,14 +811,14 @@ bool Sapphire::Entity::Player::isClassJobUnlocked( Common::ClassJob classJob ) c uint32_t Sapphire::Entity::Player::getExp() const { auto& exdData = Common::Service< Data::ExdData >::ref(); - uint8_t classJobIndex = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( getClass() ) )->data().WorkIndex; + uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( getClass() ) )->data().WorkIndex; return m_expArray[ classJobIndex ]; } void Sapphire::Entity::Player::setExp( uint32_t amount ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - uint8_t classJobIndex = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( getClass() ) )->data().WorkIndex; + uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( getClass() ) )->data().WorkIndex; m_expArray[ classJobIndex ] = amount; } @@ -852,14 +852,14 @@ void Sapphire::Entity::Player::setClassJob( Common::ClassJob classJob ) void Sapphire::Entity::Player::setLevel( uint8_t level ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - uint8_t classJobIndex = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( getClass() ) )->data().WorkIndex; + uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( getClass() ) )->data().WorkIndex; m_classArray[ classJobIndex ] = level; } void Sapphire::Entity::Player::setLevelForClass( uint8_t level, Common::ClassJob classjob ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - uint8_t classJobIndex = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( classjob ) )->data().WorkIndex; + uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( classjob ) )->data().WorkIndex; if( m_classArray[ classJobIndex ] == 0 ) insertDbClass( classJobIndex, level ); @@ -1174,7 +1174,7 @@ const Sapphire::Entity::Player::OrchestrionList& Sapphire::Entity::Player::getOr void Sapphire::Entity::Player::unlockMount( uint32_t mountId ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto mount = exdData.getRow< Component::Excel::Mount >( mountId ); + auto mount = exdData.getRow< Excel::Mount >( mountId ); if( mount->data().MountOrder == -1 ) return; @@ -1408,7 +1408,7 @@ void Sapphire::Entity::Player::setCompanion( uint8_t id ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto companion = exdData.getRow< Component::Excel::Companion >( id ); + auto companion = exdData.getRow< Excel::Companion >( id ); if( !id ) return; @@ -1698,12 +1698,12 @@ void Sapphire::Entity::Player::teleportQuery( uint16_t aetheryteId ) { auto& exdData = Common::Service< Data::ExdData >::ref(); // TODO: only register this action if enough gil is in possession - auto targetAetheryte = exdData.getRow< Component::Excel::Aetheryte >( aetheryteId ); + auto targetAetheryte = exdData.getRow< Excel::Aetheryte >( aetheryteId ); if( targetAetheryte ) { - auto fromAetheryte = exdData.getRow< Component::Excel::Aetheryte >( - exdData.getRow< Component::Excel::TerritoryType >( getTerritoryTypeId() )->data().Aetheryte ); + auto fromAetheryte = exdData.getRow< Excel::Aetheryte >( + exdData.getRow< Excel::TerritoryType >( getTerritoryTypeId() )->data().Aetheryte ); // calculate cost - does not apply for favorite points or homepoints neither checks for aether tickets auto cost = static_cast< uint16_t > ( @@ -1892,7 +1892,7 @@ void Sapphire::Entity::Player::sendHuntingLog() bool allComplete = true; auto monsterNoteId = ( count + 1 ) * 10000 + entry.rank * 10 + i; - auto monsterNote = exdData.getRow< Component::Excel::MonsterNote >( monsterNoteId ); + auto monsterNote = exdData.getRow< Excel::MonsterNote >( monsterNoteId ); if( !monsterNote ) continue; @@ -1930,7 +1930,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id ) // make sure we get the matching base-class if a job is being used auto currentClass = currentClassId; - auto classJobInfo = pExdData.getRow< Component::Excel::ClassJob >( currentClass ); + auto classJobInfo = pExdData.getRow< Excel::ClassJob >( currentClass ); if( !classJobInfo ) return; @@ -1940,7 +1940,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id ) bool sectionComplete = true; bool sectionChanged = false; auto monsterNoteId = static_cast< uint32_t >( classJobInfo->data().MainClass * 10000 + logEntry.rank * 10 + i ); - auto note = pExdData.getRow< Component::Excel::MonsterNote >( monsterNoteId ); + auto note = pExdData.getRow< Excel::MonsterNote >( monsterNoteId ); // for classes that don't have entries, if the first fails the rest will fail if( !note ) @@ -1948,7 +1948,7 @@ void Sapphire::Entity::Player::updateHuntingLog( uint16_t id ) for( auto x = 0; x < 4; ++x ) { - auto note1 = pExdData.getRow< Component::Excel::MonsterNoteTarget >( note->data().Target[ x ] ); + auto note1 = pExdData.getRow< Excel::MonsterNoteTarget >( note->data().Target[ x ] ); if( note1->data().Monster == id && logEntry.entries[ i - 1 ][ x ] < note->data().NeededKills[ x ] ) { logEntry.entries[ i - 1 ][ x ]++; diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp index 20bf3a70..44335086 100644 --- a/src/world/Actor/PlayerInventory.cpp +++ b/src/world/Actor/PlayerInventory.cpp @@ -112,9 +112,9 @@ void Sapphire::Entity::Player::equipWeapon( const Item& item ) { auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); - auto itemInfo = exdData.getRow< Component::Excel::Item >( item.getId() ); + auto itemInfo = exdData.getRow< Excel::Item >( item.getId() ); auto itemClassJob = itemInfo->data().Class; - auto classJobInfo = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint32_t >( getClass() ) ); + auto classJobInfo = exdData.getRow< Excel::ClassJob >( static_cast< uint32_t >( getClass() ) ); auto currentParentClass = static_cast< ClassJob >( classJobInfo->data().MainClass ); auto newClassJob = static_cast< ClassJob >( itemClassJob ); @@ -128,7 +128,7 @@ void Sapphire::Entity::Player::equipSoulCrystal( const Item& item ) { auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); - auto itemInfo = exdData.getRow< Component::Excel::Item >( item.getId() ); + auto itemInfo = exdData.getRow< Excel::Item >( item.getId() ); auto itemClassJob = itemInfo->data().Class; auto newClassJob = static_cast< ClassJob >( itemClassJob ); @@ -281,7 +281,7 @@ void Sapphire::Entity::Player::unequipSoulCrystal() { auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); - auto currentClassJob = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint32_t >( getClass() ) ); + auto currentClassJob = exdData.getRow< Excel::ClassJob >( static_cast< uint32_t >( getClass() ) ); auto parentClass = static_cast< ClassJob >( currentClassJob->data().MainClass ); setClassJob( parentClass ); } @@ -567,7 +567,7 @@ bool Sapphire::Entity::Player::isObtainable( uint32_t catalogId, uint8_t quantit Sapphire::ItemPtr Sapphire::Entity::Player::addItem( uint32_t catalogId, uint32_t quantity, bool isHq, bool silent, bool canMerge ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto itemInfo = exdData.getRow< Component::Excel::Item >( catalogId ); + auto itemInfo = exdData.getRow< Excel::Item >( catalogId ); // if item data doesn't exist or it's a blank field if( !itemInfo || itemInfo->data().EquipLevel == 0 ) diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp index d71f3f48..eb93924b 100644 --- a/src/world/Actor/PlayerSql.cpp +++ b/src/world/Actor/PlayerSql.cpp @@ -439,7 +439,7 @@ void Sapphire::Entity::Player::updateDbClass() const { auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref(); auto& exdData = Common::Service< Data::ExdData >::ref(); - uint8_t classJobIndex = exdData.getRow< Component::Excel::ClassJob >( static_cast( getClass() ) )->data().WorkIndex; + uint8_t classJobIndex = exdData.getRow< Excel::ClassJob >( static_cast( getClass() ) )->data().WorkIndex; //Exp = ?, Lvl = ? WHERE CharacterId = ? AND ClassIdx = ? auto stmtS = db.getPreparedStatement( Db::CHARA_CLASS_UP ); @@ -609,7 +609,7 @@ Sapphire::ItemPtr Sapphire::Entity::Player::createItem( uint32_t catalogId, uint auto& db = Common::Service< Db::DbWorkerPool< Db::ZoneDbConnection > >::ref(); auto& itemMgr = Common::Service< World::Manager::ItemMgr >::ref(); - auto itemInfo = exdData.getRow< Component::Excel::Item >( catalogId ); + auto itemInfo = exdData.getRow< Excel::Item >( catalogId ); if( !itemInfo ) return nullptr; diff --git a/src/world/ContentFinder/ContentFinder.cpp b/src/world/ContentFinder/ContentFinder.cpp index a29b7c20..adc29f08 100644 --- a/src/world/ContentFinder/ContentFinder.cpp +++ b/src/world/ContentFinder/ContentFinder.cpp @@ -40,7 +40,7 @@ void Sapphire::World::ContentFinder::update() break; case MatchingComplete: { - auto contentInfo = exdData.getRow< Component::Excel::InstanceContent >( content->getContentId() ); + auto contentInfo = exdData.getRow< Excel::InstanceContent >( content->getContentId() ); for( auto& queuedPlayer : content->m_players ) { uint32_t inProgress = 0; // 0x01 - in progress @@ -96,12 +96,12 @@ void Sapphire::World::ContentFinder::registerContentRequest( Sapphire::Entity::P void Sapphire::World::ContentFinder::registerRandomContentRequest( Sapphire::Entity::Player &player, uint32_t randomContentTypeId ) { auto& exdData = Service< Data::ExdData >::ref(); - auto contentListIds = exdData.getIdList< Component::Excel::InstanceContent >(); + auto contentListIds = exdData.getIdList< Excel::InstanceContent >(); std::vector< uint32_t > idList; for( auto id : contentListIds ) { - auto instanceContent = exdData.getRow< Component::Excel::InstanceContent >( id ); + auto instanceContent = exdData.getRow< Excel::InstanceContent >( id ); if( instanceContent->data().RandomContentType == randomContentTypeId ) { if( instanceContent->data().LevelMin <= player.getLevel() ) @@ -120,7 +120,7 @@ void Sapphire::World::ContentFinder::completeRegistration( const Sapphire::Entit auto queuedContent = m_queuedContent[ m_queuedPlayer[ player.getId() ]->getActiveRegisterId() ]; auto& exdData = Service< Data::ExdData >::ref(); - auto content = exdData.getRow< Component::Excel::InstanceContent >( queuedContent->getContentId() ); + auto content = exdData.getRow< Excel::InstanceContent >( queuedContent->getContentId() ); auto updatePacket = makeUpdateFindContent( player.getId(), content->data().TerritoryType, CompleteRegistration, 1, static_cast< uint32_t >( player.getClass() ) ); @@ -251,7 +251,7 @@ Sapphire::World::ContentFinder::QueuedContentPtrList Sapphire::World::ContentFin continue; auto& exdData = Common::Service< Data::ExdData >::ref(); - auto content = exdData.getRow< Component::Excel::InstanceContent >( contentId ); + auto content = exdData.getRow< Excel::InstanceContent >( contentId ); if( !content ) continue; @@ -316,7 +316,7 @@ void Sapphire::World::ContentFinder::withdraw( Entity::Player& player ) auto& exdData = Service< Data::ExdData >::ref(); auto queuedPlayer = m_queuedPlayer[ player.getId() ]; - auto contentInfo = exdData.getRow< Component::Excel::InstanceContent >( m_queuedContent[ queuedPlayer->getActiveRegisterId() ]->getContentId() ); + auto contentInfo = exdData.getRow< Excel::InstanceContent >( m_queuedContent[ queuedPlayer->getActiveRegisterId() ]->getContentId() ); // remove the player from the global CF list m_queuedPlayer.erase( player.getId() ); @@ -345,7 +345,7 @@ void Sapphire::World::ContentFinder::withdraw( Entity::Player& player ) if( updateRegisterIdSet.count( regId ) == 0 ) continue; - auto queuedContentInfo = exdData.getRow< Component::Excel::InstanceContent >( content.second->getContentId() ); + auto queuedContentInfo = exdData.getRow< Excel::InstanceContent >( content.second->getContentId() ); auto& playerList = content.second->m_players; for( const auto& pPlayer : playerList ) { @@ -400,7 +400,7 @@ Sapphire::World::QueuedContent::QueuedContent( uint32_t registerId, uint32_t con m_contentPopTime( 0 ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto content = exdData.getRow< Component::Excel::InstanceContent >( contentId ); + auto content = exdData.getRow< Excel::InstanceContent >( contentId ); } diff --git a/src/world/Inventory/Item.cpp b/src/world/Inventory/Item.cpp index de04ab04..4be8741d 100644 --- a/src/world/Inventory/Item.cpp +++ b/src/world/Inventory/Item.cpp @@ -15,7 +15,7 @@ Sapphire::Item::Item( uint64_t uId, uint32_t catalogId, bool isHq ) : m_reservedFlag( 0 ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto itemInfo = exdData.getRow< Component::Excel::Item >( catalogId ); + auto itemInfo = exdData.getRow< Excel::Item >( catalogId ); m_delayMs = itemInfo->data().AttackInterval; m_physicalDmg = itemInfo->data().Damage; diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp index 2fa90198..d0e57dc3 100644 --- a/src/world/Manager/ActionMgr.cpp +++ b/src/world/Manager/ActionMgr.cpp @@ -17,7 +17,7 @@ using namespace Sapphire; using namespace Sapphire::World::Manager; void ActionMgr::handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId, - Component::Excel::ExcelStructPtr< Component::Excel::Action > actionData, Common::FFXIVARR_POSITION3 pos, + Excel::ExcelStructPtr< Excel::Action > actionData, Common::FFXIVARR_POSITION3 pos, uint16_t sequence ) { PlayerMgr::sendDebug( player, "got aoe act: {0}", actionData->getString( actionData->data().Text.Name ) ); @@ -40,7 +40,7 @@ void ActionMgr::handlePlacedPlayerAction( Entity::Player& player, uint32_t actio } void ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId, - Component::Excel::ExcelStructPtr< Component::Excel::Action > actionData, uint64_t targetId, uint16_t sequence ) + Excel::ExcelStructPtr< Excel::Action > actionData, uint64_t targetId, uint16_t sequence ) { auto action = Action::make_Action( player.getAsPlayer(), actionId, sequence, actionData ); @@ -62,7 +62,7 @@ void ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t act } void ActionMgr::handleItemAction( Sapphire::Entity::Player& player, uint32_t itemId, - Component::Excel::ExcelStructPtr< Component::Excel::ItemAction > itemActionData, + Excel::ExcelStructPtr< Excel::ItemAction > itemActionData, uint16_t itemSourceSlot, uint16_t itemSourceContainer ) { PlayerMgr::sendDebug( player, "got item act: {0}, slot: {1}, container: {2}", itemId, itemSourceSlot, itemSourceContainer ); @@ -75,7 +75,7 @@ void ActionMgr::handleItemAction( Sapphire::Entity::Player& player, uint32_t ite } void ActionMgr::handleEventItemAction( Sapphire::Entity::Player& player, uint32_t itemId, - Component::Excel::ExcelStructPtr< Component::Excel::EventItem > itemActionData, + Excel::ExcelStructPtr< Excel::EventItem > itemActionData, uint32_t sequence, uint64_t targetId ) { auto action = Action::make_EventItemAction( player.getAsChara(), itemId, itemActionData, sequence, targetId ); @@ -90,7 +90,7 @@ void ActionMgr::handleEventItemAction( Sapphire::Entity::Player& player, uint32_ } void ActionMgr::handleMountAction( Entity::Player& player, uint16_t mountId, - Component::Excel::ExcelStructPtr< Component::Excel::Action > actionData, uint64_t targetId, + Excel::ExcelStructPtr< Excel::Action > actionData, uint64_t targetId, uint16_t sequence ) { PlayerMgr::sendDebug( player, "setMount: {0}", mountId ); @@ -106,7 +106,7 @@ void ActionMgr::handleMountAction( Entity::Player& player, uint16_t mountId, } void ActionMgr::bootstrapAction( Entity::Player& player, Action::ActionPtr currentAction, - Component::Excel::ExcelStructPtr< Component::Excel::Action > actionData ) + Excel::ExcelStructPtr< Excel::Action > actionData ) { /* //TODO: need to be fixed @@ -140,7 +140,7 @@ void ActionMgr::bootstrapAction( Entity::Player& player, Action::ActionPtr curre bool ActionMgr::actionHasCastTime( uint32_t actionId ) //TODO: Add logic for special cases { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto actionInfoPtr = exdData.getRow< Component::Excel::Action >( actionId ); + auto actionInfoPtr = exdData.getRow< Excel::Action >( actionId ); if( actionInfoPtr->data().ComboContinue ) return false; diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h index 5a440023..2be47dda 100644 --- a/src/world/Manager/ActionMgr.h +++ b/src/world/Manager/ActionMgr.h @@ -21,23 +21,23 @@ namespace Sapphire::World::Manager ~ActionMgr() = default; void handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > actionData, uint64_t targetId, uint16_t sequence ); + std::shared_ptr< Excel::ExcelStruct< Excel::Action > > actionData, uint64_t targetId, uint16_t sequence ); void handlePlacedPlayerAction( Entity::Player& player, uint32_t actionId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > actionData, Common::FFXIVARR_POSITION3 pos, uint16_t sequence ); + std::shared_ptr< Excel::ExcelStruct< Excel::Action > > actionData, Common::FFXIVARR_POSITION3 pos, uint16_t sequence ); void handleItemAction( Entity::Player& player, uint32_t itemId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::ItemAction > > itemActionData, + std::shared_ptr< Excel::ExcelStruct< Excel::ItemAction > > itemActionData, uint16_t itemSourceSlot, uint16_t itemSourceContainer ); void handleEventItemAction( Entity::Player& player, uint32_t itemId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::EventItem > > itemActionData, uint32_t sequence, uint64_t targetId ); + std::shared_ptr< Excel::ExcelStruct< Excel::EventItem > > itemActionData, uint32_t sequence, uint64_t targetId ); void handleMountAction( Entity::Player& player, uint16_t mountId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > actionData, uint64_t targetId, uint16_t sequence ); + std::shared_ptr< Excel::ExcelStruct< Excel::Action > > actionData, uint64_t targetId, uint16_t sequence ); bool actionHasCastTime( uint32_t actionId ); private: - void bootstrapAction( Entity::Player& player, Action::ActionPtr currentAction, std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::Action > > actionData ); + void bootstrapAction( Entity::Player& player, Action::ActionPtr currentAction, std::shared_ptr< Excel::ExcelStruct< Excel::Action > > actionData ); // item action handlers void handleItemActionVFX( Entity::Player& player, uint32_t itemId, uint16_t vfxId ); diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index 274b601f..86bdf3ec 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -584,7 +584,7 @@ void DebugCommandMgr::get( char* data, Entity::Player& player, std::shared_ptr< if( ( subCommand == "pos" ) ) { - int16_t map_id = exdData.getRow< Component::Excel::TerritoryType >( player.getTerritoryTypeId() )->data().Map; + int16_t map_id = exdData.getRow< Excel::TerritoryType >( player.getTerritoryTypeId() )->data().Map; PlayerMgr::sendServerNotice( player, "Pos:\n {0}\n {1}\n {2}\n {3}\n MapId: {4}\n ZoneId:{5}", player.getPos().x, player.getPos().y, player.getPos().z, diff --git a/src/world/Manager/EventMgr.cpp b/src/world/Manager/EventMgr.cpp index d91e0772..47cb777d 100644 --- a/src/world/Manager/EventMgr.cpp +++ b/src/world/Manager/EventMgr.cpp @@ -48,7 +48,7 @@ std::string EventMgr::getEventName( uint32_t eventId ) { case Event::EventHandler::EventHandlerType::Quest: { - auto questInfo = exdData.getRow< Component::Excel::Quest >( eventId ); + auto questInfo = exdData.getRow< Excel::Quest >( eventId ); if( !questInfo ) return unknown + "Quest"; @@ -59,7 +59,7 @@ std::string EventMgr::getEventName( uint32_t eventId ) } case Event::EventHandler::EventHandlerType::CustomTalk: { - auto customTalkInfo = exdData.getRow< Component::Excel::CustomTalk >( eventId ); + auto customTalkInfo = exdData.getRow< Excel::CustomTalk >( eventId ); if( !customTalkInfo ) return unknown + "CustomTalk"; @@ -70,14 +70,14 @@ std::string EventMgr::getEventName( uint32_t eventId ) } case Event::EventHandler::EventHandlerType::Opening: { - auto openingInfo = exdData.getRow< Component::Excel::Opening >( eventId ); + auto openingInfo = exdData.getRow< Excel::Opening >( eventId ); if( openingInfo ) return openingInfo->getString( openingInfo->data().Script ); return unknown + "Opening"; } case Event::EventHandler::EventHandlerType::Aetheryte: { - auto aetherInfo = exdData.getRow< Component::Excel::Aetheryte >( eventId & 0xFFFF ); + auto aetherInfo = exdData.getRow< Excel::Aetheryte >( eventId & 0xFFFF ); if( aetherInfo->data().Telepo ) return "Aetheryte"; return "Aethernet"; @@ -90,10 +90,10 @@ std::string EventMgr::getEventName( uint32_t eventId ) case Event::EventHandler::EventHandlerType::QuestBattleDirector: { - auto qbInfo = exdData.getRow< Component::Excel::QuestBattle >( eventId & 0xFFFF ); + auto qbInfo = exdData.getRow< Excel::QuestBattle >( eventId & 0xFFFF ); if( !qbInfo ) return "unknown"; - auto questInfo = exdData.getRow< Component::Excel::Quest >( qbInfo->data().Quest ); + auto questInfo = exdData.getRow< Excel::Quest >( qbInfo->data().Quest ); if( !questInfo ) return "unknown"; @@ -107,7 +107,7 @@ std::string EventMgr::getEventName( uint32_t eventId ) case Event::EventHandler::EventHandlerType::Warp: { - auto warpInfo = exdData.getRow< Component::Excel::Warp >( eventId ); + auto warpInfo = exdData.getRow< Excel::Warp >( eventId ); if( warpInfo ) return "WarpTaxi"; return unknown + "ChocoboWarp"; //who know @@ -115,7 +115,7 @@ std::string EventMgr::getEventName( uint32_t eventId ) case Event::EventHandler::EventHandlerType::Shop: { - //auto shopInfo = exdData.getRow< Component::Excel::ShopStruct >( eventId ); + //auto shopInfo = exdData.getRow< Excel::ShopStruct >( eventId ); return "GilShop" + std::to_string( eventId ); /*if( shopInfo ) @@ -224,7 +224,7 @@ uint32_t EventMgr::mapEventActorToRealActor( uint32_t eventActorId ) { auto& instanceObjectCache = Common::Service< InstanceObjectCache >::ref(); auto& exdData = Common::Service< Data::ExdData >::ref(); - auto levelInfo = exdData.getRow< Component::Excel::Level >( eventActorId ); + auto levelInfo = exdData.getRow< Excel::Level >( eventActorId ); if( levelInfo ) return levelInfo->data().BaseId; else if( auto pObj = instanceObjectCache.getEObj( eventActorId ) ) @@ -546,7 +546,7 @@ void EventMgr::playGilShop( Entity::Player& player, uint32_t eventId, uint32_t f for( auto it = player.getSoldItems()->cbegin(); it != player.getSoldItems()->cend(); ++it ) { - auto item = exdData.getRow< Component::Excel::Item >( it->first ); + auto item = exdData.getRow< Excel::Item >( it->first ); params.push_back( it->first ); //itemCatalogId params.push_back( it->second ); //stack params.push_back( item->data().Price ); //price diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp index 61fd4e53..f4733556 100644 --- a/src/world/Manager/HousingMgr.cpp +++ b/src/world/Manager/HousingMgr.cpp @@ -590,7 +590,7 @@ bool HousingMgr::initHouseModels( Entity::Player& player, LandPtr land, uint32_t houseInventory[ Common::InventoryType::HousingExteriorAppearance ] = extContainer; auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); - auto preset = exdData.getRow< Component::Excel::HousingPreset >( getItemAdditionalData( presetCatalogId ) ); + auto preset = exdData.getRow< Excel::HousingPreset >( getItemAdditionalData( presetCatalogId ) ); if( !preset ) return false; @@ -980,7 +980,7 @@ void HousingMgr::updateHouseModels( HousePtr house ) uint32_t HousingMgr::getItemAdditionalData( uint32_t catalogId ) { auto& pExdData = Common::Service< Data::ExdData >::ref(); - auto info = pExdData.getRow< Component::Excel::Item >( catalogId ); + auto info = pExdData.getRow< Excel::Item >( catalogId ); return info->data().CategoryArg; } diff --git a/src/world/Manager/InventoryMgr.cpp b/src/world/Manager/InventoryMgr.cpp index 349623bd..e743300f 100644 --- a/src/world/Manager/InventoryMgr.cpp +++ b/src/world/Manager/InventoryMgr.cpp @@ -78,7 +78,7 @@ ItemPtr InventoryMgr::createItem( Entity::Player& player, uint32_t catalogId, ui { auto& pExdData = Common::Service< Data::ExdData >::ref(); auto& itemMgr = Common::Service< ItemMgr >::ref(); - auto itemInfo = pExdData.getRow< Component::Excel::Item >( catalogId ); + auto itemInfo = pExdData.getRow< Excel::Item >( catalogId ); if( !itemInfo ) return nullptr; diff --git a/src/world/Manager/ItemMgr.cpp b/src/world/Manager/ItemMgr.cpp index 14311212..b96579a1 100644 --- a/src/world/Manager/ItemMgr.cpp +++ b/src/world/Manager/ItemMgr.cpp @@ -134,7 +134,7 @@ ItemPtr ItemMgr::loadItem( uint64_t uId ) try { - auto itemInfo = exdData.getRow< Component::Excel::Item >( itemRes->getUInt( 1 ) ); + auto itemInfo = exdData.getRow< Excel::Item >( itemRes->getUInt( 1 ) ); bool isHq = itemRes->getUInt( 3 ) == 1; ItemPtr pItem = make_Item( uId, diff --git a/src/world/Manager/PartyMgr.cpp b/src/world/Manager/PartyMgr.cpp index 1eda6510..ed2fcbee 100644 --- a/src/world/Manager/PartyMgr.cpp +++ b/src/world/Manager/PartyMgr.cpp @@ -361,7 +361,7 @@ void PartyMgr::sendPartyUpdate( Party& party ) for( const auto& member : partyMembers ) { - auto classJob = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( member->getClass() ) ); + auto classJob = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( member->getClass() ) ); if( !classJob ) continue; diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp index d9f53df3..e1ba4a17 100644 --- a/src/world/Manager/PlayerMgr.cpp +++ b/src/world/Manager/PlayerMgr.cpp @@ -84,11 +84,11 @@ void PlayerMgr::onSendStats( Entity::Player& player ) auto& exd = Common::Service< Data::ExdData >::ref(); // todo: this is no doubt slow as shit... - auto idList = exd.getIdList< Component::Excel::BaseParam >(); + auto idList = exd.getIdList< Excel::BaseParam >(); for( const auto id : idList ) { - auto row = exd.getRow< Component::Excel::BaseParam >( id ); + auto row = exd.getRow< Excel::BaseParam >( id ); if( !row ) { continue; diff --git a/src/world/Manager/QuestMgr.cpp b/src/world/Manager/QuestMgr.cpp index 9582cfb3..e76119d3 100644 --- a/src/world/Manager/QuestMgr.cpp +++ b/src/world/Manager/QuestMgr.cpp @@ -61,11 +61,11 @@ bool QuestMgr::giveQuestRewards( Entity::Player& player, uint16_t questId, uint3 { auto& exdData = Common::Service< Data::ExdData >::ref(); uint32_t playerLevel = player.getLevel(); - auto questInfo = exdData.getRow< Component::Excel::Quest >( static_cast< uint32_t >( Event::EventHandler::EventHandlerType::Quest ) << 16 | questId ); + auto questInfo = exdData.getRow< Excel::Quest >( static_cast< uint32_t >( Event::EventHandler::EventHandlerType::Quest ) << 16 | questId ); if( !questInfo ) return false; - auto paramGrowth = exdData.getRow< Component::Excel::ParamGrow >( questInfo->data().ClassLevel ); + auto paramGrowth = exdData.getRow< Excel::ParamGrow >( questInfo->data().ClassLevel ); uint32_t exp = ( questInfo->data().Reward.ExpBonus * paramGrowth->data().BaseExp * paramGrowth->data().EventExpRate ) / 100; uint32_t gilReward = questInfo->data().Reward.Gil; diff --git a/src/world/Manager/ShopMgr.cpp b/src/world/Manager/ShopMgr.cpp index 3e5c1684..2c23293f 100644 --- a/src/world/Manager/ShopMgr.cpp +++ b/src/world/Manager/ShopMgr.cpp @@ -12,20 +12,20 @@ using namespace Sapphire::World::Manager; void ShopMgr::cacheShop( uint32_t shopId ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto itemShopList = exdData.getIdList< Component::Excel::Shop >(); + auto itemShopList = exdData.getIdList< Excel::Shop >(); uint8_t count = 0; for( auto itemShop : itemShopList ) { if( shopId == itemShop ) { - auto shop = exdData.getRow< Component::Excel::Shop >( itemShop ); + auto shop = exdData.getRow< Excel::Shop >( itemShop ); for( auto shopItemId : shop->data().Item ) { - auto shopItem = exdData.getRow< Component::Excel::ShopItem >( shopItemId ); + auto shopItem = exdData.getRow< Excel::ShopItem >( shopItemId ); if( !shopItem ) continue; - auto item = exdData.getRow< Component::Excel::Item >( shopItem->data().ItemId ); + auto item = exdData.getRow< Excel::Item >( shopItem->data().ItemId ); if( !item || item->data().Price == 0 ) continue; @@ -61,7 +61,7 @@ bool ShopMgr::purchaseGilShopItem( Entity::Player& player, uint32_t shopId, uint { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto item = exdData.getRow< Component::Excel::Item >( itemId ); + auto item = exdData.getRow< Excel::Item >( itemId ); if( !item ) return false; @@ -82,7 +82,7 @@ bool ShopMgr::sellGilShopItem( Entity::Player& player, uint16_t container, uint8 { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto item = exdData.getRow< Component::Excel::Item >( itemId ); + auto item = exdData.getRow< Excel::Item >( itemId ); if( !item ) return false; diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp index fe1fc5a5..1e42999e 100644 --- a/src/world/Manager/TerritoryMgr.cpp +++ b/src/world/Manager/TerritoryMgr.cpp @@ -34,11 +34,11 @@ TerritoryMgr::TerritoryMgr() : void TerritoryMgr::loadTerritoryTypeDetailCache() { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto idList = exdData.getIdList< Component::Excel::TerritoryType >(); + auto idList = exdData.getIdList< Excel::TerritoryType >(); for( auto id : idList ) { - auto teri1 = exdData.getRow< Component::Excel::TerritoryType >( id ); + auto teri1 = exdData.getRow< Excel::TerritoryType >( id ); if( !teri1->getString( teri1->data().Name ).empty() && id > 90 ) m_territoryTypeDetailCacheMap[ id ] = teri1; @@ -79,10 +79,10 @@ uint32_t TerritoryMgr::getNextInstanceId() return ++m_lastInstanceId; } -Component::Excel::ExcelStructPtr< Component::Excel::TerritoryType > TerritoryMgr::getTerritoryDetail( uint32_t territoryTypeId ) const +Excel::ExcelStructPtr< Excel::TerritoryType > TerritoryMgr::getTerritoryDetail( uint32_t territoryTypeId ) const { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto teri1 = exdData.getRow< Component::Excel::TerritoryType >( territoryTypeId ); + auto teri1 = exdData.getRow< Excel::TerritoryType >( territoryTypeId ); if( !teri1 ) return nullptr; @@ -160,11 +160,11 @@ bool TerritoryMgr::isHousingTerritory( uint32_t territoryTypeId ) const uint32_t TerritoryMgr::getInstanceContentId( uint32_t territoryTypeId ) const { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto contentListIds = exdData.getIdList< Component::Excel::InstanceContent >(); + auto contentListIds = exdData.getIdList< Excel::InstanceContent >(); for( auto id : contentListIds ) { - auto instanceContent = exdData.getRow< Component::Excel::InstanceContent >( id ); + auto instanceContent = exdData.getRow< Excel::InstanceContent >( id ); if( instanceContent->data().TerritoryType == territoryTypeId ) { return id; @@ -188,7 +188,7 @@ bool TerritoryMgr::createDefaultTerritories() if( territoryInfo->getString( territoryData.Name ).empty() ) continue; - auto pPlaceName = exdData.getRow< Component::Excel::PlaceName >( territoryData.Area ); + auto pPlaceName = exdData.getRow< Excel::PlaceName >( territoryData.Area ); if( !pPlaceName || pPlaceName->getString( pPlaceName->data().Text.SGL ).empty() || !isDefaultTerritory( territoryTypeId ) ) continue; @@ -237,7 +237,7 @@ bool TerritoryMgr::createHousingTerritories() if( territoryInfo->getString( territoryInfo->data().Name ).empty() ) continue; - auto pPlaceName = exdData.getRow< Component::Excel::PlaceName >( territoryInfo->data().Area ); + auto pPlaceName = exdData.getRow< Excel::PlaceName >( territoryInfo->data().Area ); if( !pPlaceName || pPlaceName->getString( pPlaceName->data().Text.SGL ).empty() || !isHousingTerritory( territoryTypeId ) ) continue; @@ -280,7 +280,7 @@ TerritoryPtr TerritoryMgr::createTerritoryInstance( uint32_t territoryTypeId ) auto& exdData = Common::Service< Data::ExdData >::ref(); auto pTeri = getTerritoryDetail( territoryTypeId ); - auto pPlaceName = exdData.getRow< Component::Excel::PlaceName >( pTeri->data().Area ); + auto pPlaceName = exdData.getRow< Excel::PlaceName >( pTeri->data().Area ); if( !pTeri || !pPlaceName ) return nullptr; @@ -302,18 +302,18 @@ TerritoryPtr TerritoryMgr::createQuestBattle( uint32_t questBattleId ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto pQuestBattleInfo = exdData.getRow< Component::Excel::QuestBattle >( questBattleId ); + auto pQuestBattleInfo = exdData.getRow< Excel::QuestBattle >( questBattleId ); if( !pQuestBattleInfo ) return nullptr; - auto pQuestInfo = exdData.getRow< Component::Excel::Quest >( pQuestBattleInfo->data().Quest ); + auto pQuestInfo = exdData.getRow< Excel::Quest >( pQuestBattleInfo->data().Quest ); if( !pQuestInfo || pQuestInfo->getString( pQuestInfo->data().Text.Name ).empty() ) return nullptr; - for( auto& teriId : exdData.getIdList< Component::Excel::TerritoryType >() ) + for( auto& teriId : exdData.getIdList< Excel::TerritoryType >() ) { - auto pTeri = exdData.getRow< Component::Excel::TerritoryType >( teriId ); + auto pTeri = exdData.getRow< Excel::TerritoryType >( teriId ); if( !pTeri || pTeri->data().QuestBattle != questBattleId ) continue; @@ -345,7 +345,7 @@ TerritoryPtr TerritoryMgr::createInstanceContent( uint32_t instanceContentId ) auto& exdData = Common::Service< Data::ExdData >::ref(); - auto pInstanceContent = exdData.getRow< Component::Excel::InstanceContent >( instanceContentId ); + auto pInstanceContent = exdData.getRow< Excel::InstanceContent >( instanceContentId ); if( !pInstanceContent || !isInstanceContentTerritory( pInstanceContent->data().TerritoryType ) ) return nullptr; diff --git a/src/world/Manager/TerritoryMgr.h b/src/world/Manager/TerritoryMgr.h index 97761965..35aa5c8f 100644 --- a/src/world/Manager/TerritoryMgr.h +++ b/src/world/Manager/TerritoryMgr.h @@ -118,7 +118,7 @@ namespace Sapphire::World::Manager TerritoryPtr getTerritoryByGuId( uint32_t guId ) const; /*! returns the cached detail of a territory, nullptr if not found */ - Component::Excel::ExcelStructPtr< Component::Excel::TerritoryType > getTerritoryDetail( uint32_t territoryTypeId ) const; + Excel::ExcelStructPtr< Excel::TerritoryType > getTerritoryDetail( uint32_t territoryTypeId ) const; /*! loop for processing territory logic, iterating all existing instances */ void updateTerritoryInstances( uint64_t tickCount ); @@ -153,7 +153,7 @@ namespace Sapphire::World::Manager float getInRangeDistance() const; private: - using TerritoryTypeDetailCache = std::unordered_map< uint16_t, std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::TerritoryType > > >; + using TerritoryTypeDetailCache = std::unordered_map< uint16_t, std::shared_ptr< Excel::ExcelStruct< Excel::TerritoryType > > >; using InstanceIdToTerritoryPtrMap = std::unordered_map< uint32_t, TerritoryPtr >; using TerritoryTypeIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToTerritoryPtrMap >; using InstanceContentIdToInstanceMap = std::unordered_map< uint16_t, InstanceIdToTerritoryPtrMap >; diff --git a/src/world/Math/CalcBattle.cpp b/src/world/Math/CalcBattle.cpp index be3ca494..fdc431b5 100644 --- a/src/world/Math/CalcBattle.cpp +++ b/src/world/Math/CalcBattle.cpp @@ -32,8 +32,8 @@ using namespace Sapphire::Entity; uint32_t CalcBattle::calculateHealValue( PlayerPtr pPlayer, uint32_t potency, Sapphire::FrameworkPtr pFw ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto classInfo = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) ); - auto paramGrowthInfo = exdData.getRow< Component::Excel::ParamGrow >( pPlayer->getLevel() ); + auto classInfo = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) ); + auto paramGrowthInfo = exdData.getRow< Excel::ParamGrow >( pPlayer->getLevel() ); if( !classInfo || !paramGrowthInfo ) return 0; diff --git a/src/world/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp index 74ccf7a9..95d1fbe0 100644 --- a/src/world/Math/CalcStats.cpp +++ b/src/world/Math/CalcStats.cpp @@ -129,8 +129,8 @@ uint32_t CalcStats::calculateMaxHp( Player& player ) // Is there any way to pull reliable BaseHP without having to manually use a pet for every level, and using the values from a table? // More info here: https://docs.google.com/spreadsheets/d/1de06KGT0cNRUvyiXNmjNgcNvzBCCQku7jte5QxEQRbs/edit?usp=sharing - auto classInfo = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( player.getClass() ) ); - auto paramGrowthInfo = exdData.getRow< Component::Excel::ParamGrow >( player.getLevel() ); + auto classInfo = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( player.getClass() ) ); + auto paramGrowthInfo = exdData.getRow< Excel::ParamGrow >( player.getLevel() ); if( !classInfo || !paramGrowthInfo ) return 0; @@ -159,8 +159,8 @@ uint32_t CalcStats::calculateMaxHp( Chara& chara ) // Is there any way to pull reliable BaseHP without having to manually use a pet for every level, and using the values from a table? // More info here: https://docs.google.com/spreadsheets/d/1de06KGT0cNRUvyiXNmjNgcNvzBCCQku7jte5QxEQRbs/edit?usp=sharing - auto classInfo = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( chara.getClass() ) ); - auto paramGrowthInfo = exdData.getRow< Component::Excel::ParamGrow >( chara.getLevel() ); + auto classInfo = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( chara.getClass() ) ); + auto paramGrowthInfo = exdData.getRow< Excel::ParamGrow >( chara.getLevel() ); if( !classInfo || !paramGrowthInfo ) return 0; @@ -186,8 +186,8 @@ uint32_t CalcStats::calculateMaxMp( Player& player ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto classInfo = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( player.getClass() ) ); - auto paramGrowthInfo = exdData.getRow< Component::Excel::ParamGrow >( player.getLevel() ); + auto classInfo = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( player.getClass() ) ); + auto paramGrowthInfo = exdData.getRow< Excel::ParamGrow >( player.getLevel() ); if( !classInfo || !paramGrowthInfo ) return 0; @@ -356,7 +356,7 @@ float CalcStats::weaponDamage( const Sapphire::Entity::Chara& chara, float weapo uint32_t jobMod = 1; auto& exdData = Common::Service< Data::ExdData >::ref(); - auto classInfo = exdData.getRow< Component::Excel::ClassJob >( static_cast< uint8_t >( chara.getClass() ) ); + auto classInfo = exdData.getRow< Excel::ClassJob >( static_cast< uint8_t >( chara.getClass() ) ); if( !classInfo ) return 0.f; diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp index 33dc0465..2547d63a 100644 --- a/src/world/Network/Handlers/ActionHandler.cpp +++ b/src/world/Network/Handlers/ActionHandler.cpp @@ -43,7 +43,7 @@ void Sapphire::Network::GameConnection::actionRequest( const Packets::FFXIVARR_P } case Common::SkillType::Normal: { - auto action = exdData.getRow< Component::Excel::Action >( actionId ); + auto action = exdData.getRow< Excel::Action >( actionId ); // ignore invalid actions if( !action ) @@ -55,14 +55,14 @@ void Sapphire::Network::GameConnection::actionRequest( const Packets::FFXIVARR_P case Common::SkillType::ItemAction: { - auto item = exdData.getRow< Component::Excel::Item >( actionId ); + auto item = exdData.getRow< Excel::Item >( actionId ); if( !item ) return; if( item->data().Action == 0 ) return; - auto itemAction = exdData.getRow< Component::Excel::ItemAction >( item->data().Action ); + auto itemAction = exdData.getRow< Excel::ItemAction >( item->data().Action ); if( !itemAction ) return; @@ -73,7 +73,7 @@ void Sapphire::Network::GameConnection::actionRequest( const Packets::FFXIVARR_P case Common::SkillType::EventItem: { - auto action = exdData.getRow< Component::Excel::EventItem >( actionId ); + auto action = exdData.getRow< Excel::EventItem >( actionId ); assert( action ); actionMgr.handleEventItemAction( player, actionId, action, sequence, targetId ); break; @@ -81,7 +81,7 @@ void Sapphire::Network::GameConnection::actionRequest( const Packets::FFXIVARR_P case Common::SkillType::MountSkill: { - auto action = exdData.getRow< Component::Excel::Action >( 4 ); + auto action = exdData.getRow< Excel::Action >( 4 ); assert( action ); actionMgr.handleMountAction( player, static_cast< uint16_t >( actionId ), action, targetId, sequence ); break; @@ -114,7 +114,7 @@ void Sapphire::Network::GameConnection::selectGroundActionRequest( const Packets auto& exdData = Common::Service< Data::ExdData >::ref(); - auto action = exdData.getRow< Component::Excel::Action >( actionId ); + auto action = exdData.getRow< Excel::Action >( actionId ); // ignore invalid actions if( !action ) diff --git a/src/world/Network/Handlers/CFHandlers.cpp b/src/world/Network/Handlers/CFHandlers.cpp index b2507539..ec3e2838 100644 --- a/src/world/Network/Handlers/CFHandlers.cpp +++ b/src/world/Network/Handlers/CFHandlers.cpp @@ -74,12 +74,12 @@ void Sapphire::Network::GameConnection::find5Contents( const Packets::FFXIVARR_P if( packet.data().territoryTypes[ i ] != 0 ) selectedContent.insert( packet.data().territoryTypes[ i ] ); - auto contentListIds = exdData.getIdList< Component::Excel::InstanceContent >(); + auto contentListIds = exdData.getIdList< Excel::InstanceContent >(); std::vector< uint32_t > idList; for( auto id : contentListIds ) { - auto instanceContent = exdData.getRow< Component::Excel::InstanceContent >( id ); + auto instanceContent = exdData.getRow< Excel::InstanceContent >( id ); if( selectedContent.count( instanceContent->data().TerritoryType ) ) { idList.push_back( id ); diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp index 614a85f0..71cf5dd2 100644 --- a/src/world/Network/Handlers/EventHandlers.cpp +++ b/src/world/Network/Handlers/EventHandlers.cpp @@ -95,7 +95,7 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVA if( !scriptMgr.onEmote( player, actorId, eventId, static_cast< uint8_t >( emoteId ) ) && eventType == Event::EventHandler::EventHandlerType::Quest ) { - auto questInfo = exdData.getRow< Component::Excel::Quest >( eventId ); + auto questInfo = exdData.getRow< Excel::Quest >( eventId ); if( questInfo ) World::Manager::PlayerMgr::sendUrgent( player, "Quest not implemented: {0}", questInfo->getString( questInfo->data().Text.Name ) ); } diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp index 04c31b2b..a9af4df6 100644 --- a/src/world/Network/Handlers/GMCommandHandlers.cpp +++ b/src/world/Network/Handlers/GMCommandHandlers.cpp @@ -509,11 +509,11 @@ void Sapphire::Network::GameConnection::gmCommandHandler( const Packets::FFXIVAR bool doTeleport = false; uint16_t teleport; - auto idList = exdData.getIdList< Component::Excel::Aetheryte >(); + auto idList = exdData.getIdList< Excel::Aetheryte >(); for( auto i : idList ) { - auto data = exdData.getRow< Component::Excel::Aetheryte >( i ); + auto data = exdData.getRow< Excel::Aetheryte >( i ); if( !data ) continue; diff --git a/src/world/Network/Handlers/PacketCommandHandler.cpp b/src/world/Network/Handlers/PacketCommandHandler.cpp index d751c292..f0749a17 100644 --- a/src/world/Network/Handlers/PacketCommandHandler.cpp +++ b/src/world/Network/Handlers/PacketCommandHandler.cpp @@ -511,7 +511,7 @@ void Sapphire::Network::GameConnection::commandHandler( const Packets::FFXIVARR_ bool isSilent = param2 == 1; auto& exdData = Service< Data::ExdData >::ref(); - auto emoteData = exdData.getRow< Component::Excel::Emote >( emoteId ); + auto emoteData = exdData.getRow< Excel::Emote >( emoteId ); if( !emoteData ) return; diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp index f1a30bee..2bbabfd0 100644 --- a/src/world/Script/ScriptMgr.cpp +++ b/src/world/Script/ScriptMgr.cpp @@ -173,7 +173,7 @@ bool Sapphire::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t ac auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::QuestScript >( eventId ); if( !script ) { - auto questInfo = exdData.getRow< Component::Excel::Quest >( eventId ); + auto questInfo = exdData.getRow< Excel::Quest >( eventId ); if( questInfo ) { World::Manager::PlayerMgr::sendUrgent( player, "Quest not implemented: {0} ({1})", questInfo->getString( questInfo->data().Text.Name ), eventId ); diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp index 56415f3e..1b371938 100644 --- a/src/world/StatusEffect/StatusEffect.cpp +++ b/src/world/StatusEffect/StatusEffect.cpp @@ -28,7 +28,7 @@ Sapphire::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPt m_lastTick( 0 ) { auto& exdData = Common::Service< Data::ExdData >::ref(); - auto entry = exdData.getRow< Component::Excel::Status >( id ); + auto entry = exdData.getRow< Excel::Status >( id ); m_name = entry->getString( entry->data().Text.Name ); std::replace( m_name.begin(), m_name.end(), ' ', '_' ); diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp index 0def7225..7bff6c3d 100644 --- a/src/world/Territory/HousingZone.cpp +++ b/src/world/Territory/HousingZone.cpp @@ -61,7 +61,7 @@ bool Sapphire::HousingZone::init() housingIndex = 3; auto& exdData = Common::Service< Data::ExdData >::ref(); - auto info = exdData.getRow< Component::Excel::HousingLandSet >( housingIndex ); + auto info = exdData.getRow< Excel::HousingLandSet >( housingIndex ); // build yard objects array indices int16_t cursor = -1; diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp index 24e4c048..a0eb9d7b 100644 --- a/src/world/Territory/InstanceContent.cpp +++ b/src/world/Territory/InstanceContent.cpp @@ -30,7 +30,7 @@ using namespace Sapphire::Network::Packets::WorldPackets::Server; using namespace Sapphire::Network::ActorControl; using namespace Sapphire::World::Manager; -Sapphire::InstanceContent::InstanceContent( std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::InstanceContent > > pInstanceConfiguration, +Sapphire::InstanceContent::InstanceContent( std::shared_ptr< Excel::ExcelStruct< Excel::InstanceContent > > pInstanceConfiguration, uint16_t territoryType, uint32_t guId, const std::string& internalName, @@ -74,7 +74,7 @@ uint32_t Sapphire::InstanceContent::getInstanceContentId() const return m_instanceContentId; } -std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::InstanceContent > > Sapphire::InstanceContent::getInstanceConfiguration() const +std::shared_ptr< Excel::ExcelStruct< Excel::InstanceContent > > Sapphire::InstanceContent::getInstanceConfiguration() const { return m_instanceConfiguration; } @@ -345,7 +345,7 @@ void Sapphire::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object ) m_pEntranceEObj = object; auto& exdData = Common::Service< Data::ExdData >::ref(); - auto objData = exdData.getRow< Component::Excel::EObj >( object->getObjectId() ); + auto objData = exdData.getRow< Excel::EObj >( object->getObjectId() ); if( objData ) { m_eventIdToObjectMap[ objData->data().EventHandler ] = object; diff --git a/src/world/Territory/InstanceContent.h b/src/world/Territory/InstanceContent.h index 83aa0500..45a4228f 100644 --- a/src/world/Territory/InstanceContent.h +++ b/src/world/Territory/InstanceContent.h @@ -65,7 +65,7 @@ namespace Sapphire Ended }; - InstanceContent( std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::InstanceContent > > pInstanceConfiguration, + InstanceContent( std::shared_ptr< Excel::ExcelStruct< Excel::InstanceContent > > pInstanceConfiguration, uint16_t territoryType, uint32_t guId, const std::string& internalName, @@ -144,7 +144,7 @@ namespace Sapphire InstanceContentState getState() const; - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::InstanceContent > > getInstanceConfiguration() const; + std::shared_ptr< Excel::ExcelStruct< Excel::InstanceContent > > getInstanceConfiguration() const; uint32_t getInstanceContentId() const; @@ -176,7 +176,7 @@ namespace Sapphire size_t getInstancePlayerCount() const; private: - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::InstanceContent > > m_instanceConfiguration; + std::shared_ptr< Excel::ExcelStruct< Excel::InstanceContent > > m_instanceConfiguration; uint32_t m_instanceContentId; InstanceContentState m_state; uint16_t m_currentBgm; diff --git a/src/world/Territory/InstanceObjectCache.cpp b/src/world/Territory/InstanceObjectCache.cpp index bdb37cec..8d06353b 100644 --- a/src/world/Territory/InstanceObjectCache.cpp +++ b/src/world/Territory/InstanceObjectCache.cpp @@ -18,7 +18,7 @@ Sapphire::InstanceObjectCache::InstanceObjectCache() { auto& exdData = Common::Service< Sapphire::Data::ExdData >::ref(); - auto idList = exdData.getIdList< Component::Excel::TerritoryType >(); + auto idList = exdData.getIdList< Excel::TerritoryType >(); size_t count = 0; for( const auto& id : idList ) @@ -27,7 +27,7 @@ Sapphire::InstanceObjectCache::InstanceObjectCache() if( count++ % 10 == 0 ) std::cout << "."; - auto territoryType = exdData.getRow< Component::Excel::TerritoryType >( id ); + auto territoryType = exdData.getRow< Excel::TerritoryType >( id ); if( !territoryType ) continue; diff --git a/src/world/Territory/Land.cpp b/src/world/Territory/Land.cpp index 587475de..d34ef1df 100644 --- a/src/world/Territory/Land.cpp +++ b/src/world/Territory/Land.cpp @@ -27,7 +27,7 @@ using namespace Sapphire::Common; Sapphire::Land::Land( uint16_t territoryTypeId, uint8_t wardNum, uint8_t landId, uint32_t landSetId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::HousingLandSet > > info ) : + std::shared_ptr< Excel::ExcelStruct< Excel::HousingLandSet > > info ) : m_currentPrice( 0 ), m_minPrice( 0 ), m_nextDrop( Util::getTimeSeconds() + 21600 ), @@ -65,7 +65,7 @@ void Sapphire::Land::init( Common::LandType type, Common::HouseSize size, Common auto& exdData = Common::Service< Data::ExdData >::ref(); // EXD TODO: This does not exist in 2.3 - /*auto info = exdData.getRow< Component::Excel::HousingMapMarkerInfo >( m_landIdent.territoryTypeId, m_landIdent.landId ); + /*auto info = exdData.getRow< Excel::HousingMapMarkerInfo >( m_landIdent.territoryTypeId, m_landIdent.landId ); if( info ) { m_mapMarkerPosition.x = info->x; diff --git a/src/world/Territory/Land.h b/src/world/Territory/Land.h index 939a50fd..c14370d3 100644 --- a/src/world/Territory/Land.h +++ b/src/world/Territory/Land.h @@ -13,7 +13,7 @@ namespace Sapphire public: Land( uint16_t zoneId, uint8_t wardNum, uint8_t landId, uint32_t landSetId, - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::HousingLandSet > > info ); + std::shared_ptr< Excel::ExcelStruct< Excel::HousingLandSet > > info ); virtual ~Land(); void init( Common::LandType type, Common::HouseSize size, Common::HouseStatus state, uint32_t currentPrice, uint64_t ownerId, uint64_t houseId ); @@ -79,7 +79,7 @@ namespace Sapphire Common::FFXIVARR_POSITION3 m_mapMarkerPosition; uint64_t m_ownerId; - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::HousingLandSet > > m_landInfo; + std::shared_ptr< Excel::ExcelStruct< Excel::HousingLandSet > > m_landInfo; Sapphire::HousePtr m_pHouse; diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp index bc46a8da..555135e5 100644 --- a/src/world/Territory/QuestBattle.cpp +++ b/src/world/Territory/QuestBattle.cpp @@ -34,7 +34,7 @@ using namespace Sapphire::Network::ActorControl; using namespace Sapphire::World::Manager; -Sapphire::QuestBattle::QuestBattle( std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::QuestBattle > > pBattleDetails, +Sapphire::QuestBattle::QuestBattle( std::shared_ptr< Excel::ExcelStruct< Excel::QuestBattle > > pBattleDetails, uint16_t territoryType, uint32_t guId, const std::string& internalName, const std::string& contentName, uint32_t questBattleId ) : @@ -67,7 +67,7 @@ uint32_t Sapphire::QuestBattle::getQuestBattleId() const } -std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::QuestBattle > > Sapphire::QuestBattle::getQuestBattleDetails() const +std::shared_ptr< Excel::ExcelStruct< Excel::QuestBattle > > Sapphire::QuestBattle::getQuestBattleDetails() const { return m_pBattleDetails; } @@ -231,7 +231,7 @@ void Sapphire::QuestBattle::onRegisterEObj( Entity::EventObjectPtr object ) m_eventObjectMap[ object->getName() ] = object; auto& exdData = Common::Service< Data::ExdData >::ref(); - auto objData = exdData.getRow< Component::Excel::EObj >( object->getObjectId() ); + auto objData = exdData.getRow< Excel::EObj >( object->getObjectId() ); if( objData ) m_eventIdToObjectMap[ objData->data().EventHandler ] = object; else diff --git a/src/world/Territory/QuestBattle.h b/src/world/Territory/QuestBattle.h index 40f7e4dc..f80d8520 100644 --- a/src/world/Territory/QuestBattle.h +++ b/src/world/Territory/QuestBattle.h @@ -16,7 +16,7 @@ namespace Sapphire class QuestBattle : public Event::Director, public Territory { public: - QuestBattle( std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::QuestBattle > > pBattleDetails, + QuestBattle( std::shared_ptr< Excel::ExcelStruct< Excel::QuestBattle > > pBattleDetails, uint16_t territoryType, uint32_t guId, const std::string& internalName, @@ -75,7 +75,7 @@ namespace Sapphire Event::Director::DirectorState getState() const; - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::QuestBattle > > getQuestBattleDetails() const; + std::shared_ptr< Excel::ExcelStruct< Excel::QuestBattle > > getQuestBattleDetails() const; uint32_t getQuestBattleId() const; @@ -87,7 +87,7 @@ namespace Sapphire Entity::PlayerPtr getPlayerPtr(); private: - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::QuestBattle > > m_pBattleDetails; + std::shared_ptr< Excel::ExcelStruct< Excel::QuestBattle > > m_pBattleDetails; uint32_t m_questBattleId; Event::Director::DirectorState m_state; diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp index daa713b0..f9d3b771 100644 --- a/src/world/Territory/Territory.cpp +++ b/src/world/Territory/Territory.cpp @@ -80,7 +80,7 @@ Sapphire::Territory::Territory( uint16_t territoryTypeId, uint32_t guId, const s m_lastMobUpdate = 0; m_weatherOverride = Weather::None; - m_territoryTypeInfo = exdData.getRow< Component::Excel::TerritoryType >( territoryTypeId ); + m_territoryTypeInfo = exdData.getRow< Excel::TerritoryType >( territoryTypeId ); m_bgPath = m_territoryTypeInfo->getString( m_territoryTypeInfo->data().LVB ); m_ident.territoryTypeId = territoryTypeId; @@ -98,11 +98,11 @@ void Sapphire::Territory::loadWeatherRates() auto& exdData = Common::Service< Data::ExdData >::ref(); - uint8_t weatherRateId = m_territoryTypeInfo->data().WeatherRate > exdData.getIdList< Component::Excel::WeatherRate >().size() ? + uint8_t weatherRateId = m_territoryTypeInfo->data().WeatherRate > exdData.getIdList< Excel::WeatherRate >().size() ? uint8_t{ 0 } : m_territoryTypeInfo->data().WeatherRate; uint8_t sumPc = 0; - auto weatherRate = exdData.getRow< Component::Excel::WeatherRate >( weatherRateId ); + auto weatherRate = exdData.getRow< Excel::WeatherRate >( weatherRateId ); for( size_t i = 0; i < 8; ++i ) { int32_t weatherId = weatherRate->data().WeatherId[ i ]; @@ -796,7 +796,7 @@ Sapphire::Entity::EventObjectPtr Sapphire::Territory::registerEObj( const std::s return eObj; } -std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::TerritoryType > > Sapphire::Territory::getTerritoryTypeInfo() const +std::shared_ptr< Excel::ExcelStruct< Excel::TerritoryType > > Sapphire::Territory::getTerritoryTypeInfo() const { return m_territoryTypeInfo; } diff --git a/src/world/Territory/Territory.h b/src/world/Territory/Territory.h index ee62cadf..90f80416 100644 --- a/src/world/Territory/Territory.h +++ b/src/world/Territory/Territory.h @@ -62,7 +62,7 @@ namespace Sapphire FestivalPair m_currentFestival; - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::TerritoryType > > m_territoryTypeInfo; + std::shared_ptr< Excel::ExcelStruct< Excel::TerritoryType > > m_territoryTypeInfo; uint32_t m_nextEObjId; uint32_t m_nextActorId; @@ -94,7 +94,7 @@ namespace Sapphire void setCurrentFestival( uint16_t festivalId, uint16_t additionalFestivalId = 0 ); - std::shared_ptr< Component::Excel::ExcelStruct< Component::Excel::TerritoryType > > getTerritoryTypeInfo() const; + std::shared_ptr< Excel::ExcelStruct< Excel::TerritoryType > > getTerritoryTypeInfo() const; uint64_t getLastActivityTime() const;