atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix heal loc duplicates, rename flyableMaps

Browse source
This commit is contained in:
GriffinR 2020-04-29 12:34:49 -04:00 committed by huderlem
parent 37ab54019b
commit 399474c1f2
3 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/project.h
View file

@ -37,7 +37,7 @@ public:
QList<QStringList> groupedMapNames; QList<QStringList> groupedMapNames;
QStringList *mapNames = nullptr; QStringList *mapNames = nullptr;
QMap<QString, QVariant> miscConstants; QMap<QString, QVariant> miscConstants;
QList<HealLocation> flyableMaps; QList<HealLocation> healLocations;
QMap<QString, QString>* mapConstantsToMapNames; QMap<QString, QString>* mapConstantsToMapNames;
QMap<QString, QString>* mapNamesToMapConstants; QMap<QString, QString>* mapNamesToMapConstants;
QList<QString> mapLayoutsTable; QList<QString> mapLayoutsTable;

4
src/editor.cpp
View file

@ -1845,8 +1845,8 @@ DraggablePixmapItem* Editor::addNewEvent(QString event_type) {
event->put("map_name", map->name); event->put("map_name", map->name);
if (event_type == "event_heal_location") { if (event_type == "event_heal_location") {
HealLocation hl = HealLocation::fromEvent(event); HealLocation hl = HealLocation::fromEvent(event);
project->flyableMaps.append(hl); project->healLocations.append(hl);
event->put("index", project->flyableMaps.length()); event->put("index", project->healLocations.length());
} }
map->addEvent(event); map->addEvent(event);
project->loadEventPixmaps(map->getAllEvents()); project->loadEventPixmaps(map->getAllEvents());

41
src/project.cpp
View file

@ -341,7 +341,7 @@ bool Project::loadMapData(Map* map) {
} }
map->events["heal_event_group"].clear(); map->events["heal_event_group"].clear();
for (auto it = flyableMaps.begin(); it != flyableMaps.end(); it++) { for (auto it = healLocations.begin(); it != healLocations.end(); it++) {
HealLocation loc = *it; HealLocation loc = *it;
@ -917,33 +917,34 @@ void Project::saveHealLocationStruct(Map *map) {
QString constants_text = QString("#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H\n"); QString constants_text = QString("#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H\n");
constants_text += QString("#define GUARD_CONSTANTS_HEAL_LOCATIONS_H\n\n"); constants_text += QString("#define GUARD_CONSTANTS_HEAL_LOCATIONS_H\n\n");
QMap<QString, int> flyableMapsDupes; QMap<QString, int> healLocationsDupes;
QSet<QString> flyableMapsUnique; QSet<QString> healLocationsUnique;
// set flyableMapsDupes and flyableMapsUnique // set healLocationsDupes and healLocationsUnique
for (auto it = flyableMaps.begin(); it != flyableMaps.end(); it++) { for (auto it = healLocations.begin(); it != healLocations.end(); it++) {
HealLocation loc = *it; HealLocation loc = *it;
QString xname = loc.idName; QString xname = loc.idName;
if (flyableMapsUnique.contains(xname)) { if (healLocationsUnique.contains(xname)) {
flyableMapsDupes[xname] = 1; healLocationsDupes[xname] = 1;
} }
flyableMapsUnique.insert(xname); healLocationsUnique.insert(xname);
} }
// set new location in flyableMapsList // set new location in healLocations list
if (map->events["heal_event_group"].length() > 0) { if (map->events["heal_event_group"].length() > 0) {
for (Event *healEvent : map->events["heal_event_group"]) { for (Event *healEvent : map->events["heal_event_group"]) {
HealLocation hl = HealLocation::fromEvent(healEvent); HealLocation hl = HealLocation::fromEvent(healEvent);
flyableMaps[hl.index - 1] = hl; healLocations[hl.index - 1] = hl;
} }
} }
int i = 1; int i = 1;
for (auto map_in : flyableMaps) { for (auto map_in : healLocations) {
// add numbered suffix for duplicate constants // add numbered suffix for duplicate constants
if (flyableMapsDupes.keys().contains(map_in.idName)) { if (healLocationsDupes.keys().contains(map_in.idName)) {
map_in.idName += QString("_%1").arg(flyableMapsDupes[map_in.idName]); QString duplicateName = map_in.idName;
flyableMapsDupes[map_in.idName]++; map_in.idName += QString("_%1").arg(healLocationsDupes[duplicateName]);
healLocationsDupes[duplicateName]++;
} }
// Save first array (heal location coords), only data array in RSE // Save first array (heal location coords), only data array in RSE
@ -973,7 +974,7 @@ void Project::saveHealLocationStruct(Map *map) {
data_text += QString("};\n\n%1%2u16 sWhiteoutRespawnHealCenterMapIdxs[][2] =\n{\n") data_text += QString("};\n\n%1%2u16 sWhiteoutRespawnHealCenterMapIdxs[][2] =\n{\n")
.arg(dataQualifiers.value("heal_locations").isStatic ? "static " : "") .arg(dataQualifiers.value("heal_locations").isStatic ? "static " : "")
.arg(dataQualifiers.value("heal_locations").isConst ? "const " : ""); .arg(dataQualifiers.value("heal_locations").isConst ? "const " : "");
for (auto map_in : flyableMaps) { for (auto map_in : healLocations) {
data_text += QString(" [%1%2 - 1] = {MAP_GROUP(%3), MAP_NUM(%3)},\n") data_text += QString(" [%1%2 - 1] = {MAP_GROUP(%3), MAP_NUM(%3)},\n")
.arg(constantPrefix) .arg(constantPrefix)
.arg(map_in.idName) .arg(map_in.idName)
@ -984,7 +985,7 @@ void Project::saveHealLocationStruct(Map *map) {
data_text += QString("};\n\n%1%2u8 sWhiteoutRespawnHealerNpcIds[] =\n{\n") data_text += QString("};\n\n%1%2u8 sWhiteoutRespawnHealerNpcIds[] =\n{\n")
.arg(dataQualifiers.value("heal_locations").isStatic ? "static " : "") .arg(dataQualifiers.value("heal_locations").isStatic ? "static " : "")
.arg(dataQualifiers.value("heal_locations").isConst ? "const " : ""); .arg(dataQualifiers.value("heal_locations").isConst ? "const " : "");
for (auto map_in : flyableMaps) { for (auto map_in : healLocations) {
data_text += QString(" [%1%2 - 1] = %3,\n") data_text += QString(" [%1%2 - 1] = %3,\n")
.arg(constantPrefix) .arg(constantPrefix)
.arg(map_in.idName) .arg(map_in.idName)
@ -2117,7 +2118,7 @@ bool Project::readRegionMapSections() {
bool Project::readHealLocations() { bool Project::readHealLocations() {
dataQualifiers.clear(); dataQualifiers.clear();
flyableMaps.clear(); healLocations.clear();
QString filename = "src/data/heal_locations.h"; QString filename = "src/data/heal_locations.h";
fileWatcher.addPath(root + "/" + filename); fileWatcher.addPath(root + "/" + filename);
QString text = parser.readTextFile(root + "/" + filename); QString text = parser.readTextFile(root + "/" + filename);
@ -2144,7 +2145,7 @@ bool Project::readHealLocations() {
unsigned x = spawn.captured("x").toUShort(); unsigned x = spawn.captured("x").toUShort();
unsigned y = spawn.captured("y").toUShort(); unsigned y = spawn.captured("y").toUShort();
unsigned npc = respawnNPC.captured("npc").toUShort(); unsigned npc = respawnNPC.captured("npc").toUShort();
flyableMaps.append(HealLocation(idName, mapName, i, x, y, respawnMapName, npc)); healLocations.append(HealLocation(idName, mapName, i, x, y, respawnMapName, npc));
} }
} else { } else {
dataQualifiers.insert("heal_locations", getDataQualifiers(text, "sHealLocations")); dataQualifiers.insert("heal_locations", getDataQualifiers(text, "sHealLocations"));
@ -2157,7 +2158,7 @@ bool Project::readHealLocations() {
QString mapName = match.captured("map"); QString mapName = match.captured("map");
unsigned x = match.captured("x").toUShort(); unsigned x = match.captured("x").toUShort();
unsigned y = match.captured("y").toUShort(); unsigned y = match.captured("y").toUShort();
flyableMaps.append(HealLocation(idName, mapName, i, x, y)); healLocations.append(HealLocation(idName, mapName, i, x, y));
} }
} }
return true; return true;
@ -2494,7 +2495,7 @@ void Project::saveMapHealEvents(Map *map) {
if (map->events["heal_event_group"].length() > 0) { if (map->events["heal_event_group"].length() > 0) {
for (Event *healEvent : map->events["heal_event_group"]) { for (Event *healEvent : map->events["heal_event_group"]) {
HealLocation hl = HealLocation::fromEvent(healEvent); HealLocation hl = HealLocation::fromEvent(healEvent);
flyableMaps[hl.index - 1] = hl; healLocations[hl.index - 1] = hl;
} }
} }
saveHealLocationStruct(map); saveHealLocationStruct(map);