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

Rewrite heal location data reading

Browse Source
This commit is contained in:
GriffinR
2022-09-09 17:41:50 -04:00
committed by Marcus Huderle
parent 551a771798
commit 43d0dc1e7b
5 changed files with 103 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/events.h
View File

@@ -626,15 +626,15 @@ public:
void setRespawnMap(QString newRespawnMap) { this->respawnMap = newRespawnMap; }
QString getRespawnMap() { return this->respawnMap; }
void setRespawnNPC(uint16_t newRespawnNPC) { this->respawnNPC = newRespawnNPC; }
uint16_t getRespawnNPC() { return this->respawnNPC; }
void setRespawnNPC(uint8_t newRespawnNPC) { this->respawnNPC = newRespawnNPC; }
uint8_t getRespawnNPC() { return this->respawnNPC; }
private:
int index = -1;
QString locationName;
QString idName;
QString respawnMap;
uint16_t respawnNPC = 0;
uint8_t respawnNPC = 0;
};

8
include/core/heallocation.h
View File

@@ -11,17 +11,17 @@ class HealLocation {
public:
HealLocation()=default;
HealLocation(QString, QString, int, uint16_t, uint16_t, QString = "", uint16_t = 0);
HealLocation(QString, QString, int, int16_t, int16_t, QString = "", uint8_t = 0);
friend QDebug operator<<(QDebug debug, const HealLocation &hl);
public:
QString idName;
QString mapName;
int index;
uint16_t x;
uint16_t y;
int16_t x;
int16_t y;
QString respawnMap;
uint16_t respawnNPC;
uint8_t respawnNPC;
static HealLocation fromEvent(Event *);
};

4
include/project.h
View File

@@ -49,6 +49,7 @@ public:
QStringList mapNames;
QMap<QString, QVariant> miscConstants;
QList<HealLocation> healLocations;
QMap<QString, int> healLocationNameToValue;
QMap<QString, QString> mapConstantsToMapNames;
QMap<QString, QString> mapNamesToMapConstants;
QStringList mapLayoutsTable;
@@ -97,7 +98,7 @@ public:
bool isConst;
};
DataQualifiers getDataQualifiers(QString, QString);
QMap<QString, DataQualifiers> dataQualifiers;
DataQualifiers healLocationDataQualifiers;
QMap<QString, Map*> mapCache;
Map* loadMap(QString);
@@ -187,6 +188,7 @@ public:
bool readBgEventFacingDirections();
bool readTrainerTypes();
bool readMetatileBehaviors();
bool readHealLocationConstants();
bool readHealLocations();
bool readMiscellaneousConstants();
bool readEventScriptLabels();