clean wild encounter code

include/core/wildmoninfo.h

@@ -10,14 +10,11 @@ struct WildPokemon {
 };
 
 struct WildMonInfo {
-    //
     bool active = false;
     int encounterRate = 0;
     QVector<WildPokemon> wildPokemon;
 };
 
-// for extensibility, make a QVector<WildMonInfo>
-// or QMap<QString, WildMonInfo>
 struct WildPokemonHeader {
     QMap<QString, WildMonInfo> wildMons;
 };
@@ -25,14 +22,6 @@ struct WildPokemonHeader {
 typedef QVector<QPair<QString, QVector<int>>> Fields;
 typedef QPair<QString, QVector<int>> Field;
 
-//class Project;
-//class MonTabWidget;
-//QWidget *newSpeciesTableEntry(Project *project, WildPokemon mon, int index);
-//void createSpeciesTableRow(Project *, QTableWidget *, WildPokemon, int, QString);
-void clearTabWidget(QLayout *tab);
-//void clearTable(QTableWidget *table);
-//void populateWildMonTabWidget(MonTabWidget *tabWidget, Fields /* QVector<QPair<QString, QVector<int>>> */ fields);
-
 WildMonInfo getDefaultMonInfo(Field field);
 WildMonInfo copyMonInfoFromTab(QTableWidget *table, Field field);
 

include/editor.h

@@ -64,7 +64,6 @@ public:
     void setEditingCollision();
     void setEditingObjects();
     void setEditingConnections();
-    void setEditingWildMons();
     void clearWildMonTabWidgets();
     void setCurrentConnectionDirection(QString curDirection);
     void updateCurrentConnectionDirection(QString curDirection);

include/project.h

@@ -87,16 +87,13 @@ public:
     QString readMapLocation(QString map_name);
 
     void readWildMonData();
-    QMap<QString, QMap<QString, WildPokemonHeader>> wildMonData;// "MAP_CONSTANT": {base_label: wild_encounter_json
-    QMap<QString, QString> encounterMapToBaseLabel;// delete this?
+    QMap<QString, QMap<QString, WildPokemonHeader>> wildMonData;
+    QVector<QPair<QString, QVector<int>>> wildMonFields;
     QVector<QString> encounterGroupLabels;
-    // when saving, preserve the extra fields for gBattlePyramidWildMonHeaders, gBattlePikeWildMonHeaders
+    QMap<QString, QJsonObject> extraEncounterGroups;
+
     void readSpeciesIconPaths();
     QMap<QString, QString> speciesToIconPath;
-    //QVector<QString> wildMonFields;
-    QVector<QPair<QString, QVector<int>>> wildMonFields;
-    // temporary?
-    QMap<QString, QJsonObject> extraEncounterGroups;
 
     QMap<QString, bool> getTopLevelMapFields();
     bool loadMapData(Map*);

include/ui/montabwidget.h

@@ -1,5 +1,3 @@
-// montablewidget.h
-
 #ifndef MONTABWIDGET_H
 #define MONTABWIDGET_H
 
@@ -8,7 +6,6 @@
 #include <QtWidgets>
 #include <QVector>
 
-//
 class Project;
 
 class MonTabWidget : public QTabWidget {
@@ -28,7 +25,6 @@ public:
     void clearTableAt(int index);
 
     QTableWidget *tableAt(int tabIndex);
-    //void setupTableAt(int tabIndex);
 
 public slots:
     void setTabActive(int index, bool active = true);
@@ -40,12 +36,6 @@ private:
     QVector<bool> activeTabs;
 
     Project *project;
-
-private slots:
-    //
-
-signals:
-    // right click
 };
 
 #endif // MONTABWIDGET_H