Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-19 23:25:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

add json saving to wild encounter editor

Browse Source
This commit is contained in:
garak
2019-06-20 12:40:36 -04:00
parent 4b0e0b0bff
commit 5a62df9f55
8 changed files with 309 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/editor.h
View File

@@ -43,6 +43,8 @@ public:
void redo();
void closeProject();
bool setMap(QString map_name);
void saveUiFields();
void saveEncounterTabData();
void displayMap();
void displayMetatileSelector();
void displayMapMetatiles();
@@ -71,6 +73,7 @@ public:
void setConnectionMap(QString mapName);
void addNewConnection();
void removeCurrentConnection();
void addNewWildMonGroup();
void updateDiveMap(QString mapName);
void updateEmergeMap(QString mapName);
void setSelectedConnectionFromMap(QString mapName);
@@ -78,6 +81,7 @@ public:
void updateSecondaryTileset(QString tilesetLabel, bool forceLoad = false);
void toggleBorderVisibility(bool visible);
void updateCustomMapHeaderValues(QTableWidget *);
void configureEncounterJSON();
Tileset *getCurrentMapPrimaryTileset();
DraggablePixmapItem *addMapEvent(Event *event);

2
include/mainwindow.h
View File

@@ -145,6 +145,8 @@ private slots:
void on_pushButton_DeleteCustomHeaderField_clicked();
void on_tableWidget_CustomHeaderFields_cellChanged(int row, int column);
void on_horizontalSlider_MetatileZoom_valueChanged(int value);
void on_pushButton_NewWildMonGroup_clicked();
void on_pushButton_ConfigureEncountersJSON_clicked();
void on_actionRegion_Map_Editor_triggered();

4
include/project.h
View File

@@ -87,8 +87,8 @@ public:
QString readMapLocation(QString map_name);
void readWildMonData();
QMap<QString, WildPokemonHeader> wildMonData;// "MAP_CONSTANT": wild_encounter_json
QMap<QString, QString> encounterMapToBaseLabel;
QMap<QString, QMap<QString, WildPokemonHeader>> wildMonData;// "MAP_CONSTANT": {base_label: wild_encounter_json
QMap<QString, QString> encounterMapToBaseLabel;// delete this?
// when saving, preserve the extra fields for gBattlePyramidWildMonHeaders, gBattlePikeWildMonHeaders
void readSpeciesIconPaths();
QMap<QString, QString> speciesToIconPath;