ModdingRX/YimMenuV2
1
0 Fork 0
mirror of https://github.com/YimMenu/YimMenuV2.git synced 2026-10-11 17:58:10 +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 committed 2025-04-23 16:46:24 -04:00
2 parents 4898a04e89 0cfdf9ff3c
commit 83723b3cb1
3 files changed
+141 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/features/self/mobile_radio.cpp → src/game/features/self/MobileRadio.cpp
+1 -1
View File
@@ -22,5 +22,5 @@ namespace YimMenu::Features
}
};
static MobileRadio _MobileRadio{"mobileradio", "listen any radio station on foot", "Allows you to listen to any radio station on foot with Hotkey Q"};
static MobileRadio _MobileRadio{"mobileradio", "Mobile Radio", "Allows you to listen to any radio station on foot with Hotkey Q"};
}
src/game/features/self/OpenWardrobe.cpp
+130
View File
@@ -0,0 +1,130 @@
#include "core/commands/Command.hpp"
#include "core/backend/ScriptMgr.hpp"
#include "core/frontend/Notifications.hpp"
#include "game/backend/Self.hpp"
#include "game/backend/ScriptPatches.hpp"
#include "game/backend/NativeHooks.hpp"
#include "game/gta/Natives.hpp"
#include "game/gta/Scripts.hpp"
#include "game/gta/ScriptLocal.hpp"
#include "game/pointers/Pointers.hpp"
#include "types/script/types.hpp"
namespace YimMenu::Features
{
struct WARDROBE_LAUNCH_DATA
{
SCR_INT Type;
SCR_VEC3 Position;
SCR_FLOAT Heading;
};
static bool startedByUs{};
static ScriptPatch shouldCleanupWardrobePatch{};
static ScriptPatch isWardrobeOpenedPatch{};
static ScriptPatch doesPlayerOwnItemPatch{};
static ScriptPatch isItemLockedByStatPatch1{};
static ScriptPatch isItemLockedByStatPatch2{};
static ScriptPatch isItemLockedByStatPatch3{};
static void GetDistanceBetweenCoordsHook(rage::scrNativeCallContext* ctx);
class OpenWardrobe : public Command
{
using Command::Command;
virtual void OnCall() override
{
if (!*Pointers.IsSessionStarted || SCRIPT::GET_NUMBER_OF_THREADS_RUNNING_THE_SCRIPT_WITH_THIS_HASH("wardrobe_mp"_J) > 0)
{
Notifications::Show("Wardrobe", "Not safe to open the wardrobe at the moment.", NotificationType::Error);
return;
}
while (!SCRIPT::HAS_SCRIPT_WITH_NAME_HASH_LOADED("wardrobe_mp"_J))
{
SCRIPT::REQUEST_SCRIPT_WITH_NAME_HASH("wardrobe_mp"_J);
ScriptMgr::Yield();
}
WARDROBE_LAUNCH_DATA launchData;
launchData.Type = 7;
launchData.Position = Self::GetPed().GetPosition();
launchData.Heading = Self::GetPed().GetHeading();
if (!BUILTIN::START_NEW_SCRIPT_WITH_NAME_HASH_AND_ARGS("wardrobe_mp"_J, &launchData, sizeof(launchData) / 8, 2324))
{
Notifications::Show("Wardrobe", "Failed to open the wardrobe.", NotificationType::Error);
return;
}
if (!shouldCleanupWardrobePatch)
{
shouldCleanupWardrobePatch = ScriptPatches::AddPatch("wardrobe_mp"_J, ScriptPointer("ShouldCleanupWardrobePatch", "2C 01 00 40 2C 05 02 69 06 56 1C 07"), {0x72, 0x2E, 0x05, 0x01});
}
shouldCleanupWardrobePatch->Enable();
if (!isWardrobeOpenedPatch)
{
isWardrobeOpenedPatch = ScriptPatches::AddPatch("wardrobe_mp"_J, ScriptPointer("IsWardrobeOpenedPatch", "56 22 00 71"), {0x2B, 0x00, 0x00});
}
isWardrobeOpenedPatch->Enable();
if (!doesPlayerOwnItemPatch)
{
doesPlayerOwnItemPatch = ScriptPatches::AddPatch("wardrobe_mp"_J, ScriptPointer("DoesPlayerOwnItemPatch", "57 D2 00 38 08"), {0x55});
}
doesPlayerOwnItemPatch->Enable();
if (!isItemLockedByStatPatch1)
{
isItemLockedByStatPatch1 = ScriptPatches::AddPatch("wardrobe_mp"_J, ScriptPointer("IsItemLockedByStatPatch1", "38 00 65 02 F7 B6 C6 31 09 00 31 46 A9 B0 28 04"), {0x71, 0x2E, 0x03, 0x01});
}
isItemLockedByStatPatch1->Enable();
if (!isItemLockedByStatPatch2)
{
isItemLockedByStatPatch2 = ScriptPatches::AddPatch("wardrobe_mp"_J, ScriptPointer("IsItemLockedByStatPatch2", "38 00 65 04 90 44 B3 80 15 00 CB C8 CF 72 0F 00 87 81 38 F6 1C 00 31 48 DE 94 16 00"), {0x72, 0x2E, 0x03, 0x01});
}
isItemLockedByStatPatch2->Enable();
if (!isItemLockedByStatPatch3)
{
isItemLockedByStatPatch3 = ScriptPatches::AddPatch("wardrobe_mp"_J, ScriptPointer("IsItemLockedByStatPatch3", "38 00 65 01 34 ED 23 4E 03 00"), {0x72, 0x2E, 0x03, 0x01});
}
isItemLockedByStatPatch3->Enable();
NativeHooks::AddHook("wardrobe_mp"_J, NativeIndex::GET_DISTANCE_BETWEEN_COORDS, &GetDistanceBetweenCoordsHook);
SCRIPT::SET_SCRIPT_WITH_NAME_HASH_AS_NO_LONGER_NEEDED("wardrobe_mp"_J);
startedByUs = true;
}
};
static OpenWardrobe _OpenWardrobe{"openwardrobe", "Open Wardrobe", "Allows you to access your wardrobe remotely."};
static void GetDistanceBetweenCoordsHook(rage::scrNativeCallContext* ctx)
{
auto distance = MISC::GET_DISTANCE_BETWEEN_COORDS(ctx->GetArg<float>(0), ctx->GetArg<float>(1), ctx->GetArg<float>(2), ctx->GetArg<float>(3), ctx->GetArg<float>(4), ctx->GetArg<float>(5), ctx->GetArg<BOOL>(6));
if (startedByUs)
{
if (auto thread = Scripts::FindScriptThread("wardrobe_mp"_J))
{
if (*ScriptLocal(thread, 187).At(46).At(9).As<int*>() == 4)
{
shouldCleanupWardrobePatch->Disable();
isWardrobeOpenedPatch->Disable();
doesPlayerOwnItemPatch->Disable();
isItemLockedByStatPatch1->Disable();
isItemLockedByStatPatch2->Disable();
isItemLockedByStatPatch3->Disable();
startedByUs = false;
distance = 9999.f;
}
}
}
ctx->SetReturnValue<float>((float)distance);
}
}
src/game/frontend/submenus/Self.cpp
+10 -9
View File
@@ -11,8 +11,8 @@ namespace YimMenu::Submenus
auto main = std::make_shared<Category>("Main");
auto globalsGroup = std::make_shared<Group>("Globals");
auto movementGroup = std::make_shared<Group>("Movement");
auto wantedGroup = std::make_shared<Group>("Wanted");
auto toolsGroup = std::make_shared<Group>("Tools", 1);
auto wantedGroup = std::make_shared<Group>("Wanted");
globalsGroup->AddItem(std::make_shared<BoolCommandItem>("godmode"_J));
globalsGroup->AddItem(std::make_shared<BoolCommandItem>("invis"_J));
@@ -22,6 +22,14 @@ namespace YimMenu::Submenus
globalsGroup->AddItem(std::make_shared<BoolCommandItem>("noidlekick"_J));
globalsGroup->AddItem(std::make_shared<BoolCommandItem>("unlimitedoxygen"_J));
globalsGroup->AddItem(std::make_shared<BoolCommandItem>("formatmoney"_J));
globalsGroup->AddItem(std::make_shared<BoolCommandItem>("mobileradio"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("skipcutscene"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("suicide"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("heal"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("cleardamage"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("fillinventory"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("openwardrobe"_J));
auto clearWanted = std::make_shared<Group>("", 1);
clearWanted->AddItem(std::make_shared<ConditionalItem>("neverwanted"_J, std::make_shared<CommandItem>("clearwanted"_J), true));
@@ -32,13 +40,6 @@ namespace YimMenu::Submenus
setWanted->AddItem(std::make_shared<BoolCommandItem>("freezewanted"_J));
wantedGroup->AddItem(std::make_shared<ConditionalItem>("freezewanted"_J, clearWanted, true));
wantedGroup->AddItem(std::make_shared<ConditionalItem>("neverwanted"_J, setWanted, true));
toolsGroup->AddItem(std::make_shared<CommandItem>("skipcutscene"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("suicide"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("heal"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("cleardamage"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("fillinventory"_J));
toolsGroup->AddItem(std::make_shared<CommandItem>("MobileRadio"_J));
movementGroup->AddItem(std::make_shared<BoolCommandItem>("standonvehicles"_J));
movementGroup->AddItem(std::make_shared<BoolCommandItem>("disableactionmode"_J));
@@ -50,8 +51,8 @@ namespace YimMenu::Submenus
movementGroup->AddItem(std::make_shared<ConditionalItem>("freecam"_J, std::make_shared<FloatCommandItem>("freecamspeed"_J)));
main->AddItem(globalsGroup);
main->AddItem(wantedGroup);
main->AddItem(toolsGroup);
main->AddItem(wantedGroup);
main->AddItem(movementGroup);
AddCategory(std::move(main));