add heist modifier #181

kurumimeow · 2025-04-13T13:17:54Z

added apartment, diamond casino, cayo perico and doomsday heist modifier

maybegreat48 · 2025-04-13T13:28:58Z

src/game/gta/ScriptLocal.hpp

@@ -65,6 +73,18 @@ namespace YimMenu
 			return *static_cast<std::add_pointer_t<std::remove_reference_t<T>>>(Get());
 		}

+        template<typename T>


I would just use At() and get/set the pointer instead of using these helper functions. Same goes for the globals

maybegreat48 · 2025-04-13T13:32:16Z

src/game/features/recovery/Heist/DiamondCasinoHeist.cpp

+				if (0 <= primary_target && primary_target <= 3)
+				{
+					switch (primary_target)
+					{


Consider using Tunables::GetTunable instead

maybegreat48 · 2025-04-13T13:36:21Z

src/game/features/recovery/Heist/ApartmentHeist.cpp

+			using Command::Command;
+
+			virtual void OnCall() override
+			{


Iterate all players and modify this field in GlobalPlayerBD instead. Modifying others' broadcast stuff is generally bad practice, but you should be fine for this one (assuming you are the script host)

maybegreat48 · 2025-04-13T13:48:07Z

src/game/features/recovery/Heist/ApartmentHeist.cpp

+			{
+				ScriptGlobal(1929794 + 1 + 1).SetValue<int>(100 - (_ApartmentHeistCut1.GetState() + _ApartmentHeistCut2.GetState() + _ApartmentHeistCut3.GetState() + _ApartmentHeistCut4.GetState()));
+				ScriptGlobal(1929794 + 1 + 2).SetValue<int>(_ApartmentHeistCut2.GetState());
+				ScriptGlobal(1929794 + 1 + 3).SetValue<int>(_ApartmentHeistCut3.GetState());


You should use At(offset, size_per_element) to access arrays and At(offset) to access struct fields instead of adding stuff in the ScriptGlobal ctor. This applies to most globals and locals in this PR

alright 😊

maybegreat48 · 2025-04-13T13:54:06Z

LGTM for the most part. I'm just worried about how these globals and locals would be updated because there are a lot, but I'm sure we'll figure something out

xZueS19 · 2025-04-14T08:39:05Z

great work @kurumimeow, can't wait for this to be added to the menu

boxlemons21 · 2025-04-14T08:54:05Z

great work @kurumimeow, can't wait for this to be added to the menu
If all this time has passed and it didnt get merged and accepted then it probably wont, u can js add it urself ig

xZueS19 · 2025-04-14T09:09:04Z

great work @kurumimeow, can't wait for this to be added to the menu
If all this time has passed and it didnt get merged and accepted then it probably wont, u can js add it urself ig

u r wrong

boxlemons21 · 2025-04-14T11:09:36Z

great work @kurumimeow, can't wait for this to be added to the menu
If all this time has passed and it didnt get merged and accepted then it probably wont, u can js add it urself ig

u r wrong

I hope im wrong cuz i rlly want it lol

CSY0N · 2025-04-14T11:33:01Z

hm you should know that Heists Money has daily Limit like Nightclub Safe etc the get safe i recommend you the get know what the daily limit is bcs over daily limit it will be risky

boxlemons21 · 2025-04-14T11:34:33Z

hm you should know that Heists Money has daily Limit like Nightclub Safe etc the get safe i recommend you the get know what the daily limit is bcs over daily limit it will be risky

Sm1 already mentioned

xZueS19 · 2025-04-14T11:46:20Z

on second thoughts i quit from this conservation cause it got away from the main point of this pull request and this should not happen again

xZueS19 · 2025-04-14T11:59:18Z

@kurumimeow smth i found that when using instant finish for casino heist the money does not appear in the transaction log neither added to total money earned. i'm sure this aint right

Matze6239 · 2025-04-14T15:29:04Z

how do i add this to my menu?

maybegreat48 · 2025-04-14T16:19:16Z

Can i add all this to my menu now or do i have to wait until you approve it?

You can do whatever you want under the terms of the GPL-2 license

xZueS19 · 2025-04-15T05:31:06Z

Can i add all this to my menu now or do i have to wait until you approve it?

You can do whatever you want under the terms of the GPL-2 license

Accept it already 😭😭🙏

u have to wait until @kurumimeow make the changes and it will be approved

kurumimeow · 2025-04-15T16:07:41Z

Please have patience guys, it requires some changes as @maybegreat48 mentioned. Globals and Locals mostly changes after game update so we need to overcome that as much as we can so that it can be easy to manage.

maybegreat48 · 2025-04-16T00:07:50Z

I've marked this PR as a draft. When you're ready to work on it, feel free to mark it as ready for review and request a review from anyone with write access to this repo

El-BaVari · 2025-04-19T14:29:05Z

I think Rockstar changed the limit from 15M to 3M. Correct me if I'm wrong

- used tunables instead of globals for primary target - removed cayo perico "remove cooldown" as setup gets the job done

boxlemons21 · 2025-04-19T20:37:15Z

I think Rockstar changed the limit from 15M to 3M. Correct me if I'm wrong

nope, you are very correct.

kurumimeow · 2025-04-19T20:42:40Z

@kurumimeow smth i found that when using instant finish for casino heist the money does not appear in the transaction log neither added to total money earned. i'm sure this aint right

Probably you are exceeding 3.6 million.

xZueS19 · 2025-04-19T20:48:30Z

@kurumimeow smth i found that when using instant finish for casino heist the money does not appear in the transaction log neither added to total money earned. i'm sure this aint right

Probably you are exceeding 3.6 million.

i was getting the money that was 3.59 ish but i found it gets added to total earned but not appear in the transaction log, it's fine tho as i don't do any heists anymore after R* shit reduced the cap of the apartment heist to 3mil

boxlemons21 · 2025-04-19T20:49:53Z

@kurumimeow smth i found that when using instant finish for casino heist the money does not appear in the transaction log neither added to total money earned. i'm sure this aint right

Probably you are exceeding 3.6 million.

i was getting the money that was 3.59 ish but i found it gets added to total earned but not appear in the transaction log, it's fine tho as i don't do any heists anymore after R* shit reduced the cap of the apartment heist to 3mil

not only that, the transaction section "service_earn_bend_job" was also capped at 3m not 15m anymore

maybegreat48 · 2025-04-19T21:07:37Z

OK, I'm merging this for now, but once we get lua scripting, this should be converted into one to improve maintainability

Jiqegolo2671 · 2025-04-19T22:36:52Z

Sorry if this is a wrong place to ask, but is this compatible with V2's Solo missions? Tried the early version few days ago (2x week) on Humane Finale to instant finish it. It did instant finish, later however the apartment board was bugged with a 'BLANK' finale and a clean board. Had to cancel the 'BLANK' heist through Lester.

Additional info: Character didn't migrate, so starting all over. Didn't get Series A calls after instant finishing Humane nor after cancelling the blank one.

xZueS19 · 2025-04-20T12:20:40Z

@kurumimeow
this is what appears after using the instant finish

and it's with ur latest commits
and this is the transaction log

the 3mil is for the apartment heist i did just before i did the casino and i got 3.51 mil for the casino and there's the cash

it's okey by me but i fear that it gets detected cause it does not get added in the transactions

kurumimeow · 2025-04-20T13:28:49Z

Sorry if this is a wrong place to ask, but is this compatible with V2's Solo missions? Tried the early version few days ago (2x week) on Humane Finale to instant finish it. It did instant finish, later however the apartment board was bugged with a 'BLANK' finale and a clean board. Had to cancel the 'BLANK' heist through Lester.

Additional info: Character didn't migrate, so starting all over. Didn't get Series A calls after instant finishing Humane nor after cancelling the blank one.

For apartment heists you need to call lester to cancel heist, as setup button doesn't refresh the board unlike other heists, it only skips preparations of currently selected heist. It is common that the board will not refresh for some heists if you use instant finish.

Jiqegolo2671 · 2025-04-20T13:42:02Z

It is common that the board will not refresh for some heists if you use instant finish.

Good to know. Guess I'll have to wait for updated solo missions.

kurumimeow · 2025-04-20T13:57:32Z

@kurumimeow this is what appears after using the instant finish and it's with ur latest commits and this is the transaction log the 3mil is for the apartment heist i did just before i did the casino and i got 3.51 mil for the casino and there's the cash it's okey by me but i fear that it gets detected cause it does not get added in the transactions

I believe you have completed the heist solo. This could be the reason for not appearing on "heist passed" screen. If you do the heist with other players your take will appear on the final screen. Anyway, in both cases you are receiving money as long as it's within the limit. And about the transaction log idk.

kurumimeow added 2 commits April 13, 2025 18:10

add heist modifier

9222445

move cayo perico cooldown into heist tab

7565dec

maybegreat48 reviewed Apr 13, 2025

View reviewed changes

This comment was marked as spam.

Sign in to view

maybegreat48 marked this pull request as draft April 16, 2025 00:06

fixes

a84e1c8

- used tunables instead of globals for primary target - removed cayo perico "remove cooldown" as setup gets the job done

kurumimeow marked this pull request as ready for review April 19, 2025 20:41

maybegreat48 merged commit 6e6e151 into YimMenu:enhanced Apr 19, 2025

add heist modifier #181

add heist modifier #181

Uh oh!

Conversation

kurumimeow commented Apr 13, 2025

Uh oh!

maybegreat48 Apr 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

maybegreat48 Apr 13, 2025

Choose a reason for hiding this comment

Uh oh!

maybegreat48 Apr 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

maybegreat48 Apr 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kurumimeow Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

maybegreat48 commented Apr 13, 2025

Uh oh!

xZueS19 commented Apr 14, 2025

Uh oh!

boxlemons21 commented Apr 14, 2025

Uh oh!

xZueS19 commented Apr 14, 2025

Uh oh!

boxlemons21 commented Apr 14, 2025

Uh oh!

CSY0N commented Apr 14, 2025

Uh oh!

boxlemons21 commented Apr 14, 2025

Uh oh!

xZueS19 commented Apr 14, 2025

Uh oh!

xZueS19 commented Apr 14, 2025

Uh oh!

Matze6239 commented Apr 14, 2025

Uh oh!

maybegreat48 commented Apr 14, 2025

Uh oh!

This comment was marked as spam.

xZueS19 commented Apr 15, 2025

Uh oh!

kurumimeow commented Apr 15, 2025

Uh oh!

maybegreat48 commented Apr 16, 2025

Uh oh!

El-BaVari commented Apr 19, 2025

Uh oh!

boxlemons21 commented Apr 19, 2025

Uh oh!

kurumimeow commented Apr 19, 2025

Uh oh!

xZueS19 commented Apr 19, 2025

Uh oh!

boxlemons21 commented Apr 19, 2025

Uh oh!

maybegreat48 commented Apr 19, 2025

Uh oh!

Jiqegolo2671 commented Apr 19, 2025

Uh oh!

xZueS19 commented Apr 20, 2025

Uh oh!

kurumimeow commented Apr 20, 2025

Uh oh!

Jiqegolo2671 commented Apr 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kurumimeow commented Apr 20, 2025

Uh oh!

Uh oh!

maybegreat48 Apr 13, 2025 •

edited

Loading

maybegreat48 Apr 13, 2025 •

edited

Loading

maybegreat48 Apr 13, 2025 •

edited

Loading

Jiqegolo2671 commented Apr 20, 2025 •

edited

Loading