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

Clean up new map dialog redesign

Browse Source
This commit is contained in:
GriffinR
2024-11-12 14:50:44 -05:00
parent 4f8224359e
commit 7d7db3857d
8 changed files with 93 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/config.h
View File

@@ -187,6 +187,7 @@ enum ProjectIdentifier {
symbol_spawn_npcs,
symbol_attribute_table,
symbol_tilesets_prefix,
symbol_dynamic_map_name,
define_obj_event_count,
define_min_level,
define_max_level,
@@ -323,7 +324,7 @@ public:
QString getCustomFilePath(ProjectFilePath pathId);
QString getCustomFilePath(const QString &pathId);
QString getFilePath(ProjectFilePath pathId);
void setIdentifier(ProjectIdentifier id, const QString &text);
void setIdentifier(ProjectIdentifier id, QString text);
void setIdentifier(const QString &id, const QString &text);
QString getCustomIdentifier(ProjectIdentifier id);
QString getCustomIdentifier(const QString &id);

10
include/project.h
View File

@@ -18,10 +18,6 @@
#include <QVariant>
#include <QFileSystemWatcher>
// TODO: Expose to config
// The displayed name of the special map value used by warps with multiple potential destinations
static QString DYNAMIC_MAP_NAME = "Dynamic";
class Project : public QObject
{
Q_OBJECT
@@ -80,6 +76,7 @@ public:
QMap<QString, qint64> modifiedFileTimestamps;
bool usingAsmTilesets;
QSet<QString> disabledSettingsNames;
QSet<QString> topLevelMapFields;
int pokemonMinLevel;
int pokemonMaxLevel;
int maxEncounterRate;
@@ -145,7 +142,7 @@ public:
bool hasUnsavedChanges();
bool hasUnsavedDataChanges = false;
QSet<QString> getTopLevelMapFields();
void initTopLevelMapFields();
bool readMapJson(const QString &mapName, QJsonDocument * out);
bool loadMapData(Map*);
bool readMapLayouts();
@@ -219,7 +216,6 @@ public:
QString getDefaultPrimaryTilesetLabel();
QString getDefaultSecondaryTilesetLabel();
QString getDynamicMapDefineName();
void updateTilesetMetatileLabels(Tileset *tileset);
QString buildMetatileLabelsText(const QMap<QString, uint16_t> defines);
QString findMetatileLabelsTileset(QString label);
@@ -227,6 +223,8 @@ public:
static QString getExistingFilepath(QString filepath);
void applyParsedLimits();
static QString getDynamicMapDefineName();
static QString getDynamicMapName();
static int getNumTilesPrimary();
static int getNumTilesTotal();
static int getNumMetatilesPrimary();