mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 07:07:45 +00:00
Code Activity

Update ExdDataGenerated for 6.40

Browse source
This commit is contained in:
Maple 2023-05-23 07:47:30 -03:00
parent 88819f38b5
commit d03c72afab
2 changed files with 63 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/common/Exd/ExdDataGenerated.cpp
View file

@ -557,17 +557,17 @@ Sapphire::Data::AOZContent::AOZContent( uint32_t row_id, Sapphire::Data::ExdData
act1FightType = exdData->getField< uint8_t >( row, 2 ); act1FightType = exdData->getField< uint8_t >( row, 2 );
act1 = exdData->getField< uint16_t >( row, 3 ); act1 = exdData->getField< uint16_t >( row, 3 );
arenaType1 = exdData->getField< uint8_t >( row, 4 ); arenaType1 = exdData->getField< uint8_t >( row, 4 );
act2FightType = exdData->getField< uint8_t >( row, 5 ); act2FightType = exdData->getField< uint16_t >( row, 5 );
act2 = exdData->getField< uint16_t >( row, 6 ); act2 = exdData->getField< uint8_t >( row, 6 );
arenaType2 = exdData->getField< uint8_t >( row, 7 ); arenaType2 = exdData->getField< uint16_t >( row, 7 );
act3FightType = exdData->getField< uint8_t >( row, 8 ); act3FightType = exdData->getField< uint8_t >( row, 8 );
act3 = exdData->getField< uint16_t >( row, 9 ); act3 = exdData->getField< uint16_t >( row, 9 );
arenaType3 = exdData->getField< uint8_t >( row, 10 ); arenaType3 = exdData->getField< uint8_t >( row, 10 );
contentEntry = exdData->getField< uint32_t >( row, 11 ); contentEntry = exdData->getField< uint16_t >( row, 11 );
order = exdData->getField< uint8_t >( row, 12 ); order = exdData->getField< uint8_t >( row, 12 );
gilReward = exdData->getField< uint16_t >( row, 13 ); gilReward = exdData->getField< uint16_t >( row, 13 );
alliedSealsReward = exdData->getField< uint16_t >( row, 14 ); alliedSealsReward = exdData->getField< uint32_t >( row, 14 );
tomestonesReward = exdData->getField< uint16_t >( row, 15 ); tomestonesReward = exdData->getField< uint8_t >( row, 15 );
} }
Sapphire::Data::AOZContentBriefingBNpc::AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::AOZContentBriefingBNpc::AOZContentBriefingBNpc( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -1956,10 +1956,10 @@ Sapphire::Data::CollectablesShopItem::CollectablesShopItem( uint32_t row_id, uin
item = exdData->getField< uint32_t >( row, 0 ); item = exdData->getField< uint32_t >( row, 0 );
collectablesShopItemGroup = exdData->getField< uint8_t >( row, 1 ); collectablesShopItemGroup = exdData->getField< uint8_t >( row, 1 );
levelMin = exdData->getField< uint16_t >( row, 2 ); levelMin = exdData->getField< uint16_t >( row, 2 );
levelMax = exdData->getField< uint16_t >( row, 3 ); levelMax = exdData->getField< uint32_t >( row, 3 );
stars = exdData->getField< uint8_t >( row, 4 ); stars = exdData->getField< uint16_t >( row, 4 );
key = exdData->getField< uint8_t >( row, 5 ); key = exdData->getField< uint8_t >( row, 5 );
collectablesShopRefine = exdData->getField< uint16_t >( row, 6 ); collectablesShopRefine = exdData->getField< uint8_t >( row, 6 );
collectablesShopRewardScrip = exdData->getField< uint16_t >( row, 7 ); collectablesShopRewardScrip = exdData->getField< uint16_t >( row, 7 );
} }
@ -2408,11 +2408,11 @@ Sapphire::Data::ContentRoulette::ContentRoulette( uint32_t row_id, Sapphire::Dat
rewardTomeA = exdData->getField< uint16_t >( row, 17 ); rewardTomeA = exdData->getField< uint16_t >( row, 17 );
rewardTomeB = exdData->getField< uint16_t >( row, 18 ); rewardTomeB = exdData->getField< uint16_t >( row, 18 );
rewardTomeC = exdData->getField< uint16_t >( row, 19 ); rewardTomeC = exdData->getField< uint16_t >( row, 19 );
sortKey = exdData->getField< uint8_t >( row, 22 ); sortKey = exdData->getField< uint32_t >( row, 22 );
contentMemberType = exdData->getField< uint8_t >( row, 24 ); contentMemberType = exdData->getField< uint8_t >( row, 24 );
requireAllDuties = exdData->getField< bool >( row, 35 ); requireAllDuties = exdData->getField< bool >( row, 35 );
contentRouletteOpenRule = exdData->getField< uint8_t >( row, 37 ); contentRouletteOpenRule = exdData->getField< bool >( row, 37 );
instanceContent = exdData->getField< uint16_t >( row, 38 ); instanceContent = exdData->getField< uint8_t >( row, 38 );
} }
Sapphire::Data::ContentRouletteOpenRule::ContentRouletteOpenRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::ContentRouletteOpenRule::ContentRouletteOpenRule( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -3891,12 +3891,9 @@ Sapphire::Data::FishParameter::FishParameter( uint32_t row_id, Sapphire::Data::E
item = exdData->getField< int32_t >( row, 1 ); item = exdData->getField< int32_t >( row, 1 );
gatheringItemLevel = exdData->getField< uint16_t >( row, 2 ); gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
isHidden = exdData->getField< bool >( row, 4 ); isHidden = exdData->getField< bool >( row, 4 );
fishingRecordType = exdData->getField< uint8_t >( row, 6 ); fishingRecordType = exdData->getField< uint16_t >( row, 6 );
fishingSpot = exdData->getField< uint16_t >( row, 8 ); fishingSpot = exdData->getField< bool >( row, 8 );
gatheringSubCategory = exdData->getField< uint16_t >( row, 9 ); gatheringSubCategory = exdData->getField< uint32_t >( row, 9 );
isInLog = exdData->getField< bool >( row, 10 );
timeRestricted = exdData->getField< bool >( row, 11 );
weatherRestricted = exdData->getField< bool >( row, 12 );
} }
Sapphire::Data::FittingShop::FittingShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::FittingShop::FittingShop( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -3936,14 +3933,6 @@ Sapphire::Data::Frontline03::Frontline03( uint32_t row_id, Sapphire::Data::ExdDa
immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 20 ) ); immortalFlamesIcon.push_back( exdData->getField< uint32_t >( row, 20 ) );
} }
Sapphire::Data::Frontline04::Frontline04( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
{
auto row = exdData->m_Frontline04Dat.get_row( row_id );
level1 = exdData->getField< int32_t >( row, 0 );
level2 = exdData->getField< int32_t >( row, 1 );
level3 = exdData->getField< int32_t >( row, 2 );
}
Sapphire::Data::FurnitureCatalogCategory::FurnitureCatalogCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::FurnitureCatalogCategory::FurnitureCatalogCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
{ {
auto row = exdData->m_FurnitureCatalogCategoryDat.get_row( row_id ); auto row = exdData->m_FurnitureCatalogCategoryDat.get_row( row_id );
@ -4891,11 +4880,9 @@ Sapphire::Data::GuildleveAssignment::GuildleveAssignment( uint32_t row_id, Sapph
{ {
auto row = exdData->m_GuildleveAssignmentDat.get_row( row_id ); auto row = exdData->m_GuildleveAssignmentDat.get_row( row_id );
type = exdData->getField< std::string >( row, 0 ); type = exdData->getField< std::string >( row, 0 );
typeId = exdData->getField< uint8_t >( row, 1 );
assignmentTalk = exdData->getField< uint32_t >( row, 2 ); assignmentTalk = exdData->getField< uint32_t >( row, 2 );
quest.push_back( exdData->getField< uint32_t >( row, 3 ) ); quest.push_back( exdData->getField< uint32_t >( row, 3 ) );
quest.push_back( exdData->getField< uint32_t >( row, 4 ) ); quest.push_back( exdData->getField< uint32_t >( row, 4 ) );
grandCompanyRank = exdData->getField< uint8_t >( row, 10 );
} }
Sapphire::Data::GuildleveAssignmentCategory::GuildleveAssignmentCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::GuildleveAssignmentCategory::GuildleveAssignmentCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -6335,7 +6322,7 @@ Sapphire::Data::IKDRoute::IKDRoute( uint32_t row_id, Sapphire::Data::ExdDataGene
auto row = exdData->m_IKDRouteDat.get_row( row_id ); auto row = exdData->m_IKDRouteDat.get_row( row_id );
image = exdData->getField< uint32_t >( row, 6 ); image = exdData->getField< uint32_t >( row, 6 );
territoryType = exdData->getField< uint32_t >( row, 7 ); territoryType = exdData->getField< uint32_t >( row, 7 );
name = exdData->getField< std::string >( row, 8 ); name = exdData->getField< uint32_t >( row, 8 );
} }
Sapphire::Data::IKDRouteTable::IKDRouteTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::IKDRouteTable::IKDRouteTable( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -6558,11 +6545,6 @@ Sapphire::Data::Item::Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
isPvP = exdData->getField< bool >( row, 88 ); isPvP = exdData->getField< bool >( row, 88 );
subStatCategory = exdData->getField< uint8_t >( row, 89 ); subStatCategory = exdData->getField< uint8_t >( row, 89 );
isGlamourous = exdData->getField< bool >( row, 90 ); isGlamourous = exdData->getField< bool >( row, 90 );
for( int i = 0; i < 6; ++i )
{
param[i].baseparam = exdData->getField< uint8_t >( row, 59 + i * 2 );
param[i].value = exdData->getField< int16_t >( row, 60 + i * 2 );
}
} }
Sapphire::Data::ItemAction::ItemAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::ItemAction::ItemAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -7134,7 +7116,7 @@ Sapphire::Data::Marker::Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerate
{ {
auto row = exdData->m_MarkerDat.get_row( row_id ); auto row = exdData->m_MarkerDat.get_row( row_id );
icon = exdData->getField< int32_t >( row, 0 ); icon = exdData->getField< int32_t >( row, 0 );
name = exdData->getField< std::string >( row, 1 ); name = exdData->getField< uint8_t >( row, 1 );
} }
Sapphire::Data::Materia::Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::Materia::Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -7150,17 +7132,17 @@ Sapphire::Data::Materia::Materia( uint32_t row_id, Sapphire::Data::ExdDataGenera
item.push_back( exdData->getField< int32_t >( row, 7 ) ); item.push_back( exdData->getField< int32_t >( row, 7 ) );
item.push_back( exdData->getField< int32_t >( row, 8 ) ); item.push_back( exdData->getField< int32_t >( row, 8 ) );
item.push_back( exdData->getField< int32_t >( row, 9 ) ); item.push_back( exdData->getField< int32_t >( row, 9 ) );
baseParam = exdData->getField< uint8_t >( row, 10 ); baseParam = exdData->getField< int32_t >( row, 10 );
value.push_back( exdData->getField< int16_t >( row, 11 ) ); value.push_back( exdData->getField< int32_t >( row, 11 ) );
value.push_back( exdData->getField< int16_t >( row, 12 ) ); value.push_back( exdData->getField< int32_t >( row, 12 ) );
value.push_back( exdData->getField< int16_t >( row, 13 ) ); value.push_back( exdData->getField< int32_t >( row, 13 ) );
value.push_back( exdData->getField< int16_t >( row, 14 ) ); value.push_back( exdData->getField< int32_t >( row, 14 ) );
value.push_back( exdData->getField< int16_t >( row, 15 ) ); value.push_back( exdData->getField< int32_t >( row, 15 ) );
value.push_back( exdData->getField< int16_t >( row, 16 ) ); value.push_back( exdData->getField< int32_t >( row, 16 ) );
value.push_back( exdData->getField< int16_t >( row, 17 ) ); value.push_back( exdData->getField< int32_t >( row, 17 ) );
value.push_back( exdData->getField< int16_t >( row, 18 ) ); value.push_back( exdData->getField< int32_t >( row, 18 ) );
value.push_back( exdData->getField< int16_t >( row, 19 ) ); value.push_back( exdData->getField< int32_t >( row, 19 ) );
value.push_back( exdData->getField< int16_t >( row, 20 ) ); value.push_back( exdData->getField< int32_t >( row, 20 ) );
} }
Sapphire::Data::MateriaGrade::MateriaGrade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::MateriaGrade::MateriaGrade( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -7746,7 +7728,7 @@ Sapphire::Data::Mount::Mount( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
equipFoot = exdData->getField< int32_t >( row, 28 ); equipFoot = exdData->getField< int32_t >( row, 28 );
order = exdData->getField< int16_t >( row, 29 ); order = exdData->getField< int16_t >( row, 29 );
icon = exdData->getField< uint16_t >( row, 30 ); icon = exdData->getField< uint16_t >( row, 30 );
uIPriority = exdData->getField< uint8_t >( row, 31 ); uIPriority = exdData->getField< uint16_t >( row, 31 );
radiusRate = exdData->getField< uint8_t >( row, 32 ); radiusRate = exdData->getField< uint8_t >( row, 32 );
baseMotionSpeed_Run = exdData->getField< uint8_t >( row, 33 ); baseMotionSpeed_Run = exdData->getField< uint8_t >( row, 33 );
baseMotionSpeed_Walk = exdData->getField< uint8_t >( row, 34 ); baseMotionSpeed_Walk = exdData->getField< uint8_t >( row, 34 );
@ -8022,8 +8004,8 @@ Sapphire::Data::OnlineStatus::OnlineStatus( uint32_t row_id, Sapphire::Data::Exd
{ {
auto row = exdData->m_OnlineStatusDat.get_row( row_id ); auto row = exdData->m_OnlineStatusDat.get_row( row_id );
list = exdData->getField< bool >( row, 0 ); list = exdData->getField< bool >( row, 0 );
priority = exdData->getField< uint8_t >( row, 2 ); priority = exdData->getField< bool >( row, 2 );
name = exdData->getField< std::string >( row, 3 ); name = exdData->getField< uint8_t >( row, 3 );
icon = exdData->getField< uint32_t >( row, 4 ); icon = exdData->getField< uint32_t >( row, 4 );
} }
@ -8489,15 +8471,12 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
classJobLevel1 = exdData->getField< uint16_t >( row, 7 ); classJobLevel1 = exdData->getField< uint16_t >( row, 7 );
previousQuestJoin = exdData->getField< uint8_t >( row, 8 ); previousQuestJoin = exdData->getField< uint8_t >( row, 8 );
previousQuest.push_back( exdData->getField< uint32_t >( row, 9 ) ); previousQuest.push_back( exdData->getField< uint32_t >( row, 9 ) );
previousQuest0Sequence = exdData->getField< uint8_t >( row, 10 ); previousQuest.push_back( exdData->getField< uint32_t >( row, 10 ) );
previousQuest.push_back( exdData->getField< uint32_t >( row, 11 ) ); previousQuest.push_back( exdData->getField< uint32_t >( row, 11 ) );
previousQuest.push_back( exdData->getField< uint32_t >( row, 12 ) );
questLockJoin = exdData->getField< uint8_t >( row, 13 ); questLockJoin = exdData->getField< uint8_t >( row, 13 );
questLock.push_back( exdData->getField< uint32_t >( row, 14 ) ); questLock.push_back( exdData->getField< uint32_t >( row, 14 ) );
questLock.push_back( exdData->getField< uint32_t >( row, 15 ) ); questLock.push_back( exdData->getField< uint32_t >( row, 15 ) );
header = exdData->getField< uint16_t >( row, 16 ); header = exdData->getField< uint16_t >( row, 16 );
startTown = exdData->getField< uint8_t >( row, 17 );
classJobUnlockFlag = exdData->getField< uint8_t >( row, 18 );
classJobUnlock = exdData->getField< uint8_t >( row, 19 ); classJobUnlock = exdData->getField< uint8_t >( row, 19 );
grandCompany = exdData->getField< uint8_t >( row, 20 ); grandCompany = exdData->getField< uint8_t >( row, 20 );
grandCompanyRank = exdData->getField< uint8_t >( row, 21 ); grandCompanyRank = exdData->getField< uint8_t >( row, 21 );
@ -9779,7 +9758,7 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
optionalItemStainReward.push_back( exdData->getField< uint8_t >( row, 1496 ) ); optionalItemStainReward.push_back( exdData->getField< uint8_t >( row, 1496 ) );
optionalItemStainReward.push_back( exdData->getField< uint8_t >( row, 1497 ) ); optionalItemStainReward.push_back( exdData->getField< uint8_t >( row, 1497 ) );
optionalItemStainReward.push_back( exdData->getField< uint8_t >( row, 1498 ) ); optionalItemStainReward.push_back( exdData->getField< uint8_t >( row, 1498 ) );
emoteReward = exdData->getField< uint8_t >( row, 1499 ); emoteReward = exdData->getField< uint16_t >( row, 1499 );
actionReward = exdData->getField< uint16_t >( row, 1500 ); actionReward = exdData->getField< uint16_t >( row, 1500 );
generalActionReward.push_back( exdData->getField< uint8_t >( row, 1501 ) ); generalActionReward.push_back( exdData->getField< uint8_t >( row, 1501 ) );
generalActionReward.push_back( exdData->getField< uint8_t >( row, 1502 ) ); generalActionReward.push_back( exdData->getField< uint8_t >( row, 1502 ) );
@ -11140,9 +11119,8 @@ Sapphire::Data::SpearfishingItem::SpearfishingItem( uint32_t row_id, Sapphire::D
description = exdData->getField< std::string >( row, 0 ); description = exdData->getField< std::string >( row, 0 );
item = exdData->getField< int32_t >( row, 1 ); item = exdData->getField< int32_t >( row, 1 );
gatheringItemLevel = exdData->getField< uint16_t >( row, 2 ); gatheringItemLevel = exdData->getField< uint16_t >( row, 2 );
fishingRecordType = exdData->getField< uint8_t >( row, 5 ); fishingRecordType = exdData->getField< uint16_t >( row, 5 );
territoryType = exdData->getField< uint16_t >( row, 6 ); territoryType = exdData->getField< uint16_t >( row, 6 );
isVisible = exdData->getField< bool >( row, 9 );
} }
Sapphire::Data::SpearfishingNotebook::SpearfishingNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::SpearfishingNotebook::SpearfishingNotebook( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@ -11394,7 +11372,7 @@ Sapphire::Data::Status::Status( uint32_t row_id, Sapphire::Data::ExdDataGenerate
auto row = exdData->m_StatusDat.get_row( row_id ); auto row = exdData->m_StatusDat.get_row( row_id );
name = exdData->getField< std::string >( row, 0 ); name = exdData->getField< std::string >( row, 0 );
description = exdData->getField< std::string >( row, 1 ); description = exdData->getField< std::string >( row, 1 );
icon = exdData->getField< uint16_t >( row, 2 ); icon = exdData->getField< uint32_t >( row, 2 );
maxStacks = exdData->getField< uint8_t >( row, 4 ); maxStacks = exdData->getField< uint8_t >( row, 4 );
classJobCategory = exdData->getField< uint8_t >( row, 5 ); classJobCategory = exdData->getField< uint8_t >( row, 5 );
statusCategory = exdData->getField< uint8_t >( row, 6 ); statusCategory = exdData->getField< uint8_t >( row, 6 );
@ -13814,9 +13792,9 @@ Sapphire::Data::VVDRouteData::VVDRouteData( uint32_t row_id, uint32_t subRow, Sa
auto row = exdData->m_VVDRouteDataDat.get_row( row_id, subRow ); auto row = exdData->m_VVDRouteDataDat.get_row( row_id, subRow );
} }
Sapphire::Data::VVDVariantAction::VVDVariantAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) Sapphire::Data::VVDVariantAction::VVDVariantAction( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
{ {
auto row = exdData->m_VVDVariantActionDat.get_row( row_id ); auto row = exdData->m_VVDVariantActionDat.get_row( row_id, subRow );
action = exdData->getField< uint32_t >( row, 0 ); action = exdData->getField< uint32_t >( row, 0 );
} }
@ -14379,7 +14357,6 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
m_FittingShopCategoryItemDat = setupDatAccess( "FittingShopCategoryItem", xiv::exd::Language::none ); m_FittingShopCategoryItemDat = setupDatAccess( "FittingShopCategoryItem", xiv::exd::Language::none );
m_FittingShopItemSetDat = setupDatAccess( "FittingShopItemSet", xiv::exd::Language::en ); m_FittingShopItemSetDat = setupDatAccess( "FittingShopItemSet", xiv::exd::Language::en );
m_Frontline03Dat = setupDatAccess( "Frontline03", xiv::exd::Language::none ); m_Frontline03Dat = setupDatAccess( "Frontline03", xiv::exd::Language::none );
m_Frontline04Dat = setupDatAccess( "Frontline04", xiv::exd::Language::none );
m_FurnitureCatalogCategoryDat = setupDatAccess( "FurnitureCatalogCategory", xiv::exd::Language::en ); m_FurnitureCatalogCategoryDat = setupDatAccess( "FurnitureCatalogCategory", xiv::exd::Language::en );
m_FurnitureCatalogItemListDat = setupDatAccess( "FurnitureCatalogItemList", xiv::exd::Language::none ); m_FurnitureCatalogItemListDat = setupDatAccess( "FurnitureCatalogItemList", xiv::exd::Language::none );
m_GameRewardObtainTypeDat = setupDatAccess( "GameRewardObtainType", xiv::exd::Language::none ); m_GameRewardObtainTypeDat = setupDatAccess( "GameRewardObtainType", xiv::exd::Language::none );

75
src/common/Exd/ExdDataGenerated.h
View file

@ -321,7 +321,6 @@ struct FittingShopCategory;
struct FittingShopCategoryItem; struct FittingShopCategoryItem;
struct FittingShopItemSet; struct FittingShopItemSet;
struct Frontline03; struct Frontline03;
struct Frontline04;
struct FurnitureCatalogCategory; struct FurnitureCatalogCategory;
struct FurnitureCatalogItemList; struct FurnitureCatalogItemList;
struct GameRewardObtainType; struct GameRewardObtainType;
@ -1351,17 +1350,17 @@ struct AOZContent
uint8_t act1FightType; uint8_t act1FightType;
uint16_t act1; uint16_t act1;
uint8_t arenaType1; uint8_t arenaType1;
uint8_t act2FightType; uint16_t act2FightType;
uint16_t act2; uint8_t act2;
uint8_t arenaType2; uint16_t arenaType2;
uint8_t act3FightType; uint8_t act3FightType;
uint16_t act3; uint16_t act3;
uint8_t arenaType3; uint8_t arenaType3;
uint32_t contentEntry; uint16_t contentEntry;
uint8_t order; uint8_t order;
uint16_t gilReward; uint16_t gilReward;
uint16_t alliedSealsReward; uint32_t alliedSealsReward;
uint16_t tomestonesReward; uint8_t tomestonesReward;
AOZContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); AOZContent( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
}; };
@ -2445,10 +2444,10 @@ struct CollectablesShopItem
uint32_t item; uint32_t item;
uint8_t collectablesShopItemGroup; uint8_t collectablesShopItemGroup;
uint16_t levelMin; uint16_t levelMin;
uint16_t levelMax; uint32_t levelMax;
uint8_t stars; uint16_t stars;
uint8_t key; uint8_t key;
uint16_t collectablesShopRefine; uint8_t collectablesShopRefine;
uint16_t collectablesShopRewardScrip; uint16_t collectablesShopRewardScrip;
CollectablesShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); CollectablesShopItem( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
@ -2836,11 +2835,11 @@ struct ContentRoulette
uint16_t rewardTomeA; uint16_t rewardTomeA;
uint16_t rewardTomeB; uint16_t rewardTomeB;
uint16_t rewardTomeC; uint16_t rewardTomeC;
uint8_t sortKey; uint32_t sortKey;
uint8_t contentMemberType; uint8_t contentMemberType;
bool requireAllDuties; bool requireAllDuties;
uint8_t contentRouletteOpenRule; bool contentRouletteOpenRule;
uint16_t instanceContent; uint8_t instanceContent;
ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); ContentRoulette( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
}; };
@ -4128,12 +4127,9 @@ struct FishParameter
int32_t item; int32_t item;
uint16_t gatheringItemLevel; uint16_t gatheringItemLevel;
bool isHidden; bool isHidden;
uint8_t fishingRecordType; uint16_t fishingRecordType;
uint16_t fishingSpot; bool fishingSpot;
uint16_t gatheringSubCategory; uint32_t gatheringSubCategory;
bool isInLog;
bool timeRestricted;
bool weatherRestricted;
FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); FishParameter( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
}; };
@ -4172,15 +4168,6 @@ struct Frontline03
Frontline03( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); Frontline03( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
}; };
struct Frontline04
{
int32_t level1;
int32_t level2;
int32_t level3;
Frontline04( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
};
struct FurnitureCatalogCategory struct FurnitureCatalogCategory
{ {
std::string category; std::string category;
@ -5248,7 +5235,7 @@ struct IKDRoute
{ {
uint32_t image; uint32_t image;
uint32_t territoryType; uint32_t territoryType;
std::string name; uint32_t name;
IKDRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); IKDRoute( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
}; };
@ -5987,7 +5974,7 @@ struct MapType
struct Marker struct Marker
{ {
int32_t icon; int32_t icon;
std::string name; uint8_t name;
Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); Marker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
}; };
@ -5995,8 +5982,8 @@ struct Marker
struct Materia struct Materia
{ {
std::vector< int32_t > item; std::vector< int32_t > item;
uint8_t baseParam; int32_t baseParam;
std::vector< int16_t > value; std::vector< int32_t > value;
Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); Materia( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
}; };
@ -6532,7 +6519,7 @@ struct Mount
int32_t equipFoot; int32_t equipFoot;
int16_t order; int16_t order;
uint16_t icon; uint16_t icon;
uint8_t uIPriority; uint16_t uIPriority;
uint8_t radiusRate; uint8_t radiusRate;
uint8_t baseMotionSpeed_Run; uint8_t baseMotionSpeed_Run;
uint8_t baseMotionSpeed_Walk; uint8_t baseMotionSpeed_Walk;
@ -6829,8 +6816,8 @@ struct OmikujiGuidance
struct OnlineStatus struct OnlineStatus
{ {
bool list; bool list;
uint8_t priority; bool priority;
std::string name; uint8_t name;
uint32_t icon; uint32_t icon;
OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); OnlineStatus( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@ -7332,7 +7319,7 @@ struct Quest
std::vector< uint8_t > optionalItemCountReward; std::vector< uint8_t > optionalItemCountReward;
std::vector< bool > optionalItemIsHQReward; std::vector< bool > optionalItemIsHQReward;
std::vector< uint8_t > optionalItemStainReward; std::vector< uint8_t > optionalItemStainReward;
uint8_t emoteReward; uint16_t emoteReward;
uint16_t actionReward; uint16_t actionReward;
std::vector< uint8_t > generalActionReward; std::vector< uint8_t > generalActionReward;
uint16_t systemReward0; uint16_t systemReward0;
@ -8101,9 +8088,8 @@ struct SpearfishingItem
std::string description; std::string description;
int32_t item; int32_t item;
uint16_t gatheringItemLevel; uint16_t gatheringItemLevel;
uint8_t fishingRecordType; uint16_t fishingRecordType;
uint16_t territoryType; uint16_t territoryType;
bool isVisible;
SpearfishingItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); SpearfishingItem( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
}; };
@ -8186,7 +8172,7 @@ struct Status
{ {
std::string name; std::string name;
std::string description; std::string description;
uint16_t icon; uint32_t icon;
uint8_t maxStacks; uint8_t maxStacks;
uint8_t classJobCategory; uint8_t classJobCategory;
uint8_t statusCategory; uint8_t statusCategory;
@ -8770,7 +8756,7 @@ struct VVDVariantAction
{ {
uint32_t action; uint32_t action;
VVDVariantAction( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ); VVDVariantAction( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
}; };
struct Warp struct Warp
@ -9333,7 +9319,6 @@ struct ZoneSharedGroup
xiv::exd::Exd m_FittingShopCategoryItemDat; xiv::exd::Exd m_FittingShopCategoryItemDat;
xiv::exd::Exd m_FittingShopItemSetDat; xiv::exd::Exd m_FittingShopItemSetDat;
xiv::exd::Exd m_Frontline03Dat; xiv::exd::Exd m_Frontline03Dat;
xiv::exd::Exd m_Frontline04Dat;
xiv::exd::Exd m_FurnitureCatalogCategoryDat; xiv::exd::Exd m_FurnitureCatalogCategoryDat;
xiv::exd::Exd m_FurnitureCatalogItemListDat; xiv::exd::Exd m_FurnitureCatalogItemListDat;
xiv::exd::Exd m_GameRewardObtainTypeDat; xiv::exd::Exd m_GameRewardObtainTypeDat;
@ -10106,7 +10091,6 @@ struct ZoneSharedGroup
using FittingShopCategoryItemPtr = std::shared_ptr< FittingShopCategoryItem >; using FittingShopCategoryItemPtr = std::shared_ptr< FittingShopCategoryItem >;
using FittingShopItemSetPtr = std::shared_ptr< FittingShopItemSet >; using FittingShopItemSetPtr = std::shared_ptr< FittingShopItemSet >;
using Frontline03Ptr = std::shared_ptr< Frontline03 >; using Frontline03Ptr = std::shared_ptr< Frontline03 >;
using Frontline04Ptr = std::shared_ptr< Frontline04 >;
using FurnitureCatalogCategoryPtr = std::shared_ptr< FurnitureCatalogCategory >; using FurnitureCatalogCategoryPtr = std::shared_ptr< FurnitureCatalogCategory >;
using FurnitureCatalogItemListPtr = std::shared_ptr< FurnitureCatalogItemList >; using FurnitureCatalogItemListPtr = std::shared_ptr< FurnitureCatalogItemList >;
using GameRewardObtainTypePtr = std::shared_ptr< GameRewardObtainType >; using GameRewardObtainTypePtr = std::shared_ptr< GameRewardObtainType >;
@ -10879,7 +10863,6 @@ struct ZoneSharedGroup
std::set< uint32_t > m_FittingShopCategoryItemIdList; std::set< uint32_t > m_FittingShopCategoryItemIdList;
std::set< uint32_t > m_FittingShopItemSetIdList; std::set< uint32_t > m_FittingShopItemSetIdList;
std::set< uint32_t > m_Frontline03IdList; std::set< uint32_t > m_Frontline03IdList;
std::set< uint32_t > m_Frontline04IdList;
std::set< uint32_t > m_FurnitureCatalogCategoryIdList; std::set< uint32_t > m_FurnitureCatalogCategoryIdList;
std::set< uint32_t > m_FurnitureCatalogItemListIdList; std::set< uint32_t > m_FurnitureCatalogItemListIdList;
std::set< uint32_t > m_GameRewardObtainTypeIdList; std::set< uint32_t > m_GameRewardObtainTypeIdList;
@ -13147,12 +13130,6 @@ const std::set< uint32_t >& getFrontline03IdList()
loadIdList( m_Frontline03Dat, m_Frontline03IdList ); loadIdList( m_Frontline03Dat, m_Frontline03IdList );
return m_Frontline03IdList; return m_Frontline03IdList;
} }
const std::set< uint32_t >& getFrontline04IdList()
{
if( m_Frontline04IdList.size() == 0 )
loadIdList( m_Frontline04Dat, m_Frontline04IdList );
return m_Frontline04IdList;
}
const std::set< uint32_t >& getFurnitureCatalogCategoryIdList() const std::set< uint32_t >& getFurnitureCatalogCategoryIdList()
{ {
if( m_FurnitureCatalogCategoryIdList.size() == 0 ) if( m_FurnitureCatalogCategoryIdList.size() == 0 )