atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

update pokemon constants path, error check level constants

Browse source
This commit is contained in:
garak 2019-09-30 19:54:27 -04:00 committed by huderlem
parent 10c99dd0a2
commit 9e03ac5e14
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/project.cpp
View file

@ -18,6 +18,7 @@
#include <QStandardItem>
#include <QMessageBox>
#include <QRegularExpression>
#include <algorithm>
int Project::num_tiles_primary = 512;
int Project::num_tiles_total = 1024;
@ -553,6 +554,7 @@ void Project::saveWildMonData() {
QJsonObject groupsObject;
for (QString groupName : fieldInfo.groups.keys()) {
QJsonArray subGroupIndices;
std::sort(fieldInfo.groups[groupName].begin(), fieldInfo.groups[groupName].end());
for (int slotIndex : fieldInfo.groups[groupName]) {
subGroupIndices.append(slotIndex);
}
@ -1780,9 +1782,9 @@ QMap<QString, int> Project::getEventObjGfxConstants() {
}
void Project::readMiscellaneousConstants() {
QMap<QString, int> pokemonDefines = parser.readCDefines("include/pokemon.h", QStringList() << "MIN_" << "MAX_");
miscConstants.insert("max_level_define", pokemonDefines.value("MAX_LEVEL"));
miscConstants.insert("min_level_define", pokemonDefines.value("MIN_LEVEL"));
QMap<QString, int> pokemonDefines = parser.readCDefines("include/constants/pokemon.h", QStringList() << "MIN_" << "MAX_");
miscConstants.insert("max_level_define", pokemonDefines.value("MAX_LEVEL") > pokemonDefines.value("MIN_LEVEL") ? pokemonDefines.value("MAX_LEVEL") : 100);
miscConstants.insert("min_level_define", pokemonDefines.value("MIN_LEVEL") < pokemonDefines.value("MAX_LEVEL") ? pokemonDefines.value("MIN_LEVEL") : 1);
}
QString Project::fixPalettePath(QString path) {