mirror of
https://github.com/SapphireServer/Sapphire.git
synced 2025-04-28 07:07:45 +00:00
Update excel data to 6.35
This commit is contained in:
parent
7d8b5472be
commit
ffcf4b087c
3 changed files with 16 additions and 12 deletions
|
@ -611,11 +611,11 @@ namespace Sapphire::Common {
|
||||||
Gridania = 2,
|
Gridania = 2,
|
||||||
Uldah = 3,
|
Uldah = 3,
|
||||||
Ishgard = 4,
|
Ishgard = 4,
|
||||||
// = 5,
|
/* = 5,
|
||||||
//1 = 6,
|
1 = 6, */
|
||||||
Kugane = 7,
|
Kugane = 7,
|
||||||
//2 = 8,
|
/* 2 = 8,
|
||||||
//3 = 9,
|
3 = 9, */
|
||||||
Crystarium = 10,
|
Crystarium = 10,
|
||||||
//4 = 11,
|
//4 = 11,
|
||||||
OldSharlayan = 12,
|
OldSharlayan = 12,
|
||||||
|
@ -783,9 +783,9 @@ namespace Sapphire::Common {
|
||||||
Polarization3 = 154,
|
Polarization3 = 154,
|
||||||
Polarization4 = 155,
|
Polarization4 = 155,
|
||||||
Projection = 156,
|
Projection = 156,
|
||||||
Pandæmonium = 157,
|
Pandæmonium = 157,
|
||||||
Pandæmonium1 = 158,
|
Pandæmonium1 = 158,
|
||||||
Pandæmonium2 = 159,
|
Pandæmonium2 = 159,
|
||||||
Ultimatum = 160,
|
Ultimatum = 160,
|
||||||
Inevitability = 161,
|
Inevitability = 161,
|
||||||
Transcendence = 162,
|
Transcendence = 162,
|
||||||
|
@ -817,7 +817,7 @@ namespace Sapphire::Common {
|
||||||
Tavern = 5,
|
Tavern = 5,
|
||||||
Eatery = 6,
|
Eatery = 6,
|
||||||
ImmersiveExperience = 7,
|
ImmersiveExperience = 7,
|
||||||
Café = 8,
|
Café = 8,
|
||||||
Aquarium = 9,
|
Aquarium = 9,
|
||||||
Sanctum = 10,
|
Sanctum = 10,
|
||||||
Venue = 11,
|
Venue = 11,
|
||||||
|
|
|
@ -6822,7 +6822,7 @@ Sapphire::Data::Leve::Leve( uint32_t row_id, Sapphire::Data::ExdDataGenerated* e
|
||||||
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 );
|
||||||
leveClient = exdData->getField< int32_t >( row, 2 );
|
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 );
|
town = exdData->getField< int32_t >( row, 5 );
|
||||||
classJobLevel = exdData->getField< uint16_t >( row, 6 );
|
classJobLevel = exdData->getField< uint16_t >( row, 6 );
|
||||||
timeLimit = exdData->getField< uint8_t >( row, 7 );
|
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 );
|
evaluation = exdData->getField< int32_t >( row, 9 );
|
||||||
placeNameStart = exdData->getField< int32_t >( row, 10 );
|
placeNameStart = exdData->getField< int32_t >( row, 10 );
|
||||||
placeNameIssued = exdData->getField< int32_t >( row, 11 );
|
placeNameIssued = exdData->getField< int32_t >( row, 11 );
|
||||||
|
fishingSpot = exdData->getField< uint16_t >( row, 12 );
|
||||||
classJobCategory = exdData->getField< uint8_t >( row, 15 );
|
classJobCategory = exdData->getField< uint8_t >( row, 15 );
|
||||||
journalGenre = exdData->getField< uint32_t >( row, 16 );
|
journalGenre = exdData->getField< uint32_t >( row, 16 );
|
||||||
placeNameStartZone = exdData->getField< int32_t >( row, 18 );
|
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 )
|
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 );
|
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 )
|
Sapphire::Data::QuestDerivedClass::QuestDerivedClass( uint32_t row_id, Sapphire::Data::ExdDataGenerated* exdData )
|
||||||
|
|
|
@ -5717,7 +5717,7 @@ struct Leve
|
||||||
std::string name;
|
std::string name;
|
||||||
std::string description;
|
std::string description;
|
||||||
int32_t leveClient;
|
int32_t leveClient;
|
||||||
uint8_t leveAssignmentType;
|
int32_t leveAssignmentType;
|
||||||
int32_t town;
|
int32_t town;
|
||||||
uint16_t classJobLevel;
|
uint16_t classJobLevel;
|
||||||
uint8_t timeLimit;
|
uint8_t timeLimit;
|
||||||
|
@ -5725,6 +5725,7 @@ struct Leve
|
||||||
int32_t evaluation;
|
int32_t evaluation;
|
||||||
int32_t placeNameStart;
|
int32_t placeNameStart;
|
||||||
int32_t placeNameIssued;
|
int32_t placeNameIssued;
|
||||||
|
uint16_t fishingSpot;
|
||||||
uint8_t classJobCategory;
|
uint8_t classJobCategory;
|
||||||
uint32_t journalGenre;
|
uint32_t journalGenre;
|
||||||
int32_t placeNameStartZone;
|
int32_t placeNameStartZone;
|
||||||
|
@ -7407,6 +7408,7 @@ struct QuestClassJobSupply
|
||||||
|
|
||||||
struct QuestDefineClient
|
struct QuestDefineClient
|
||||||
{
|
{
|
||||||
|
uint32_t target;
|
||||||
|
|
||||||
QuestDefineClient( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
|
QuestDefineClient( uint32_t row_id, uint32_t subRow, Sapphire::Data::ExdDataGenerated* exdData );
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue