diff --git a/script/globals/GPBD_FM.hpp b/script/globals/GPBD_FM.hpp index 13ccce7..5b9ea81 100644 --- a/script/globals/GPBD_FM.hpp +++ b/script/globals/GPBD_FM.hpp @@ -517,7 +517,6 @@ struct PROPERTY_DATA SCR_ARRAY FactoryInfos; SCR_INT TotalBunkerResearch; SCR_INT CurrentBunkerResearchProgress; - SCR_INT BunkerDecorVariation; SCR_INT MOCBitset; SCR_INT MOCColor; // bitset for some reason uint64_t PAD_0290[2]; // unused @@ -526,7 +525,7 @@ struct PROPERTY_DATA SCR_INT PAD_0299; DEFUNCT_BASE_DATA DefunctBaseData; SCR_INT AvengerInteriorDecorFlags; // "PACKED_MP_INT_ARMORY_AIRCRAFT_INTERIOR_v0" - uint64_t PAD_0308[3]; + uint64_t PAD_0308[2]; BUSINESS_HUB_DATA BusinessHubData; NIGHTCLUB_DATA NightclubData; SCR_INT PAD_0365; @@ -570,7 +569,7 @@ struct PROPERTY_DATA HACKER_DEN_DATA HackerDenData; FIELD_HANGAR_DATA FieldHangarData; }; -static_assert(sizeof(PROPERTY_DATA) == 544 * 8); +static_assert(sizeof(PROPERTY_DATA) == 542 * 8); struct BIKER_CONTRACTS { @@ -628,7 +627,6 @@ struct GPBD_FM_Entry SCR_INT TutorialBitset2; TEXT_LABEL_23 PlayingContentUsedId; TEXT_LABEL_23 MatchId; - uint64_t PAD_0156[8]; // unused TEXT_LABEL_63 DisplayJobName; // as shown in the playerlist? STRIKE_TEAM StrikeTeam; uint64_t PAD_0185[7]; // pad @@ -676,14 +674,12 @@ struct GPBD_FM_Entry uint64_t PAD_844; SCR_INT SeatingIndex; ARENA_WAR_DATA ArenaWarData; // @858 as of 1.67 - uint64_t PAD_0861[2]; SCR_INT ApartmentEnterFlags; - SCR_VEC3 AvengerMissionStartPosition; }; -static_assert(sizeof(GPBD_FM_Entry) == 889 * 8); +static_assert(sizeof(GPBD_FM_Entry) == 874 * 8); struct GPBD_FM { SCR_ARRAY Entries; }; -static_assert(sizeof(GPBD_FM) == 28449 * 8); \ No newline at end of file +static_assert(sizeof(GPBD_FM) == 27969 * 8); \ No newline at end of file diff --git a/script/globals/GSBD.hpp b/script/globals/GSBD.hpp index f1ea0ba..c52eb4b 100644 --- a/script/globals/GSBD.hpp +++ b/script/globals/GSBD.hpp @@ -41,8 +41,9 @@ struct SMPL_INTERIOR_DATA_SERVER SCR_ARRAY PlayerInteriorSimpleInteriorTypes; SCR_ARRAY PlayerInteriorIsOwnerless; SCR_ARRAY PlayerInteriorOwners; + SCR_INT TimeUpdated; }; -static_assert(sizeof(SMPL_INTERIOR_DATA_SERVER) == 234 * 8); +static_assert(sizeof(SMPL_INTERIOR_DATA_SERVER) == 235 * 8); struct LEAVE_CLUBHOUSE_SERVER { @@ -91,4 +92,4 @@ struct GSBD uint64_t PAD_1399[97]; SCR_INT CayoPericoStrandedAnimalChoice; }; -static_assert(sizeof(GSBD) == 1498 * 8); \ No newline at end of file +static_assert(sizeof(GSBD) == 1499 * 8); \ No newline at end of file diff --git a/script/globals/GSBD_FM.hpp b/script/globals/GSBD_FM.hpp index 08d515c..3d60f10 100644 --- a/script/globals/GSBD_FM.hpp +++ b/script/globals/GSBD_FM.hpp @@ -63,5 +63,6 @@ struct GSBD_FM WEAPON_PICKUPS WeaponPickups; BIKER_CONTRACTS_SERVER BikerContracts; SCR_ARRAY DoubleActionCacheLocationRevealed; + SCR_INT TimeUpdated; }; -static_assert(sizeof(GSBD_FM) == 647 * 8); +static_assert(sizeof(GSBD_FM) == 649 * 8); diff --git a/script/globals/g_AMC_playerBD.hpp b/script/globals/g_AMC_playerBD.hpp index 33c00c2..ccd21e5 100644 --- a/script/globals/g_AMC_playerBD.hpp +++ b/script/globals/g_AMC_playerBD.hpp @@ -7,10 +7,10 @@ struct g_AMC_playerBD_Entry SCR_ARRAY UsedContactServicesTimer; // only index 2 (mugger) is actually used by the scripts. the rest is just a waste of bandwidth SCR_ARRAY ContactServiceCooldowns; // same as above }; -static_assert(sizeof(g_AMC_playerBD_Entry) == 248 * 8); +static_assert(sizeof(g_AMC_playerBD_Entry) == 251 * 8); struct g_AMC_playerBD { SCR_ARRAY Entries; }; -static_assert(sizeof(g_AMC_playerBD) == 7937 * 8); \ No newline at end of file +static_assert(sizeof(g_AMC_playerBD) == 8033 * 8); \ No newline at end of file diff --git a/script/types.hpp b/script/types.hpp index 2c78b0d..667279f 100644 --- a/script/types.hpp +++ b/script/types.hpp @@ -100,4 +100,4 @@ private: }; static_assert(sizeof(GAMER_HANDLE) == 13 * 8); -#define NUM_CONTACTS 82 \ No newline at end of file +#define NUM_CONTACTS 83 \ No newline at end of file