redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-27 06:07:45 +00:00
Code Activity

exdpart: Make definition JSON optional, oops

Browse source
This commit is contained in:
Joshua Goins 2023-10-10 17:23:07 -04:00
parent c05d935c04
commit 9591b9a548
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
parts/exd/exdpart.cpp
View file

@ -28,19 +28,22 @@ void EXDPart::loadSheet(const QString& name) {
QFile definitionFile(QStringLiteral("Achievement.json")); QFile definitionFile(QStringLiteral("Achievement.json"));
definitionFile.open(QIODevice::ReadOnly); definitionFile.open(QIODevice::ReadOnly);
auto document = QJsonDocument::fromJson(definitionFile.readAll()); QJsonArray definitionList;
auto definitionList = document.object()[QLatin1String("definitions")].toArray(); if (definitionFile.isOpen()) {
auto document = QJsonDocument::fromJson(definitionFile.readAll());
definitionList = document.object()[QLatin1String("definitions")].toArray();
for (auto definition : definitionList) { for (auto definition : definitionList) {
if (definition.toObject().contains(QLatin1String("converter")) if (definition.toObject().contains(QLatin1String("converter"))
&& definition.toObject()[QLatin1String("converter")].toObject()[QLatin1String("type")].toString() == QStringLiteral("link")) { && definition.toObject()[QLatin1String("converter")].toObject()[QLatin1String("type")].toString() == QStringLiteral("link")) {
auto linkName = definition.toObject()[QLatin1String("converter")].toObject()[QLatin1String("target")].toString(); auto linkName = definition.toObject()[QLatin1String("converter")].toObject()[QLatin1String("target")].toString();
auto linkExh = physis_gamedata_read_excel_sheet_header(data, linkName.toStdString().c_str()); auto linkExh = physis_gamedata_read_excel_sheet_header(data, linkName.toStdString().c_str());
auto linkExd = physis_gamedata_read_excel_sheet(data, linkName.toStdString().c_str(), linkExh, getSuitableLanguage(linkExh), 0); auto linkExd = physis_gamedata_read_excel_sheet(data, linkName.toStdString().c_str(), linkExh, getSuitableLanguage(linkExh), 0);
if (linkExd.p_ptr != nullptr) { if (linkExd.p_ptr != nullptr) {
cachedExcelSheets[linkName] = CachedExcel{linkExh, linkExd}; cachedExcelSheets[linkName] = CachedExcel{linkExh, linkExd};
}
} }
} }
} }
@ -96,7 +99,9 @@ void EXDPart::loadSheet(const QString& name) {
break; break;
} }
columnType = definitionList[z].toObject()[QLatin1String("name")].toString(); if (definitionList.contains(z)) {
columnType = definitionList[z].toObject()[QLatin1String("name")].toString();
}
auto headerItem = new QTableWidgetItem(); auto headerItem = new QTableWidgetItem();
headerItem->setText(columnType); headerItem->setText(columnType);
@ -154,9 +159,10 @@ void EXDPart::loadSheet(const QString& name) {
break; break;
} }
auto definition = definitionList[z].toObject(); if (definitionList.contains(z)) {
if (definition.contains(QLatin1String("converter")) auto definition = definitionList[z].toObject();
&& definition[QLatin1String("converter")].toObject()[QLatin1String("type")].toString() == QLatin1String("link")) { if (definition.contains(QLatin1String("converter"))
&& definition[QLatin1String("converter")].toObject()[QLatin1String("type")].toString() == QLatin1String("link")) {
auto linkName = definition[QLatin1String("converter")].toObject()[QLatin1String("target")].toString(); auto linkName = definition[QLatin1String("converter")].toObject()[QLatin1String("target")].toString();
if (cachedExcelSheets.contains(linkName)) { if (cachedExcelSheets.contains(linkName)) {
@ -165,6 +171,7 @@ void EXDPart::loadSheet(const QString& name) {
columnString = QString::fromStdString(cachedExcel.exd.row_data[columnRow].column_data->string._0); columnString = QString::fromStdString(cachedExcel.exd.row_data[columnRow].column_data->string._0);
} }
} }
}
} }
auto newItem = new QTableWidgetItem(columnString); auto newItem = new QTableWidgetItem(columnString);