diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h index 7dfa3dd2..1cd80fcc 100644 --- a/src/common/CommonGen.h +++ b/src/common/CommonGen.h @@ -498,7 +498,7 @@ namespace Sapphire::Common { ReapersArms = 88, SagesArms = 89, RegistrableMiscellany = 90, - /*1 = 91, + /* 1 = 91, 2 = 92, 3 = 93, 4 = 94, @@ -507,7 +507,7 @@ namespace Sapphire::Common { 7 = 97, 8 = 98, 9 = 99, - 10 = 100,*/ + 10 = 100, */ }; /////////////////////////////////////////////////////////// @@ -611,11 +611,11 @@ namespace Sapphire::Common { Gridania = 2, Uldah = 3, Ishgard = 4, - // = 5, - //1 = 6, + /* = 5, + 1 = 6, */ Kugane = 7, - //2 = 8, - //3 = 9, + /* 2 = 8, + 3 = 9, */ Crystarium = 10, //4 = 11, OldSharlayan = 12, @@ -783,9 +783,9 @@ namespace Sapphire::Common { Polarization3 = 154, Polarization4 = 155, Projection = 156, - Pandæmonium = 157, - Pandæmonium1 = 158, - Pandæmonium2 = 159, + Pandæmonium = 157, + Pandæmonium1 = 158, + Pandæmonium2 = 159, Ultimatum = 160, Inevitability = 161, Transcendence = 162, @@ -817,7 +817,7 @@ namespace Sapphire::Common { Tavern = 5, Eatery = 6, ImmersiveExperience = 7, - Café = 8, + Café = 8, Aquarium = 9, Sanctum = 10, Venue = 11, diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp index 24f5eea9..2ca01869 100644 --- a/src/common/Exd/ExdDataGenerated.cpp +++ b/src/common/Exd/ExdDataGenerated.cpp @@ -6822,7 +6822,7 @@ Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e name = exdData->getField< std::string >( row, 0 ); description = exdData->getField< std::string >( row, 1 ); leveClient = exdData->getField< int32_t >( row, 2 ); - leveAssignmentType = exdData->getField< uint8_t >( row, 3 ); + leveAssignmentType = 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 ); @@ -6830,6 +6830,7 @@ Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e evaluation = exdData->getField< int32_t >( row, 9 ); placeNameStart = exdData->getField< int32_t >( row, 10 ); placeNameIssued = exdData->getField< int32_t >( row, 11 ); + fishingSpot = exdData->getField< uint16_t >( row, 12 ); classJobCategory = exdData->getField< uint8_t >( row, 15 ); journalGenre = exdData->getField< uint32_t >( row, 16 ); placeNameStartZone = exdData->getField< int32_t >( row, 18 ); @@ -10259,6 +10260,7 @@ Sapphire::Data::QuestClassJobSupply::QuestClassJobSupply( uint32_t row_id, uint3 Sapphire::Data::QuestDefineClient::QuestDefineClient( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ) { auto row = exdData->m_QuestDefineClientDat.get_row( row_id, subRow ); + target = exdData->getField< uint32_t >( row, 1 ); } Sapphire::Data::QuestDerivedClass::QuestDerivedClass( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData ) diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h index 77ad81cc..32cf4767 100644 --- a/src/common/Exd/ExdDataGenerated.h +++ b/src/common/Exd/ExdDataGenerated.h @@ -5717,7 +5717,7 @@ struct Leve std::string name; std::string description; int32_t leveClient; - uint8_t leveAssignmentType; + int32_t leveAssignmentType; int32_t town; uint16_t classJobLevel; uint8_t timeLimit; @@ -5725,6 +5725,7 @@ struct Leve int32_t evaluation; int32_t placeNameStart; int32_t placeNameIssued; + uint16_t fishingSpot; uint8_t classJobCategory; uint32_t journalGenre; int32_t placeNameStartZone; @@ -7407,6 +7408,7 @@ struct QuestClassJobSupply struct QuestDefineClient { + uint32_t target; QuestDefineClient( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData ); };