Fix issues when user supplies incorrect number of encounters
This commit is contained in:
parent
6ee76f80d1
commit
49cb69f2b8
3 changed files with 7 additions and 2 deletions
|
@ -30,6 +30,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
|
||||||
- Fix the selection outline sticking in single-tile mode on the Prefab tab.
|
- Fix the selection outline sticking in single-tile mode on the Prefab tab.
|
||||||
- Fix heal location data being cleared if certain spaces aren't used in the table.
|
- Fix heal location data being cleared if certain spaces aren't used in the table.
|
||||||
- Fix bad URL color contrast on dark themes.
|
- Fix bad URL color contrast on dark themes.
|
||||||
|
- Fix some issues when too few/many pokémon are specified for a wild encounter group.
|
||||||
|
|
||||||
## [5.1.1] - 2023-02-20
|
## [5.1.1] - 2023-02-20
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -1670,6 +1670,11 @@ bool Project::readWildMonData() {
|
||||||
newMon.species = monObj["species"].string_value();
|
newMon.species = monObj["species"].string_value();
|
||||||
header.wildMons[field].wildPokemon.append(newMon);
|
header.wildMons[field].wildPokemon.append(newMon);
|
||||||
}
|
}
|
||||||
|
// If the user supplied too few pokémon for this group then we fill in the rest.
|
||||||
|
for (int i = header.wildMons[field].wildPokemon.length(); i < monField.encounterRates.length(); i++) {
|
||||||
|
WildPokemon newMon; // Keep default values
|
||||||
|
header.wildMons[field].wildPokemon.append(newMon);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wildMonData[mapConstant].insert({encounterObj["base_label"].string_value(), header});
|
wildMonData[mapConstant].insert({encounterObj["base_label"].string_value(), header});
|
||||||
|
|
|
@ -10,11 +10,10 @@ EncounterTableModel::EncounterTableModel(WildMonInfo info, EncounterFields field
|
||||||
|
|
||||||
this->resize(this->monInfo.wildPokemon.size(), ColumnType::Count);
|
this->resize(this->monInfo.wildPokemon.size(), ColumnType::Count);
|
||||||
|
|
||||||
this->slotRatios = fields[fieldIndex].encounterRates;
|
|
||||||
|
|
||||||
for (int r = 0; r < this->numRows; r++) {
|
for (int r = 0; r < this->numRows; r++) {
|
||||||
this->groupNames.append(QString());
|
this->groupNames.append(QString());
|
||||||
this->slotPercentages.append(0.0);
|
this->slotPercentages.append(0.0);
|
||||||
|
this->slotRatios.append(fields[fieldIndex].encounterRates.value(r, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this->encounterFields[this->fieldIndex].groups.empty()) {
|
if (!this->encounterFields[this->fieldIndex].groups.empty()) {
|
||||||
|
|
Loading…
Reference in a new issue