diff --git a/.gitignore b/.gitignore index 6d70d3e..2b2faa1 100644 --- a/.gitignore +++ b/.gitignore @@ -98,4 +98,4 @@ compile_commands.json CTestTestfile.cmake _deps CMakeUserPresets.json -RosaServer/git_version.cpp \ No newline at end of file +RosaServer/git_version.cpp diff --git a/RosaServer/rosaserver.cpp b/RosaServer/rosaserver.cpp index 6b3510d..1fae301 100644 --- a/RosaServer/rosaserver.cpp +++ b/RosaServer/rosaserver.cpp @@ -422,6 +422,7 @@ void luaInit(bool redo) { auto meta = lua->new_usertype("new", sol::no_constructor); meta["port"] = &Connection::port; meta["timeoutTime"] = &Connection::timeoutTime; + meta["numReceivedEvents"] = &Connection::numReceivedEvents; meta["class"] = sol::property(&Connection::getClass); meta["address"] = sol::property(&Connection::getAddress); @@ -556,6 +557,9 @@ void luaInit(bool redo) { meta["viewYaw"] = &Human::viewYaw; meta["viewPitch"] = &Human::viewPitch; meta["viewYaw2"] = &Human::viewYaw2; + meta["viewYawVel"] = &Human::viewYawVel; + meta["gearX"] = &Human::gearX; + meta["gearY"] = &Human::gearY; meta["strafeInput"] = &Human::strafeInput; meta["walkInput"] = &Human::walkInput; meta["viewPitch2"] = &Human::viewPitch2; @@ -589,6 +593,7 @@ void luaInit(bool redo) { meta["tieColor"] = &Human::tieColor; meta["necklace"] = &Human::necklace; meta["lastUpdatedWantedGroup"] = &Human::lastUpdatedWantedGroup; + meta["burgerEatCooldown"] = &Human::burgerEatCooldown; meta["class"] = sol::property(&Human::getClass); meta["__tostring"] = &Human::__tostring; @@ -722,6 +727,7 @@ void luaInit(bool redo) { meta["price"] = &VehicleType::price; meta["mass"] = &VehicleType::mass; meta["numWheels"] = &VehicleType::numWheels; + meta["carBodyOffset"] = &VehicleType::carBodyOffset; meta["class"] = sol::property(&VehicleType::getClass); meta["__tostring"] = &VehicleType::__tostring; diff --git a/RosaServer/structs.h b/RosaServer/structs.h index e04fee5..4c56137 100644 --- a/RosaServer/structs.h +++ b/RosaServer/structs.h @@ -437,11 +437,12 @@ struct Human { float viewPitch; // 9c PAD(0xd8 - 0x9c - 4); float viewYaw2; // d8 - PAD(0x12c - 0xd8 - 4); + PAD(0x12c - 0xd8 - 8); + float gearX; // 128 float strafeInput; // 12c - float unk21; // 130 + float gearY; // 130 float walkInput; // 134 - int unk22; // 138 + int viewYawVel; // 138 float viewPitch2; // 13c PAD(0x214 - 0x13c - 4); /* @@ -717,7 +718,8 @@ struct VehicleType { float mass; // 38 PAD(0x17878 - 0x38 - 4); int numWheels; // 17878 - PAD(0x185C0 - 0x17878 - 4); + PAD(0x18534 - 0x45d6 - 4); + Vector carBodyOffset; // 99636 const char* getClass() const { return "VehicleType"; } std::string __tostring() const;