Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-12-23 05:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into moreMovementAi

Browse Source
This commit is contained in:
David Markowitz
2023-08-12 21:57:07 -07:00
parent 56ab6bd4c3 c26086aff5
commit 1b54387677
157 changed files with 559 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dZoneManager/Zone.h
View File

@@ -28,6 +28,11 @@ struct SceneRef {
uint32_t id;
uint32_t sceneType; //0 = general, 1 = audio?
std::string name;
NiPoint3 unknown1;
float unknown2;
uint8_t color_r;
uint8_t color_g;
uint8_t color_b;
Level* level;
std::map<uint32_t, LUTriggers::Trigger*> triggers;
};
@@ -112,7 +117,7 @@ enum class PropertyType : int32_t {
Headspace = 3
};
enum class PropertyRentalTimeUnit : int32_t {
enum class PropertyRentalPeriod : uint32_t {
Forever = 0,
Seconds = 1,
Minutes = 2,
@@ -123,7 +128,7 @@ enum class PropertyRentalTimeUnit : int32_t {
Years = 7
};
enum class PropertyAchievmentRequired : int32_t {
enum class PropertyAchievmentRequired : uint32_t {
None = 0,
Builder = 1,
Craftsman = 2,
@@ -145,13 +150,14 @@ struct MovingPlatformPath {
struct PropertyPath {
PropertyPathType pathType;
int32_t price;
PropertyRentalTimeUnit rentalTimeUnit;
uint32_t rentalTime;
uint64_t associatedZone;
std::string displayName;
std::string displayDesc;
PropertyType type;
int32_t cloneLimit;
uint32_t cloneLimit;
float repMultiplier;
PropertyRentalPeriod rentalPeriod;
PropertyAchievmentRequired achievementRequired;
NiPoint3 playerZoneCoords;
float maxBuildHeight;
@@ -188,15 +194,17 @@ struct Path {
class Zone {
public:
enum class ZoneFileFormatVersion : uint32_t { //Times are guessed.
PreAlpha = 0x20,
EarlyAlpha = 0x23,
Alpha = 0x24,
LateAlpha = 0x25,
Beta = 0x26,
Launch = 0x27,
Auramar = 0x28,
Latest = 0x29
enum class FileFormatVersion : uint32_t { //Times are guessed.
PrePreAlpha = 30,
PreAlpha = 32,
LatePreAlpha = 33,
EarlyAlpha = 35,
Alpha = 36,
LateAlpha = 37,
Beta = 38,
Launch = 39,
Auramar = 40,
Latest = 41
};
public:
@@ -232,7 +240,7 @@ private:
uint32_t m_NumberOfScenesLoaded;
uint32_t m_NumberOfObjectsLoaded;
uint32_t m_NumberOfSceneTransitionsLoaded;
ZoneFileFormatVersion m_ZoneFileFormatVersion;
FileFormatVersion m_FileFormatVersion;
uint32_t m_CheckSum;
uint32_t m_WorldID; //should be equal to the MapID
NiPoint3 m_Spawnpoint;