5.58 exd update

src/common/CommonGen.h

@@ -25,9 +25,10 @@ enum class ActionCategory : uint8_t
     System = 10,
     Artillery = 11,
     Mount = 12,
-  Glamour = 13,
+    Special = 13,
     ItemManipulation = 14,
     AdrenalineRush = 15,
+    //1 = 16,
   };
 
   ///////////////////////////////////////////////////////////
@@ -85,7 +86,7 @@ enum class BaseParam : uint8_t
     Morale = 48,
     Enmity = 49,
     EnmityReduction = 50,
-  CarefulDesynthesis = 51,
+    DesynthesisSkillGain = 51,
     EXPBonus = 52,
     Regen = 53,
     Refresh = 54,
@@ -129,6 +130,21 @@ enum class BeastReputationRank : uint8_t
   //BeastTribe.exd
   enum class BeastTribe : uint8_t
   {
+    /* = 0,
+    1 = 1,
+    2 = 2,
+    3 = 3,
+    4 = 4,
+    5 = 5,
+    6 = 6,
+    7 = 7,
+    8 = 8,
+    9 = 9,
+    10 = 10,
+    11 = 11,
+    12 = 12,
+    13 = 13,
+    14 = 14,*/
   };
 
   ///////////////////////////////////////////////////////////
@@ -174,6 +190,8 @@ enum class ClassJob : uint8_t
     Bluemage = 36,
     Gunbreaker = 37,
     Dancer = 38,
+    // = 39,
+    //1 = 40,
   };
 
   ///////////////////////////////////////////////////////////
@@ -200,11 +218,16 @@ enum class ContentType : uint8_t
     DisciplesoftheHand = 17,
     RetainerVentures = 18,
     GoldSaucer = 19,
+    //1 = 20,
     DeepDungeons = 21,
+    //2 = 22,
+    //3 = 23,
     WondrousTails = 24,
     CustomDeliveries = 25,
     Eureka = 26,
+    //4 = 27,
     UltimateRaids = 28,
+    //5 = 29,
   };
 
   ///////////////////////////////////////////////////////////
@@ -215,6 +238,7 @@ enum class EmoteCategory : uint8_t
     General = 1,
     Special = 2,
     Expressions = 3,
+    //1 = 4,
   };
 
   ///////////////////////////////////////////////////////////
@@ -461,7 +485,20 @@ enum class ItemSearchCategory : uint8_t
     RedMagesArms = 84,
     ScholarsArms = 85,
     GunbreakersArms = 86,
-  ThrowingWeapons = 87,
+    DancersArms1 = 87,
+    /*1 = 88,
+    2 = 89,
+    3 = 90,
+    4 = 91,
+    5 = 92,
+    6 = 93,
+    7 = 94,
+    8 = 95,
+    9 = 96,
+    10 = 97,
+    11 = 98,
+    12 = 99,
+    13 = 100,*/
   };
 
   ///////////////////////////////////////////////////////////
@@ -564,8 +601,13 @@ enum class Town : uint8_t
     Gridania = 2,
     Uldah = 3,
     Ishgard = 4,
+    // = 5,
+    //1 = 6,
     Kugane = 7,
-  TheCrystarium = 10,
+    //2 = 8,
+    //3 = 9,
+    Crystarium = 10,
+    //4 = 11,
   };
 
   ///////////////////////////////////////////////////////////
@@ -718,7 +760,14 @@ enum class Weather : uint8_t
     StormClouds1 = 143,
     Firestorm = 144,
     SpectralCurrent = 145,
+    //1 = 146,
     Climactic = 147,
+    //2 = 148,
+    //3 = 149,
+    //4 = 150,
+    //5 = 151,
+    //6 = 152,
+    //7 = 153,
   };
 
   ///////////////////////////////////////////////////////////
@@ -738,6 +787,7 @@ enum class HousingAppeal : uint8_t
     Sanctum = 10,
     Venue = 11,
     Florist = 12,
+    // = 13,
     Library = 14,
     PhotoStudio = 15,
     HauntedHouse = 16,
@@ -750,7 +800,5 @@ enum class HousingAppeal : uint8_t
     UnderRenovation = 23,
     ConcertHall = 24,
   };
-
 }
 #endif
-

src/common/Exd/ExdDataGenerated.cpp

