ModdingRX/YimMenuV2
1
0
Fork 0
mirror of https://github.com/YimMenu/YimMenuV2.git synced 2026-10-10 03:43:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'enhanced' of https://github.com/YimMenu/YimMenuV2 into enhanced

Browse Source
This commit is contained in:
maybegreat48
2025-06-10 02:01:15 -04:00
parent acb7bdc3c4 f262b4895e
commit cf43e674f4
3 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/features/self/SuperRun.cpp
+25 -39
View File
@@ -1,57 +1,43 @@
#include "core/commands/LoopedCommand.hpp"
#include "core/commands/FloatCommand.hpp"
#include "core/util/Math.hpp"
#include "game/backend/Self.hpp"
#include "game/gta/Natives.hpp"
namespace YimMenu::Features
{
static FloatCommand _SuperRunRunSpeed{"superrunrunspeed", "Run Speed", "Run speed (in m/s)", 0.0f, std::nullopt, 10.0f};
static FloatCommand _SuperRunSprintSpeed{"superrunsprintspeed", "Sprint Speed", "Sprint speed (in m/s)", 0.0f, std::nullopt, 30.0f};
// not setting a max speed on purpose to avoid value slider showing up
// maybe bring this up as an issue and fix?
static FloatCommand _SuperRunMoveRateOverride{"moverateoverride", "Move Rate Override", "Multipler for base run/sprint speed", 0.0f, std::nullopt, 2.0f};
static FloatCommand _SuperRunRunSprintMultiplier{"runsprintswimmultiplier", "Run/Sprint/Swim Multiplier", "Multipler with which the run/sprint/swim speed is increased with until maximum speed is reached", 1.0f, std::nullopt, 1.0f};
class SuperRun : public LoopedCommand
{
using LoopedCommand::LoopedCommand;
virtual void OnDisable() override
{
if (auto player = Self::GetPlayer())
{
auto playerId = player.GetId();
PLAYER::SET_SWIM_MULTIPLIER_FOR_PLAYER(playerId, 1.0f);
PLAYER::SET_RUN_SPRINT_MULTIPLIER_FOR_PLAYER(playerId, 1.0f);
}
}
virtual void OnEnable() override
{
if (auto player = Self::GetPlayer())
{
auto playerId = player.GetId();
PLAYER::SET_SWIM_MULTIPLIER_FOR_PLAYER(playerId, _SuperRunRunSprintMultiplier.GetState());
PLAYER::SET_RUN_SPRINT_MULTIPLIER_FOR_PLAYER(playerId, _SuperRunRunSprintMultiplier.GetState());
}
}
virtual void OnTick() override
{
if (auto ped = Self::GetPed())
{
auto pedHandle = ped.GetHandle();
if (PED::IS_PED_RAGDOLL(pedHandle))
return;
// don't set speed if in 1st person camera and moving backwards due to it not working properly
if (ENTITY::GET_ENTITY_SPEED_VECTOR(pedHandle, 1).y < 0.0f && CAM::GET_FOLLOW_PED_CAM_VIEW_MODE() == 4)
return;
if (TASK::IS_PED_RUNNING(pedHandle) || TASK::IS_PED_SPRINTING(pedHandle)) {
const float run_speed = TASK::IS_PED_SPRINTING(pedHandle) ?
_SuperRunSprintSpeed.GetState() :
_SuperRunRunSpeed.GetState();
if (ENTITY::GET_ENTITY_SPEED(pedHandle) < run_speed) {
Vector3 location = ENTITY::GET_ENTITY_COORDS(pedHandle, false /*Unused*/);
Vector3 rot = ENTITY::GET_ENTITY_ROTATION(pedHandle, 2);
float yaw = Math::DegToRad(rot.z + 90);
Vector3 offset;
offset.x = location.x + (run_speed * cos(yaw));
offset.y = location.y + (run_speed * sin(yaw));
offset.z = location.z;
float groundZ;
MISC::GET_GROUND_Z_FOR_3D_COORD(offset.x, offset.y, 1000.f, &groundZ, false, false);
if (groundZ < location.z)
offset.z = groundZ;
Vector3 vel = offset - location;
ENTITY::SET_ENTITY_VELOCITY(ped.GetHandle(), vel.x, vel.y, vel.z);
}
}
}
PED::SET_PED_MOVE_RATE_OVERRIDE(ped.GetHandle(), _SuperRunMoveRateOverride.GetState());
}
};
src/game/frontend/submenus/Self.cpp
+2 -2
View File
@@ -48,8 +48,8 @@ namespace YimMenu::Submenus
movementGroup->AddItem(std::make_shared<BoolCommandItem>("standonvehicles"_J));
movementGroup->AddItem(std::make_shared<BoolCommandItem>("disableactionmode"_J));
movementGroup->AddItem(std::make_shared<BoolCommandItem>("superrun"_J));
movementGroup->AddItem(std::make_shared<ConditionalItem>("superrun"_J, std::make_shared<FloatCommandItem>("superrunrunspeed"_J)));
movementGroup->AddItem(std::make_shared<ConditionalItem>("superrun"_J, std::make_shared<FloatCommandItem>("superrunsprintspeed"_J)));
movementGroup->AddItem(std::make_shared<ConditionalItem>("superrun"_J, std::make_shared<FloatCommandItem>("moverateoverride"_J)));
movementGroup->AddItem(std::make_shared<ConditionalItem>("superrun"_J, std::make_shared<FloatCommandItem>("runsprintswimmultiplier"_J)));
movementGroup->AddItem(std::make_shared<BoolCommandItem>("superjump"_J));
movementGroup->AddItem(std::make_shared<BoolCommandItem>("noclip"_J));
movementGroup->AddItem(std::make_shared<ConditionalItem>("noclip"_J, std::make_shared<FloatCommandItem>("noclipspeed"_J)));
src/game/frontend/submenus/Vehicle/SavedVehicles.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "core/backend/FiberPool.hpp"
#include "core/frontend/Notifications.hpp"
#include "core/util/Strings.hpp"
#include "core/util/strings.hpp"
#include "game/backend/Self.hpp"
#include "game/backend/SavedVehicles.hpp"
#include "game/gta/Vehicle.hpp"