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

Automatically adjust min/max encounter levels

Browse source
This commit is contained in:
GriffinR 2023-07-31 14:55:53 -04:00
parent 0b293d2af0
commit 1ecb2cc369
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -9,6 +9,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
## [Unreleased] ## [Unreleased]
### Changed ### Changed
- The Palette Editor now remembers the Bit Depth setting. - The Palette Editor now remembers the Bit Depth setting.
- The min/max levels on the Wild Pokémon tab will now adjust automatically if they invalidate each other.
### Fixed ### Fixed
- Fix text boxes in the Palette Editor calculating color incorrectly. - Fix text boxes in the Palette Editor calculating color incorrectly.

6
src/ui/encountertabledelegates.cpp
View file

@ -61,12 +61,8 @@ QWidget *SpinBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewIt
editor->setFrame(false); editor->setFrame(false);
int col = index.column(); int col = index.column();
if (col == EncounterTableModel::ColumnType::MinLevel) { if (col == EncounterTableModel::ColumnType::MinLevel || col == EncounterTableModel::ColumnType::MaxLevel) {
editor->setMinimum(this->project->miscConstants.value("min_level_define").toInt()); editor->setMinimum(this->project->miscConstants.value("min_level_define").toInt());
editor->setMaximum(index.siblingAtColumn(EncounterTableModel::ColumnType::MaxLevel).data(Qt::EditRole).toInt());
}
else if (col == EncounterTableModel::ColumnType::MaxLevel) {
editor->setMinimum(index.siblingAtColumn(EncounterTableModel::ColumnType::MinLevel).data(Qt::EditRole).toInt());
editor->setMaximum(this->project->miscConstants.value("max_level_define").toInt()); editor->setMaximum(this->project->miscConstants.value("max_level_define").toInt());
} }
else if (col == EncounterTableModel::ColumnType::EncounterRate) { else if (col == EncounterTableModel::ColumnType::EncounterRate) {

16
src/ui/encountertablemodel.cpp
View file

@ -155,13 +155,21 @@ bool EncounterTableModel::setData(const QModelIndex &index, const QVariant &valu
this->monInfo.wildPokemon[row].species = value.toString(); this->monInfo.wildPokemon[row].species = value.toString();
break; break;
case ColumnType::MinLevel: case ColumnType::MinLevel: {
this->monInfo.wildPokemon[row].minLevel = value.toInt(); int minLevel = value.toInt();
this->monInfo.wildPokemon[row].minLevel = minLevel;
if (minLevel > this->monInfo.wildPokemon[row].maxLevel)
this->monInfo.wildPokemon[row].maxLevel = minLevel;
break; break;
}
case ColumnType::MaxLevel: case ColumnType::MaxLevel: {
this->monInfo.wildPokemon[row].maxLevel = value.toInt(); int maxLevel = value.toInt();
this->monInfo.wildPokemon[row].maxLevel = maxLevel;
if (maxLevel < this->monInfo.wildPokemon[row].minLevel)
this->monInfo.wildPokemon[row].minLevel = maxLevel;
break; break;
}
case ColumnType::EncounterRate: case ColumnType::EncounterRate:
this->monInfo.encounterRate = value.toInt(); this->monInfo.encounterRate = value.toInt();