@@ -23,7 +23,7 @@ Sapphire::Data::Achievement::Achievement( uint32_t row_id, Sapphire::Data::ExdDa
   data.push_back( exdData->getField< int32_t >( row, 21 ) );
   data.push_back( exdData->getField< int32_t >( row, 22 ) );
   order = exdData->getField< uint16_t >( row, 23 );
-  achievementHideCondition = exdData->getField< uint8_t >( row, 24 );
+  achievementHideCondition = exdData->getField< uint8_t >( row, 25 );
 }
 
 Sapphire::Data::AchievementCategory::AchievementCategory( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2120,17 +2120,18 @@ Sapphire::Data::ContentFinderCondition::ContentFinderCondition( uint32_t row_id,
   sortKey = exdData->getField< uint16_t >( row, 42 );
   image = exdData->getField< uint32_t >( row, 43 );
   icon = exdData->getField< uint32_t >( row, 44 );
-  levelingRoulette = exdData->getField< bool >( row, 46 );
+  level506070Roulette = exdData->getField< bool >( row, 46 );
-  level506070Roulette = exdData->getField< bool >( row, 48 );
+  levelingRoulette = exdData->getField< bool >( row, 47 );
-  mSQRoulette = exdData->getField< bool >( row, 49 );
+  mSQRoulette = exdData->getField< bool >( row, 48 );
-  guildHestRoulette = exdData->getField< bool >( row, 50 );
+  guildHestRoulette = exdData->getField< bool >( row, 49 );
-  expertRoulette = exdData->getField< bool >( row, 51 );
+  expertRoulette = exdData->getField< bool >( row, 50 );
-  trialRoulette = exdData->getField< bool >( row, 52 );
+  trialRoulette = exdData->getField< bool >( row, 51 );
-  dailyFrontlineChallenge = exdData->getField< bool >( row, 53 );
+  dailyFrontlineChallenge = exdData->getField< bool >( row, 52 );
-  level80Roulette = exdData->getField< bool >( row, 54 );
+  level80Roulette = exdData->getField< bool >( row, 53 );
-  mentorRoulette = exdData->getField< bool >( row, 55 );
+  mentorRoulette = exdData->getField< bool >( row, 54 );
-  allianceRoulette = exdData->getField< bool >( row, 61 );
+  allianceRoulette = exdData->getField< bool >( row, 60 );
-  normalRaidRoulette = exdData->getField< bool >( row, 63 );
+  feastTeamRoulette = exdData->getField< bool >( row, 61 );
+  normalRaidRoulette = exdData->getField< bool >( row, 62 );
 }
 
 Sapphire::Data::ContentFinderConditionTransient::ContentFinderConditionTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2158,10 +2159,10 @@ Sapphire::Data::ContentGaugeColor::ContentGaugeColor( uint32_t row_id, Sapphire:
 Sapphire::Data::ContentMemberType::ContentMemberType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_ContentMemberTypeDat.get_row( row_id );
-  tanksPerParty = exdData->getField< uint8_t >( row, 9 );
+  tanksPerParty = exdData->getField< uint8_t >( row, 10 );
-  healersPerParty = exdData->getField< uint8_t >( row, 10 );
+  healersPerParty = exdData->getField< uint8_t >( row, 11 );
-  meleesPerParty = exdData->getField< uint8_t >( row, 11 );
+  meleesPerParty = exdData->getField< uint8_t >( row, 12 );
-  rangedPerParty = exdData->getField< uint8_t >( row, 12 );
+  rangedPerParty = exdData->getField< uint8_t >( row, 13 );
 }
 
 Sapphire::Data::ContentNpcTalk::ContentNpcTalk( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -2846,7 +2847,7 @@ Sapphire::Data::DynamicEventEnemyType::DynamicEventEnemyType( uint32_t row_id, S
 Sapphire::Data::DynamicEventSingleBattle::DynamicEventSingleBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_DynamicEventSingleBattleDat.get_row( row_id );
-  actionIcon = exdData->getField< int32_t >( row, 0 );
+  bNpcName = exdData->getField< int32_t >( row, 0 );
   icon = exdData->getField< uint32_t >( row, 1 );
   text = exdData->getField< std::string >( row, 2 );
 }
@@ -3575,7 +3576,9 @@ Sapphire::Data::FieldMarker::FieldMarker( uint32_t row_id, Sapphire::Data::ExdDa
 {
   auto row = exdData->m_FieldMarkerDat.get_row( row_id );
   vFX = exdData->getField< int32_t >( row, 0 );
-  icon = exdData->getField< uint16_t >( row, 1 );
+  uiIcon = exdData->getField< uint16_t >( row, 1 );
+  mapIcon = exdData->getField< uint16_t >( row, 2 );
+  name = exdData->getField< std::string >( row, 3 );
 }
 
 Sapphire::Data::FishingRecordType::FishingRecordType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -6219,6 +6222,7 @@ Sapphire::Data::Item::Item( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   materiaSlotCount = exdData->getField< uint8_t >( row, 86 );
   isAdvancedMeldingPermitted = exdData->getField< bool >( row, 87 );
   isPvP = exdData->getField< bool >( row, 88 );
+  subStatCategory = exdData->getField< uint8_t >( row, 89 );
   isGlamourous = exdData->getField< bool >( row, 90 );
   for( int i = 0; i < 6; ++i )
   {
@@ -6464,7 +6468,7 @@ Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
   description = exdData->getField< std::string >( row, 1 );
   leveClient = exdData->getField< int32_t >( row, 2 );
   leveAssignmentType = exdData->getField< uint8_t >( row, 3 );
-  town = exdData->getField< int32_t >( row, 4 );
+  town = exdData->getField< int32_t >( row, 5 );
   classJobLevel = exdData->getField< uint16_t >( row, 6 );
   timeLimit = exdData->getField< uint8_t >( row, 7 );
   allowanceCost = exdData->getField< uint8_t >( row, 8 );
@@ -8993,6 +8997,13 @@ Sapphire::Data::Quest::Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   sortKey = exdData->getField< uint16_t >( row, 1514 );
 }
 
+Sapphire::Data::QuestAcceptAdditionCondition::QuestAcceptAdditionCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestAcceptAdditionConditionDat.get_row( row_id );
+  requirement0 = exdData->getField< uint32_t >( row, 0 );
+  requirement1 = exdData->getField< uint32_t >( row, 1 );
+}
+
 Sapphire::Data::QuestBattle::QuestBattle( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_QuestBattleDat.get_row( row_id );
@@ -9437,6 +9448,8 @@ Sapphire::Data::QuestClassJobSupply::QuestClassJobSupply( uint32_t row_id, uint3
   classJobCategory = exdData->getField< uint8_t >( row, 0 );
   eNpcResident = exdData->getField< uint32_t >( row, 2 );
   item = exdData->getField< uint32_t >( row, 3 );
+  amountRequired = exdData->getField< uint8_t >( row, 4 );
+  itemHQ = exdData->getField< bool >( row, 5 );
 }
 
 Sapphire::Data::QuestDerivedClass::QuestDerivedClass( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -9445,6 +9458,17 @@ Sapphire::Data::QuestDerivedClass::QuestDerivedClass( uint32_t row_id, Sapphire:
   classJob = exdData->getField< uint8_t >( row, 0 );
 }
 
+Sapphire::Data::QuestEffect::QuestEffect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestEffectDat.get_row( row_id );
+}
+
+Sapphire::Data::QuestEffectDefine::QuestEffectDefine( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_QuestEffectDefineDat.get_row( row_id, subRow );
+  effect = exdData->getField< uint16_t >( row, 0 );
+}
+
 Sapphire::Data::QuestRedo::QuestRedo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_QuestRedoDat.get_row( row_id );
@@ -9588,6 +9612,9 @@ Sapphire::Data::RacingChocoboNameInfo::RacingChocoboNameInfo( uint32_t row_id, S
 {
   auto row = exdData->m_RacingChocoboNameInfoDat.get_row( row_id );
   racingChocoboNameCategory = exdData->getField< uint8_t >( row, 0 );
+  name.push_back( exdData->getField< uint16_t >( row, 5 ) );
+  name.push_back( exdData->getField< uint16_t >( row, 6 ) );
+  name.push_back( exdData->getField< uint16_t >( row, 7 ) );
 }
 
 Sapphire::Data::RacingChocoboParam::RacingChocoboParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -9672,6 +9699,7 @@ Sapphire::Data::RecipeLookup::RecipeLookup( uint32_t row_id, Sapphire::Data::Exd
 Sapphire::Data::RecipeNotebookList::RecipeNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_RecipeNotebookListDat.get_row( row_id );
+  count = exdData->getField< uint8_t >( row, 0 );
   recipe.push_back( exdData->getField< int32_t >( row, 1 ) );
   recipe.push_back( exdData->getField< int32_t >( row, 2 ) );
   recipe.push_back( exdData->getField< int32_t >( row, 3 ) );
@@ -10018,6 +10046,13 @@ Sapphire::Data::RideShooting::RideShooting( uint32_t row_id, Sapphire::Data::Exd
   eNpcScale.push_back( exdData->getField< uint8_t >( row, 37 ) );
 }
 
+Sapphire::Data::RideShootingTargetType::RideShootingTargetType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_RideShootingTargetTypeDat.get_row( row_id );
+  eObj = exdData->getField< uint32_t >( row, 0 );
+  score = exdData->getField< int16_t >( row, 1 );
+}
+
 Sapphire::Data::RideShootingTextData::RideShootingTextData( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_RideShootingTextDataDat.get_row( row_id );
@@ -10410,6 +10445,7 @@ Sapphire::Data::Stain::Stain( uint32_t row_id, Sapphire::Data::ExdDataGenerated*
   auto row = exdData->m_StainDat.get_row( row_id );
   color = exdData->getField< uint32_t >( row, 0 );
   shade = exdData->getField< uint8_t >( row, 1 );
+  subOrder = exdData->getField< uint8_t >( row, 2 );
   name = exdData->getField< std::string >( row, 3 );
 }
 
@@ -10420,6 +10456,13 @@ Sapphire::Data::StainTransient::StainTransient( uint32_t row_id, Sapphire::Data:
   item2 = exdData->getField< uint32_t >( row, 1 );
 }
 
+Sapphire::Data::StanceChange::StanceChange( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_StanceChangeDat.get_row( row_id );
+  action.push_back( exdData->getField< uint16_t >( row, 1 ) );
+  action.push_back( exdData->getField< uint16_t >( row, 2 ) );
+}
+
 Sapphire::Data::Status::Status( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
 {
   auto row = exdData->m_StatusDat.get_row( row_id );
@@ -12399,6 +12442,7 @@ Sapphire::Data::TerritoryType::TerritoryType( uint32_t row_id, Sapphire::Data::E
   loadingImage = exdData->getField< uint8_t >( row, 7 );
   exclusiveType = exdData->getField< uint8_t >( row, 8 );
   territoryIntendedUse = exdData->getField< uint8_t >( row, 9 );
+  contentFinderCondition = exdData->getField< uint16_t >( row, 10 );
   weatherRate = exdData->getField< uint8_t >( row, 12 );
   pCSearch = exdData->getField< bool >( row, 15 );
   stealth = exdData->getField< bool >( row, 16 );
@@ -12431,6 +12475,13 @@ Sapphire::Data::TextCommand::TextCommand( uint32_t row_id, Sapphire::Data::ExdDa
   description = exdData->getField< std::string >( row, 7 );
   alias = exdData->getField< std::string >( row, 8 );
   shortAlias = exdData->getField< std::string >( row, 9 );
+  param = exdData->getField< uint16_t >( row, 10 );
+}
+
+Sapphire::Data::TextCommandParam::TextCommandParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
+{
+  auto row = exdData->m_TextCommandParamDat.get_row( row_id );
+  param = exdData->getField< std::string >( row, 0 );
 }
 
 Sapphire::Data::Title::Title( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
@@ -13509,11 +13560,14 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_PvPSelectTraitDat = setupDatAccess( "PvPSelectTrait", xiv::exd::Language::en );
     m_PvPTraitDat = setupDatAccess( "PvPTrait", xiv::exd::Language::none );
     m_QuestDat = setupDatAccess( "Quest", xiv::exd::Language::en );
+    m_QuestAcceptAdditionConditionDat = setupDatAccess( "QuestAcceptAdditionCondition", xiv::exd::Language::none );
     m_QuestBattleDat = setupDatAccess( "QuestBattle", xiv::exd::Language::none );
     m_QuestChapterDat = setupDatAccess( "QuestChapter", xiv::exd::Language::none );
     m_QuestClassJobRewardDat = setupDatAccess( "QuestClassJobReward", xiv::exd::Language::none );
     m_QuestClassJobSupplyDat = setupDatAccess( "QuestClassJobSupply", xiv::exd::Language::none );
     m_QuestDerivedClassDat = setupDatAccess( "QuestDerivedClass", xiv::exd::Language::none );
+    m_QuestEffectDat = setupDatAccess( "QuestEffect", xiv::exd::Language::none );
+    m_QuestEffectDefineDat = setupDatAccess( "QuestEffectDefine", xiv::exd::Language::none );
     m_QuestRedoDat = setupDatAccess( "QuestRedo", xiv::exd::Language::none );
     m_QuestRedoChapterUIDat = setupDatAccess( "QuestRedoChapterUI", xiv::exd::Language::en );
     m_QuestRedoChapterUICategoryDat = setupDatAccess( "QuestRedoChapterUICategory", xiv::exd::Language::en );
@@ -13549,6 +13603,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_RetainerTaskParameterDat = setupDatAccess( "RetainerTaskParameter", xiv::exd::Language::none );
     m_RetainerTaskRandomDat = setupDatAccess( "RetainerTaskRandom", xiv::exd::Language::en );
     m_RideShootingDat = setupDatAccess( "RideShooting", xiv::exd::Language::none );
+    m_RideShootingTargetTypeDat = setupDatAccess( "RideShootingTargetType", xiv::exd::Language::none );
     m_RideShootingTextDataDat = setupDatAccess( "RideShootingTextData", xiv::exd::Language::en );
     m_RPParameterDat = setupDatAccess( "RPParameter", xiv::exd::Language::none );
     m_SatisfactionArbitrationDat = setupDatAccess( "SatisfactionArbitration", xiv::exd::Language::none );
@@ -13574,6 +13629,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_SpecialShopItemCategoryDat = setupDatAccess( "SpecialShopItemCategory", xiv::exd::Language::en );
     m_StainDat = setupDatAccess( "Stain", xiv::exd::Language::en );
     m_StainTransientDat = setupDatAccess( "StainTransient", xiv::exd::Language::none );
+    m_StanceChangeDat = setupDatAccess( "StanceChange", xiv::exd::Language::none );
     m_StatusDat = setupDatAccess( "Status", xiv::exd::Language::en );
     m_StatusHitEffectDat = setupDatAccess( "StatusHitEffect", xiv::exd::Language::none );
     m_StatusLoopVFXDat = setupDatAccess( "StatusLoopVFX", xiv::exd::Language::none );
@@ -13587,6 +13643,7 @@ bool Sapphire::Data::ExdDataGenerated::init( const std::string& path )
     m_TerritoryTypeDat = setupDatAccess( "TerritoryType", xiv::exd::Language::none );
     m_TerritoryTypeTransientDat = setupDatAccess( "TerritoryTypeTransient", xiv::exd::Language::none );
     m_TextCommandDat = setupDatAccess( "TextCommand", xiv::exd::Language::en );
+    m_TextCommandParamDat = setupDatAccess( "TextCommandParam", xiv::exd::Language::en );
     m_TitleDat = setupDatAccess( "Title", xiv::exd::Language::en );
     m_TomestonesDat = setupDatAccess( "Tomestones", xiv::exd::Language::none );
     m_TomestonesItemDat = setupDatAccess( "TomestonesItem", xiv::exd::Language::none );

src/common/Exd/ExdDataGenerated.h

@@ -527,11 +527,14 @@ struct PvPRank;
 struct PvPSelectTrait;
 struct PvPTrait;
 struct Quest;
+struct QuestAcceptAdditionCondition;
 struct QuestBattle;
 struct QuestChapter;
 struct QuestClassJobReward;
 struct QuestClassJobSupply;
 struct QuestDerivedClass;
+struct QuestEffect;
+struct QuestEffectDefine;
 struct QuestRedo;
 struct QuestRedoChapterUI;
 struct QuestRedoChapterUICategory;
@@ -567,6 +570,7 @@ struct RetainerTaskNormal;
 struct RetainerTaskParameter;
 struct RetainerTaskRandom;
 struct RideShooting;
+struct RideShootingTargetType;
 struct RideShootingTextData;
 struct RPParameter;
 struct SatisfactionArbitration;
@@ -592,6 +596,7 @@ struct SpecialShop;
 struct SpecialShopItemCategory;
 struct Stain;
 struct StainTransient;
+struct StanceChange;
 struct Status;
 struct StatusHitEffect;
 struct StatusLoopVFX;
@@ -605,6 +610,7 @@ struct SwitchTalkVariation;
 struct TerritoryType;
 struct TerritoryTypeTransient;
 struct TextCommand;
+struct TextCommandParam;
 struct Title;
 struct Tomestones;
 struct TomestonesItem;
@@ -2393,8 +2399,8 @@ struct ContentFinderCondition
   uint16_t sortKey;
   uint32_t image;
   uint32_t icon;
-  bool levelingRoulette;
   bool level506070Roulette;
+  bool levelingRoulette;
   bool mSQRoulette;
   bool guildHestRoulette;
   bool expertRoulette;
@@ -2403,6 +2409,7 @@ struct ContentFinderCondition
   bool level80Roulette;
   bool mentorRoulette;
   bool allianceRoulette;
+  bool feastTeamRoulette;
   bool normalRaidRoulette;
 
   ContentFinderCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -3049,7 +3056,7 @@ struct DynamicEventEnemyType
 
 struct DynamicEventSingleBattle
 {
-  int32_t actionIcon;
+  int32_t bNpcName;
   uint32_t icon;
   std::string text;
 
@@ -3662,7 +3669,9 @@ struct Festival
 struct FieldMarker
 {
   int32_t vFX;
-  uint16_t icon;
+  uint16_t uiIcon;
+  uint16_t mapIcon;
+  std::string name;
 
   FieldMarker( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -4955,6 +4964,7 @@ struct Item
   uint8_t materiaSlotCount;
   bool isAdvancedMeldingPermitted;
   bool isPvP;
+  uint8_t subStatCategory;
   bool isGlamourous;
 
   struct
@@ -6407,6 +6417,14 @@ struct Quest
   Quest( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct QuestAcceptAdditionCondition
+{
+  uint32_t requirement0;
+  uint32_t requirement1;
+
+  QuestAcceptAdditionCondition( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct QuestBattle
 {
   int32_t quest;
@@ -6443,6 +6461,8 @@ struct QuestClassJobSupply
   uint8_t classJobCategory;
   uint32_t eNpcResident;
   uint32_t item;
+  uint8_t amountRequired;
+  bool itemHQ;
 
   QuestClassJobSupply( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -6454,6 +6474,19 @@ struct QuestDerivedClass
   QuestDerivedClass( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct QuestEffect
+{
+
+  QuestEffect( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
+struct QuestEffectDefine
+{
+  uint16_t effect;
+
+  QuestEffectDefine( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct QuestRedo
 {
   uint32_t finalQuest;
@@ -6577,6 +6610,7 @@ struct RacingChocoboNameCategory
 struct RacingChocoboNameInfo
 {
   uint8_t racingChocoboNameCategory;
+  std::vector< uint16_t > name;
 
   RacingChocoboNameInfo( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
@@ -6667,6 +6701,7 @@ struct RecipeLookup
 
 struct RecipeNotebookList
 {
+  uint8_t count;
   std::vector< int32_t > recipe;
 
   RecipeNotebookList( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -6840,6 +6875,14 @@ struct RideShooting
   RideShooting( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct RideShootingTargetType
+{
+  uint32_t eObj;
+  int16_t score;
+
+  RideShootingTargetType( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct RideShootingTextData
 {
   std::string string;
@@ -7067,6 +7110,7 @@ struct Stain
 {
   uint32_t color;
   uint8_t shade;
+  uint8_t subOrder;
   std::string name;
 
   Stain( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
@@ -7080,6 +7124,13 @@ struct StainTransient
   StainTransient( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct StanceChange
+{
+  std::vector< uint16_t > action;
+
+  StanceChange( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Status
 {
   std::string name;
@@ -7227,6 +7278,7 @@ struct TerritoryType
   uint8_t loadingImage;
   uint8_t exclusiveType;
   uint8_t territoryIntendedUse;
+  uint16_t contentFinderCondition;
   uint8_t weatherRate;
   bool pCSearch;
   bool stealth;
@@ -7261,10 +7313,18 @@ struct TextCommand
   std::string description;
   std::string alias;
   std::string shortAlias;
+  uint16_t param;
 
   TextCommand( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
 };
 
+struct TextCommandParam
+{
+  std::string param;
+
+  TextCommandParam( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData );
+};
+
 struct Title
 {
   std::string masculine;
@@ -8328,11 +8388,14 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_PvPSelectTraitDat;
      xiv::exd::Exd m_PvPTraitDat;
      xiv::exd::Exd m_QuestDat;
+     xiv::exd::Exd m_QuestAcceptAdditionConditionDat;
      xiv::exd::Exd m_QuestBattleDat;
      xiv::exd::Exd m_QuestChapterDat;
      xiv::exd::Exd m_QuestClassJobRewardDat;
      xiv::exd::Exd m_QuestClassJobSupplyDat;
      xiv::exd::Exd m_QuestDerivedClassDat;
+     xiv::exd::Exd m_QuestEffectDat;
+     xiv::exd::Exd m_QuestEffectDefineDat;
      xiv::exd::Exd m_QuestRedoDat;
      xiv::exd::Exd m_QuestRedoChapterUIDat;
      xiv::exd::Exd m_QuestRedoChapterUICategoryDat;
@@ -8368,6 +8431,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_RetainerTaskParameterDat;
      xiv::exd::Exd m_RetainerTaskRandomDat;
      xiv::exd::Exd m_RideShootingDat;
+     xiv::exd::Exd m_RideShootingTargetTypeDat;
      xiv::exd::Exd m_RideShootingTextDataDat;
      xiv::exd::Exd m_RPParameterDat;
      xiv::exd::Exd m_SatisfactionArbitrationDat;
@@ -8393,6 +8457,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_SpecialShopItemCategoryDat;
      xiv::exd::Exd m_StainDat;
      xiv::exd::Exd m_StainTransientDat;
+     xiv::exd::Exd m_StanceChangeDat;
      xiv::exd::Exd m_StatusDat;
      xiv::exd::Exd m_StatusHitEffectDat;
      xiv::exd::Exd m_StatusLoopVFXDat;
@@ -8406,6 +8471,7 @@ struct ZoneSharedGroup
      xiv::exd::Exd m_TerritoryTypeDat;
      xiv::exd::Exd m_TerritoryTypeTransientDat;
      xiv::exd::Exd m_TextCommandDat;
+     xiv::exd::Exd m_TextCommandParamDat;
      xiv::exd::Exd m_TitleDat;
      xiv::exd::Exd m_TomestonesDat;
      xiv::exd::Exd m_TomestonesItemDat;
@@ -8965,11 +9031,14 @@ struct ZoneSharedGroup
      using PvPSelectTraitPtr = std::shared_ptr< PvPSelectTrait >;
      using PvPTraitPtr = std::shared_ptr< PvPTrait >;
      using QuestPtr = std::shared_ptr< Quest >;
+     using QuestAcceptAdditionConditionPtr = std::shared_ptr< QuestAcceptAdditionCondition >;
      using QuestBattlePtr = std::shared_ptr< QuestBattle >;
      using QuestChapterPtr = std::shared_ptr< QuestChapter >;
      using QuestClassJobRewardPtr = std::shared_ptr< QuestClassJobReward >;
      using QuestClassJobSupplyPtr = std::shared_ptr< QuestClassJobSupply >;
      using QuestDerivedClassPtr = std::shared_ptr< QuestDerivedClass >;
+     using QuestEffectPtr = std::shared_ptr< QuestEffect >;
+     using QuestEffectDefinePtr = std::shared_ptr< QuestEffectDefine >;
      using QuestRedoPtr = std::shared_ptr< QuestRedo >;
      using QuestRedoChapterUIPtr = std::shared_ptr< QuestRedoChapterUI >;
      using QuestRedoChapterUICategoryPtr = std::shared_ptr< QuestRedoChapterUICategory >;
@@ -9005,6 +9074,7 @@ struct ZoneSharedGroup
      using RetainerTaskParameterPtr = std::shared_ptr< RetainerTaskParameter >;
      using RetainerTaskRandomPtr = std::shared_ptr< RetainerTaskRandom >;
      using RideShootingPtr = std::shared_ptr< RideShooting >;
+     using RideShootingTargetTypePtr = std::shared_ptr< RideShootingTargetType >;
      using RideShootingTextDataPtr = std::shared_ptr< RideShootingTextData >;
      using RPParameterPtr = std::shared_ptr< RPParameter >;
      using SatisfactionArbitrationPtr = std::shared_ptr< SatisfactionArbitration >;
@@ -9030,6 +9100,7 @@ struct ZoneSharedGroup
      using SpecialShopItemCategoryPtr = std::shared_ptr< SpecialShopItemCategory >;
      using StainPtr = std::shared_ptr< Stain >;
      using StainTransientPtr = std::shared_ptr< StainTransient >;
+     using StanceChangePtr = std::shared_ptr< StanceChange >;
      using StatusPtr = std::shared_ptr< Status >;
      using StatusHitEffectPtr = std::shared_ptr< StatusHitEffect >;
      using StatusLoopVFXPtr = std::shared_ptr< StatusLoopVFX >;
@@ -9043,6 +9114,7 @@ struct ZoneSharedGroup
      using TerritoryTypePtr = std::shared_ptr< TerritoryType >;
      using TerritoryTypeTransientPtr = std::shared_ptr< TerritoryTypeTransient >;
      using TextCommandPtr = std::shared_ptr< TextCommand >;
+     using TextCommandParamPtr = std::shared_ptr< TextCommandParam >;
      using TitlePtr = std::shared_ptr< Title >;
      using TomestonesPtr = std::shared_ptr< Tomestones >;
      using TomestonesItemPtr = std::shared_ptr< TomestonesItem >;
@@ -9602,11 +9674,14 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_PvPSelectTraitIdList;
      std::set< uint32_t > m_PvPTraitIdList;
      std::set< uint32_t > m_QuestIdList;
+     std::set< uint32_t > m_QuestAcceptAdditionConditionIdList;
      std::set< uint32_t > m_QuestBattleIdList;
      std::set< uint32_t > m_QuestChapterIdList;
      std::set< uint32_t > m_QuestClassJobRewardIdList;
      std::set< uint32_t > m_QuestClassJobSupplyIdList;
      std::set< uint32_t > m_QuestDerivedClassIdList;
+     std::set< uint32_t > m_QuestEffectIdList;
+     std::set< uint32_t > m_QuestEffectDefineIdList;
      std::set< uint32_t > m_QuestRedoIdList;
      std::set< uint32_t > m_QuestRedoChapterUIIdList;
      std::set< uint32_t > m_QuestRedoChapterUICategoryIdList;
@@ -9642,6 +9717,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_RetainerTaskParameterIdList;
      std::set< uint32_t > m_RetainerTaskRandomIdList;
      std::set< uint32_t > m_RideShootingIdList;
+     std::set< uint32_t > m_RideShootingTargetTypeIdList;
      std::set< uint32_t > m_RideShootingTextDataIdList;
      std::set< uint32_t > m_RPParameterIdList;
      std::set< uint32_t > m_SatisfactionArbitrationIdList;
@@ -9667,6 +9743,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_SpecialShopItemCategoryIdList;
      std::set< uint32_t > m_StainIdList;
      std::set< uint32_t > m_StainTransientIdList;
+     std::set< uint32_t > m_StanceChangeIdList;
      std::set< uint32_t > m_StatusIdList;
      std::set< uint32_t > m_StatusHitEffectIdList;
      std::set< uint32_t > m_StatusLoopVFXIdList;
@@ -9680,6 +9757,7 @@ struct ZoneSharedGroup
      std::set< uint32_t > m_TerritoryTypeIdList;
      std::set< uint32_t > m_TerritoryTypeTransientIdList;
      std::set< uint32_t > m_TextCommandIdList;
+     std::set< uint32_t > m_TextCommandParamIdList;
      std::set< uint32_t > m_TitleIdList;
      std::set< uint32_t > m_TomestonesIdList;
      std::set< uint32_t > m_TomestonesItemIdList;
@@ -12764,6 +12842,12 @@ const std::set< uint32_t >& getQuestIdList()
       loadIdList( m_QuestDat, m_QuestIdList );
    return m_QuestIdList;
 }
+const std::set< uint32_t >& getQuestAcceptAdditionConditionIdList()
+{
+   if( m_QuestAcceptAdditionConditionIdList.size() == 0 )
+      loadIdList( m_QuestAcceptAdditionConditionDat, m_QuestAcceptAdditionConditionIdList );
+   return m_QuestAcceptAdditionConditionIdList;
+}
 const std::set< uint32_t >& getQuestBattleIdList()
 {
    if( m_QuestBattleIdList.size() == 0 )
@@ -12794,6 +12878,18 @@ const std::set< uint32_t >& getQuestDerivedClassIdList()
       loadIdList( m_QuestDerivedClassDat, m_QuestDerivedClassIdList );
    return m_QuestDerivedClassIdList;
 }
+const std::set< uint32_t >& getQuestEffectIdList()
+{
+   if( m_QuestEffectIdList.size() == 0 )
+      loadIdList( m_QuestEffectDat, m_QuestEffectIdList );
+   return m_QuestEffectIdList;
+}
+const std::set< uint32_t >& getQuestEffectDefineIdList()
+{
+   if( m_QuestEffectDefineIdList.size() == 0 )
+      loadIdList( m_QuestEffectDefineDat, m_QuestEffectDefineIdList );
+   return m_QuestEffectDefineIdList;
+}
 const std::set< uint32_t >& getQuestRedoIdList()
 {
    if( m_QuestRedoIdList.size() == 0 )
@@ -13004,6 +13100,12 @@ const std::set< uint32_t >& getRideShootingIdList()
       loadIdList( m_RideShootingDat, m_RideShootingIdList );
    return m_RideShootingIdList;
 }
+const std::set< uint32_t >& getRideShootingTargetTypeIdList()
+{
+   if( m_RideShootingTargetTypeIdList.size() == 0 )
+      loadIdList( m_RideShootingTargetTypeDat, m_RideShootingTargetTypeIdList );
+   return m_RideShootingTargetTypeIdList;
+}
 const std::set< uint32_t >& getRideShootingTextDataIdList()
 {
    if( m_RideShootingTextDataIdList.size() == 0 )
@@ -13154,6 +13256,12 @@ const std::set< uint32_t >& getStainTransientIdList()
       loadIdList( m_StainTransientDat, m_StainTransientIdList );
    return m_StainTransientIdList;
 }
+const std::set< uint32_t >& getStanceChangeIdList()
+{
+   if( m_StanceChangeIdList.size() == 0 )
+      loadIdList( m_StanceChangeDat, m_StanceChangeIdList );
+   return m_StanceChangeIdList;
+}
 const std::set< uint32_t >& getStatusIdList()
 {
    if( m_StatusIdList.size() == 0 )
@@ -13232,6 +13340,12 @@ const std::set< uint32_t >& getTextCommandIdList()
       loadIdList( m_TextCommandDat, m_TextCommandIdList );
    return m_TextCommandIdList;
 }
+const std::set< uint32_t >& getTextCommandParamIdList()
+{
+   if( m_TextCommandParamIdList.size() == 0 )
+      loadIdList( m_TextCommandParamDat, m_TextCommandParamIdList );
+   return m_TextCommandParamIdList;
+}
 const std::set< uint32_t >& getTitleIdList()
 {
    if( m_TitleIdList.size() == 0 )