Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set reasonable defaults for wild encounter rates #573

Merged
merged 1 commit into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/core/wildmoninfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ struct EncounterField {

typedef QVector<EncounterField> EncounterFields;

void setDefaultEncounterRate(QString fieldName, int rate);
WildMonInfo getDefaultMonInfo(EncounterField field);
void combineEncounters(WildMonInfo &to, WildMonInfo from);

Expand Down
7 changes: 5 additions & 2 deletions src/core/wildmoninfo.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
#include "wildmoninfo.h"
#include "montabwidget.h"


QMap<QString, int> defaultEncounterRates;
void setDefaultEncounterRate(QString fieldName, int rate) {
defaultEncounterRates[fieldName] = rate;
}

WildMonInfo getDefaultMonInfo(EncounterField field) {
WildMonInfo newInfo;
newInfo.active = true;
newInfo.encounterRate = 0;
newInfo.encounterRate = defaultEncounterRates.value(field.name, 1);

int size = field.encounterRates.size();
while (size--)
Expand Down
22 changes: 22 additions & 0 deletions src/project.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1625,6 +1625,10 @@ bool Project::readWildMonData() {
return true;
}

// For each encounter type, count the number of times each encounter rate value occurs.
// The most common value will be used as the default for new groups.
QMap<QString, QMap<int, int>> encounterRateFrequencyMaps;

for (OrderedJson subObjectRef : wildMonObj["wild_encounter_groups"].array_items()) {
OrderedJson::object subObject = subObjectRef.object_items();
if (!subObject["for_maps"].bool_value()) {
Expand All @@ -1650,6 +1654,7 @@ bool Project::readWildMonData() {
encounterField.groups[group].append(slotNum.int_value());
}
}
encounterRateFrequencyMaps.insert(encounterField.name, QMap<int, int>());
wildMonFields.append(encounterField);
}

Expand All @@ -1666,6 +1671,7 @@ bool Project::readWildMonData() {
OrderedJson::object encounterFieldObj = encounterObj[field].object_items();
header.wildMons[field].active = true;
header.wildMons[field].encounterRate = encounterFieldObj["encounter_rate"].int_value();
encounterRateFrequencyMaps[field][header.wildMons[field].encounterRate]++;
for (auto mon : encounterFieldObj["mons"].array_items()) {
WildPokemon newMon;
OrderedJson::object monObj = mon.object_items();
Expand All @@ -1686,6 +1692,22 @@ bool Project::readWildMonData() {
}
}

// For each encounter type, set default encounter rate to most common value.
// Iterate over map of encounter type names to frequency maps...
for (auto i = encounterRateFrequencyMaps.cbegin(), i_end = encounterRateFrequencyMaps.cend(); i != i_end; i++) {
int frequency = 0;
int rate = 1;
const QMap<int, int> frequencyMap = i.value();
// Iterate over frequency map (encounter rate to number of occurrences)...
for (auto j = frequencyMap.cbegin(), j_end = frequencyMap.cend(); j != j_end; j++) {
if (j.value() > frequency) {
frequency = j.value();
rate = j.key();
}
}
setDefaultEncounterRate(i.key(), rate);
}

return true;
}

Expand Down
Loading