Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 15:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup and define all unknowns in zone reading (#826)

Browse Source 
* cleanup and define all unknowns in zone reading
fix for movement path config reading

* simplify reading and don't use intermediates

* fix spelling

* remove dup variable in struct
read to the proper name that relates to the enum
This commit is contained in:
Aaron Kimbrell 2022-11-12 08:44:03 -06:00 committed by GitHub
parent 1eff3ae454
commit cf7fa8e52d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
dZoneManager/Zone.cpp
View File

@ -98,15 +98,12 @@ void Zone::LoadZoneIntoMemory() {
if (m_ZoneFileFormatVersion >= Zone::ZoneFileFormatVersion::EarlyAlpha) { if (m_ZoneFileFormatVersion >= Zone::ZoneFileFormatVersion::EarlyAlpha) {
BinaryIO::BinaryRead(file, m_PathDataLength); BinaryIO::BinaryRead(file, m_PathDataLength);
uint32_t unknown; BinaryIO::BinaryRead(file, m_PathChunkVersion); // always should be 1
uint32_t pathCount;
BinaryIO::BinaryRead(file, unknown); uint32_t pathCount;
BinaryIO::BinaryRead(file, pathCount); BinaryIO::BinaryRead(file, pathCount);
for (uint32_t i = 0; i < pathCount; ++i) { for (uint32_t i = 0; i < pathCount; ++i) LoadPath(file);
LoadPath(file);
}
for (Path path : m_Paths) { for (Path path : m_Paths) {
if (path.pathType == PathType::Spawner) { if (path.pathType == PathType::Spawner) {
@ -251,15 +248,6 @@ void Zone::LoadScene(std::istream& file) {
scene.name = BinaryIO::ReadString(file, sceneNameLength); scene.name = BinaryIO::ReadString(file, sceneNameLength);
file.ignore(3); file.ignore(3);
/*
if (m_Scenes.find(scene.id) != m_Scenes.end()) {
//Extract the layer id from the filename (bad I know, but it's reliable at least):
std::string layer = scene.filename.substr(scene.filename.rfind('x') + 1);
layer = layer.substr(0, layer.find('_'));
lwoSceneID.SetLayerID(std::atoi(layer.c_str()));
}
*/
lwoSceneID.SetLayerID(scene.sceneType); lwoSceneID.SetLayerID(scene.sceneType);
m_Scenes.insert(std::make_pair(lwoSceneID, scene)); m_Scenes.insert(std::make_pair(lwoSceneID, scene));
@ -377,14 +365,10 @@ SceneTransitionInfo Zone::LoadSceneTransitionInfo(std::istream& file) {
} }
void Zone::LoadPath(std::istream& file) { void Zone::LoadPath(std::istream& file) {
// Currently only spawner (type 4) paths are supported
Path path = Path(); Path path = Path();
uint32_t unknown1;
uint32_t pathType;
uint32_t pathBehavior;
BinaryIO::BinaryRead(file, path.pathVersion); BinaryIO::BinaryRead(file, path.pathVersion);
uint8_t stringLength; uint8_t stringLength;
BinaryIO::BinaryRead(file, stringLength); BinaryIO::BinaryRead(file, stringLength);
for (uint8_t i = 0; i < stringLength; ++i) { for (uint8_t i = 0; i < stringLength; ++i) {
@ -392,16 +376,14 @@ void Zone::LoadPath(std::istream& file) {
BinaryIO::BinaryRead(file, character); BinaryIO::BinaryRead(file, character);
path.pathName.push_back(character); path.pathName.push_back(character);
} }
BinaryIO::BinaryRead(file, pathType);
path.pathType = PathType(pathType); BinaryIO::BinaryRead(file, path.pathType);
BinaryIO::BinaryRead(file, unknown1); BinaryIO::BinaryRead(file, path.flags);
BinaryIO::BinaryRead(file, pathBehavior); BinaryIO::BinaryRead(file, path.pathBehavior);
path.pathType = PathType(pathType);
if (path.pathType == PathType::MovingPlatform) { if (path.pathType == PathType::MovingPlatform) {
if (path.pathVersion >= 18) { if (path.pathVersion >= 18) {
uint8_t unknown; BinaryIO::BinaryRead(file, path.movingPlatform.timeBasedMovement);
BinaryIO::BinaryRead(file, unknown);
} else if (path.pathVersion >= 13) { } else if (path.pathVersion >= 13) {
uint8_t count; uint8_t count;
BinaryIO::BinaryRead(file, count); BinaryIO::BinaryRead(file, count);
@ -412,10 +394,9 @@ void Zone::LoadPath(std::istream& file) {
} }
} }
} else if (path.pathType == PathType::Property) { } else if (path.pathType == PathType::Property) {
int32_t unknown; BinaryIO::BinaryRead(file, path.property.pathType);
BinaryIO::BinaryRead(file, unknown);
BinaryIO::BinaryRead(file, path.property.price); BinaryIO::BinaryRead(file, path.property.price);
BinaryIO::BinaryRead(file, path.property.rentalTime); BinaryIO::BinaryRead(file, path.property.rentalTimeUnit);
BinaryIO::BinaryRead(file, path.property.associatedZone); BinaryIO::BinaryRead(file, path.property.associatedZone);
if (path.pathVersion >= 5) { if (path.pathVersion >= 5) {
@ -435,10 +416,7 @@ void Zone::LoadPath(std::istream& file) {
} }
} }
if (path.pathVersion >= 6) { if (path.pathVersion >= 6) BinaryIO::BinaryRead(file, path.property.type);
int32_t unknown1;
BinaryIO::BinaryRead(file, unknown1);
}
if (path.pathVersion >= 7) { if (path.pathVersion >= 7) {
BinaryIO::BinaryRead(file, path.property.cloneLimit); BinaryIO::BinaryRead(file, path.property.cloneLimit);
@ -462,11 +440,10 @@ void Zone::LoadPath(std::istream& file) {
path.camera.nextPath.push_back(character); path.camera.nextPath.push_back(character);
} }
if (path.pathVersion >= 14) { if (path.pathVersion >= 14) {
uint8_t unknown; BinaryIO::BinaryRead(file, path.camera.rotatePlayer);
BinaryIO::BinaryRead(file, unknown);
} }
} else if (path.pathType == PathType::Spawner) { } else if (path.pathType == PathType::Spawner) {
//SpawnerPath* path = static_cast<SpawnerPath*>(path); // Convert to a spawner path
BinaryIO::BinaryRead(file, path.spawner.spawnedLOT); BinaryIO::BinaryRead(file, path.spawner.spawnedLOT);
BinaryIO::BinaryRead(file, path.spawner.respawnTime); BinaryIO::BinaryRead(file, path.spawner.respawnTime);
BinaryIO::BinaryRead(file, path.spawner.maxToSpawn); BinaryIO::BinaryRead(file, path.spawner.maxToSpawn);
@ -487,7 +464,7 @@ void Zone::LoadPath(std::istream& file) {
BinaryIO::BinaryRead(file, waypoint.position.z); BinaryIO::BinaryRead(file, waypoint.position.z);
if (path.pathType == PathType::Spawner || path.pathType == PathType::MovingPlatform || path.pathType == PathType::Race) { if (path.pathType == PathType::Spawner || path.pathType == PathType::MovingPlatform || path.pathType == PathType::Race || path.pathType == PathType::Camera || path.pathType == PathType::Rail) {
BinaryIO::BinaryRead(file, waypoint.rotation.w); BinaryIO::BinaryRead(file, waypoint.rotation.w);
BinaryIO::BinaryRead(file, waypoint.rotation.x); BinaryIO::BinaryRead(file, waypoint.rotation.x);
BinaryIO::BinaryRead(file, waypoint.rotation.y); BinaryIO::BinaryRead(file, waypoint.rotation.y);
@ -515,33 +492,17 @@ void Zone::LoadPath(std::istream& file) {
} }
} }
} else if (path.pathType == PathType::Camera) { } else if (path.pathType == PathType::Camera) {
float unknown;
BinaryIO::BinaryRead(file, unknown);
BinaryIO::BinaryRead(file, unknown);
BinaryIO::BinaryRead(file, unknown);
BinaryIO::BinaryRead(file, unknown);
BinaryIO::BinaryRead(file, waypoint.camera.time); BinaryIO::BinaryRead(file, waypoint.camera.time);
BinaryIO::BinaryRead(file, unknown); BinaryIO::BinaryRead(file, waypoint.camera.fov);
BinaryIO::BinaryRead(file, waypoint.camera.tension); BinaryIO::BinaryRead(file, waypoint.camera.tension);
BinaryIO::BinaryRead(file, waypoint.camera.continuity); BinaryIO::BinaryRead(file, waypoint.camera.continuity);
BinaryIO::BinaryRead(file, waypoint.camera.bias); BinaryIO::BinaryRead(file, waypoint.camera.bias);
} else if (path.pathType == PathType::Race) { } else if (path.pathType == PathType::Race) {
uint8_t unknown; BinaryIO::BinaryRead(file, waypoint.racing.isResetNode);
BinaryIO::BinaryRead(file, unknown); BinaryIO::BinaryRead(file, waypoint.racing.isNonHorizontalCamera);
BinaryIO::BinaryRead(file, unknown); BinaryIO::BinaryRead(file, waypoint.racing.planeWidth);
float unknown1; BinaryIO::BinaryRead(file, waypoint.racing.planeHeight);
BinaryIO::BinaryRead(file, unknown1); BinaryIO::BinaryRead(file, waypoint.racing.shortestDistanceToEnd);
BinaryIO::BinaryRead(file, unknown1);
BinaryIO::BinaryRead(file, unknown1);
} else if (path.pathType == PathType::Rail) {
float unknown;
BinaryIO::BinaryRead(file, unknown);
BinaryIO::BinaryRead(file, unknown);
BinaryIO::BinaryRead(file, unknown);
BinaryIO::BinaryRead(file, unknown);
if (path.pathVersion >= 17) {
BinaryIO::BinaryRead(file, unknown);
}
} }
// object LDF configs // object LDF configs
@ -565,8 +526,14 @@ void Zone::LoadPath(std::istream& file) {
BinaryIO::BinaryRead(file, character); BinaryIO::BinaryRead(file, character);
value.push_back(character); value.push_back(character);
} }
LDFBaseData* ldfConfig = LDFBaseData::DataFromString(parameter + "=" + value);
waypoint.config.push_back(ldfConfig); LDFBaseData* ldfConfig = nullptr;
if (path.pathType == PathType::Movement) {
ldfConfig = LDFBaseData::DataFromString(parameter + "=0:" + value);
} else {
ldfConfig = LDFBaseData::DataFromString(parameter + "=" + value);
}
if (ldfConfig) waypoint.config.push_back(ldfConfig);
} }
} }

43
dZoneManager/Zone.h
View File

@ -59,16 +59,32 @@ struct MovingPlatformPathWaypoint {
struct CameraPathWaypoint { struct CameraPathWaypoint {
float time; float time;
float fov;
float tension; float tension;
float continuity; float continuity;
float bias; float bias;
}; };
struct RacingPathWaypoint {
uint8_t isResetNode;
uint8_t isNonHorizontalCamera;
float planeWidth;
float planeHeight;
float shortestDistanceToEnd;
};
struct RailPathWaypoint {
float speed;
std::vector<LDFBaseData*> config;
};
struct PathWaypoint { struct PathWaypoint {
NiPoint3 position; NiPoint3 position;
NiQuaternion rotation; // not included in all, but it's more convenient here NiQuaternion rotation; // not included in all, but it's more convenient here
MovingPlatformPathWaypoint movingPlatform; MovingPlatformPathWaypoint movingPlatform;
CameraPathWaypoint camera; CameraPathWaypoint camera;
RacingPathWaypoint racing;
RailPathWaypoint rail;
std::vector<LDFBaseData*> config; std::vector<LDFBaseData*> config;
}; };
@ -89,6 +105,19 @@ enum class PathBehavior : uint32_t {
Once = 2 Once = 2
}; };
enum class PropertyPathType : int32_t {
Path = 0,
EntireZone = 1,
GenetatedRectangle = 2
};
enum class PropertyType : int32_t{
Premiere = 0,
Prize = 1,
LUP = 2,
Headspace = 3
};
enum class PropertyRentalTimeUnit : int32_t { enum class PropertyRentalTimeUnit : int32_t {
Forever = 0, Forever = 0,
Seconds = 1, Seconds = 1,
@ -116,17 +145,19 @@ enum class PropertyAchievmentRequired : int32_t {
struct MovingPlatformPath { struct MovingPlatformPath {
std::string platformTravelSound; std::string platformTravelSound;
uint8_t timeBasedMovement;
}; };
struct PropertyPath { struct PropertyPath {
PropertyPathType pathType;
int32_t price; int32_t price;
int32_t rentalTime; PropertyRentalTimeUnit rentalTimeUnit;
uint64_t associatedZone; uint64_t associatedZone;
std::string displayName; std::string displayName;
std::string displayDesc; std::string displayDesc;
PropertyType type;
int32_t cloneLimit; int32_t cloneLimit;
float repMultiplier; float repMultiplier;
PropertyRentalTimeUnit rentalTimeUnit;
PropertyAchievmentRequired achievementRequired; PropertyAchievmentRequired achievementRequired;
NiPoint3 playerZoneCoords; NiPoint3 playerZoneCoords;
float maxBuildHeight; float maxBuildHeight;
@ -134,6 +165,7 @@ struct PropertyPath {
struct CameraPath { struct CameraPath {
std::string nextPath; std::string nextPath;
uint8_t rotatePlayer;
}; };
struct SpawnerPath { struct SpawnerPath {
@ -150,6 +182,7 @@ struct Path {
uint32_t pathVersion; uint32_t pathVersion;
PathType pathType; PathType pathType;
std::string pathName; std::string pathName;
uint32_t flags;
PathBehavior pathBehavior; PathBehavior pathBehavior;
uint32_t waypointCount; uint32_t waypointCount;
std::vector<PathWaypoint> pathWaypoints; std::vector<PathWaypoint> pathWaypoints;
@ -219,9 +252,11 @@ private:
std::map<LWOSCENEID, SceneRef, mapCompareLwoSceneIDs> m_Scenes; std::map<LWOSCENEID, SceneRef, mapCompareLwoSceneIDs> m_Scenes;
std::vector<SceneTransition> m_SceneTransitions; std::vector<SceneTransition> m_SceneTransitions;
uint32_t m_PathDataLength; uint32_t m_PathDataLength;
//std::vector<char> m_PathData; //Binary path data uint32_t m_PathChunkVersion;
std::vector<Path> m_Paths; std::vector<Path> m_Paths;
std::map<LWOSCENEID, uint32_t, mapCompareLwoSceneIDs> m_MapRevisions; //rhs is the revision! std::map<LWOSCENEID, uint32_t, mapCompareLwoSceneIDs> m_MapRevisions; //rhs is the revision!
//private ("helper") functions: //private ("helper") functions: