mirror of
https://github.com/YimMenu/YimMenuV2.git
synced 2026-10-10 03:43:15 +08:00
feat: add Kortz Center heist modifier tab (#1014)
* feat: add Kortz Center heist commands * feat: add Kortz Center heist frontend UI * feat: register Kortz Center heist tab * feat: add Kortz Center heist commands * feat: add Kortz Center heist frontend UI * feat: register Kortz Center heist tab * feat(kortz): add cooldown reset, manhole key loc, loot seed controls Add Misc group to Kortz tab with: - Reset Cooldown / Reset Hard Cooldown — write 0 to MPX_K26_HEIST_COOLDOWN / _HARD - Manhole Key location selector — 15 locations via ListCommand - Loot Seed int input — 0-9999 for MPX_K26_HEIST_SEED Ignore graphify-out/ in .gitignore. * refactor(kortz): restructure tab by prep category Split flat 18-toggle Prep Work into collapsible Vehicles, Equipment, Intel sections. Rename Misc to Heist Config. Reduces cognitive load: 30+ items in one view -> grouped. * fix(kortz): add missing vehicle prep labels Caracara (Prep), Annihilator (Prep), Manchez (Prep) were undefined -- showed as Unknown! in the Vehicles section. * feat(kortz): add laser room teleport buttons Three one-click TPs to laser room positions with heading set. First/Second/Third cover all lootable solo slots. * feat(kortz): replace laser room TPs with teleport section Remove 3 generic laser room TPs. Add computer room, CCTV, lasers (past grid), lobby stairs (skip hack) TPs. Rename Laser Room group to Teleport. * feat(kortz): add 7 in-heist shortcut commands * feat(kortz): add painting payout and first sale multiplier commands SetPaintingValue writes to ScriptGlobal(262145).At(38004).At(targetIdx+1). SetFirstSaleMultiplier writes to ScriptGlobal(262145).At(38199).As<float*>() * fix(kortz): remove erroneous static instances inside TakeSecondaryTarget class * feat(kortz): update tab UI with in-heist + payouts groups Remove: teleport, config (keyloc/seed), shortcuts (maxloot/cd resets). Add: In-Heist group with 7 shortcut buttons, Payouts group with painting value + first sale multiplier controls. Keep Setup at bottom. Collapsible headers preserved. * feat(kortz): change payout sliders to text inputs Credit: https://www.unknowncheats.me/forum/4746347-post762.html * feat(kortz): remove teleport commands * feat(kortz): remove hidden commands (cooldown resets, keyloc, seed, max loot)
This commit is contained in:
Ali
@@ -0,0 +1,218 @@
|
||||
#include "core/commands/Command.hpp"
|
||||
#include "core/commands/BoolCommand.hpp"
|
||||
#include "core/commands/ListCommand.hpp"
|
||||
#include "game/gta/Stats.hpp"
|
||||
#include "game/gta/ScriptGlobal.hpp"
|
||||
#include "game/gta/ScriptLocal.hpp"
|
||||
#include "game/gta/Scripts.hpp"
|
||||
#include "game/backend/Self.hpp"
|
||||
|
||||
namespace YimMenu::Features
|
||||
{
|
||||
namespace KortzCenterHeist
|
||||
{
|
||||
// --- Primary Target ---
|
||||
static std::vector<std::pair<int, const char*>> kortzCenterTargets = {
|
||||
{0, "La Dernière Débauche"},
|
||||
{1, "Hare Oneself Think"},
|
||||
{2, "The Downfall Rome"},
|
||||
{3, "Brother Brother"},
|
||||
{4, "A Cast Characters"},
|
||||
{5, "Gone To Seed"},
|
||||
{6, "True Love"},
|
||||
{7, "Breathless"},
|
||||
{8, "Consumato"},
|
||||
{9, "I Hear Voices"},
|
||||
{10, "Winter, Nowhere in Particular"},
|
||||
{11, "The Girl With Pearl Necklace"},
|
||||
{12, "Chat on Fruit"},
|
||||
{13, "Pumpkin"},
|
||||
{14, "Twindifference"},
|
||||
{15, "Stacks Study V"},
|
||||
{16, "I, Fruit"},
|
||||
{17, "To Beat About Bush"},
|
||||
{18, "In Excess of Success"},
|
||||
{19, "Juiced"},
|
||||
{20, "A Winding Road Home"},
|
||||
{21, "Teckels"},
|
||||
{22, "Trust"},
|
||||
{23, "Until Death"},
|
||||
{24, "What Melons?"},
|
||||
{25, "The Outcome Endeavour"},
|
||||
{26, "Mi O Melee"}
|
||||
};
|
||||
static ListCommand _KortzCenterPrimaryTarget{"kortzcenterheistprimarytarget", "Primary Target", "Primary target", kortzCenterTargets, 0};
|
||||
|
||||
// --- General Purchases (MPX_K26_GENERAL_BS bits 5-8) ---
|
||||
static BoolCommand _KortzCenterGuardRoutes{"kortzcenterheistguardroutes", "Guard Routes", "Guard routes purchased", true};
|
||||
static BoolCommand _KortzCenterGlassCutter{"kortzcenterheistglasscutter", "Glass Cutter", "Glass cutter purchased", true};
|
||||
static BoolCommand _KortzCenterPowerDrills{"kortzcenterheistpowerdrills", "Power Drills", "Power drills purchased", true};
|
||||
static BoolCommand _KortzCenterEMPCharges{"kortzcenterheistempcharges", "EMP Charges", "EMP charges purchased", true};
|
||||
|
||||
// --- Prep Work Items ---
|
||||
static BoolCommand _KortzCenterScopeOut{"kortzcenterheistscopeout", "Scope Out", "Scope out Kortz Center", true};
|
||||
static BoolCommand _KortzCenterAlphaMail{"kortzcenterheistalphamail", "Alpha Mail Disguise", "Alpha mail disguise", true};
|
||||
static BoolCommand _KortzCenterHazmat{"kortzcenterheisthazmat", "Hazmat Suit", "Hazmat suit", true};
|
||||
static BoolCommand _KortzCenterStaffKeycard{"kortzcenterheiststaffkeycard", "Staff Key Card", "Staff key card", true};
|
||||
static BoolCommand _KortzCenterTacticalEquip{"kortzcenterheisttacticalequip", "Tactical Equipment", "Tactical equipment", true};
|
||||
static BoolCommand _KortzCenterHackingDevice{"kortzcenterheisthackingdevice", "Hacking Device", "Hacking device", true};
|
||||
static BoolCommand _KortzCenterAccessCode{"kortzcenterheistaccesscode", "Access Code", "Access code", true};
|
||||
static BoolCommand _KortzCenterUnmarkedWeapons{"kortzcenterheistunmarkedweapons", "Unmarked Weapons", "Unmarked weapons", true};
|
||||
static BoolCommand _KortzCenterCaracara{"kortzcenterheistcaracara", "Armored Caracara", "Armored Caracara", true};
|
||||
static BoolCommand _KortzCenterAnnihilator{"kortzcenterheistannihilator", "Annihilator Stealth", "Annihilator stealth", true};
|
||||
static BoolCommand _KortzCenterManchez{"kortzcenterheistmanchez", "Manchez", "Manchez", true};
|
||||
static BoolCommand _KortzCenterPrepEMP{"kortzcenterheistprepemp", "EMP Charges (Prep)", "EMP charges prep", true};
|
||||
static BoolCommand _KortzCenterGuardShipments{"kortzcenterheistguardshipments", "Guard Shipments", "Guard shipments", true};
|
||||
static BoolCommand _KortzCenterGuardRoutesPrep{"kortzcenterheistguardroutesprep", "Guard Routes (Prep)", "Guard routes prep", true};
|
||||
static BoolCommand _KortzCenterGlassCutterPrep{"kortzcenterheistglasscutterprep", "Glass Cutter (Prep)", "Glass cutter prep", true};
|
||||
static BoolCommand _KortzCenterPowerDrillsPrep{"kortzcenterheistpowerdrillsprep", "Power Drills (Prep)", "Power drills prep", true};
|
||||
static BoolCommand _KortzCenterEMPChargesPrep{"kortzcenterheistempchargesprep", "EMP Charges (Prep)", "EMP charges prep", true};
|
||||
static BoolCommand _KortzCenterCaracaraPrep{"kortzcenterheistcaracaraprep", "Caracara (Prep)", "Armored Caracara prep", true};
|
||||
static BoolCommand _KortzCenterAnnihilatorPrep{"kortzcenterheistannihilatorprep", "Annihilator (Prep)", "Annihilator stealth prep", true};
|
||||
static BoolCommand _KortzCenterManchezPrep{"kortzcenterheistmanchezprep", "Manchez (Prep)", "Manchez prep", true};
|
||||
|
||||
// --- Scoping ---
|
||||
static BoolCommand _KortzCenterScopeSecondary{"kortzcenterheistscopesecondary", "Secondary Targets", "Scope secondary targets", true};
|
||||
static BoolCommand _KortzCenterScopePOI{"kortzcenterheistscopepoi", "Points of Interest", "Scope points of interest", true};
|
||||
|
||||
// --- In-Heist Shortcuts ---
|
||||
class SkipFingerprint : public Command
|
||||
{
|
||||
using Command::Command;
|
||||
|
||||
virtual void OnCall() override
|
||||
{
|
||||
if (auto thread = Scripts::FindScriptThread("fm_mission_controller_v3"_J))
|
||||
*ScriptLocal(thread, 26866).As<int*>() = 5;
|
||||
}
|
||||
};
|
||||
|
||||
class SkipSignalNodes : public Command
|
||||
{
|
||||
using Command::Command;
|
||||
|
||||
virtual void OnCall() override
|
||||
{
|
||||
if (auto thread = Scripts::FindScriptThread("fm_mission_controller_v3"_J))
|
||||
*ScriptLocal(thread, 27914).As<int*>() = 5;
|
||||
}
|
||||
};
|
||||
|
||||
class SkipDataCrack : public Command
|
||||
{
|
||||
using Command::Command;
|
||||
|
||||
virtual void OnCall() override
|
||||
{
|
||||
if (auto thread = Scripts::FindScriptThread("fm_mission_controller_v3"_J))
|
||||
{
|
||||
for (int i = 0; i <= 7; i++)
|
||||
*ScriptLocal(thread, 1388).At(i, 4).As<int*>() = 1;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
class CutGlass : public Command
|
||||
{
|
||||
using Command::Command;
|
||||
|
||||
virtual void OnCall() override
|
||||
{
|
||||
if (auto thread = Scripts::FindScriptThread("fm_mission_controller_v3"_J))
|
||||
*ScriptLocal(thread, 32855).At(4, 13).At(3).As<float*>() = 100.0f;
|
||||
}
|
||||
};
|
||||
|
||||
class DisableLaserGrid : public Command
|
||||
{
|
||||
using Command::Command;
|
||||
|
||||
virtual void OnCall() override
|
||||
{
|
||||
if (auto thread = Scripts::FindScriptThread("fm_mission_controller_v3"_J))
|
||||
{
|
||||
*ScriptLocal(thread, 70416).As<int*>() = 4294784;
|
||||
*ScriptGlobal(1935711).As<int*>() |= 1;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
class TakePrimaryTarget : public Command
|
||||
{
|
||||
using Command::Command;
|
||||
|
||||
virtual void OnCall() override
|
||||
{
|
||||
if (auto thread = Scripts::FindScriptThread("fm_mission_controller_v3"_J))
|
||||
*ScriptLocal(thread, 29355).At(11).As<int*>() = 10;
|
||||
}
|
||||
};
|
||||
|
||||
class TakeSecondaryTarget : public Command
|
||||
{
|
||||
using Command::Command;
|
||||
|
||||
virtual void OnCall() override
|
||||
{
|
||||
if (auto thread = Scripts::FindScriptThread("fm_mission_controller_v3"_J))
|
||||
*ScriptLocal(thread, 29355).At(11).As<int*>() = 3;
|
||||
}
|
||||
};
|
||||
|
||||
// --- Setup ---
|
||||
class Setup : public Command
|
||||
{
|
||||
using Command::Command;
|
||||
|
||||
virtual void OnCall() override
|
||||
{
|
||||
int generalBits = -1;
|
||||
if (!_KortzCenterGuardRoutes.GetState()) generalBits &= ~(1 << 5);
|
||||
if (!_KortzCenterGlassCutter.GetState()) generalBits &= ~(1 << 6);
|
||||
if (!_KortzCenterPowerDrills.GetState()) generalBits &= ~(1 << 7);
|
||||
if (!_KortzCenterEMPCharges.GetState()) generalBits &= ~(1 << 8);
|
||||
|
||||
int robberyProg = -1;
|
||||
if (!_KortzCenterScopeOut.GetState()) robberyProg &= ~(1 << 0);
|
||||
if (!_KortzCenterAlphaMail.GetState()) robberyProg &= ~(1 << 1);
|
||||
if (!_KortzCenterHazmat.GetState()) robberyProg &= ~(1 << 2);
|
||||
if (!_KortzCenterStaffKeycard.GetState()) robberyProg &= ~(1 << 3);
|
||||
if (!_KortzCenterTacticalEquip.GetState()) robberyProg &= ~(1 << 4);
|
||||
if (!_KortzCenterHackingDevice.GetState()) robberyProg &= ~(1 << 5);
|
||||
if (!_KortzCenterAccessCode.GetState()) robberyProg &= ~(1 << 6);
|
||||
if (!_KortzCenterUnmarkedWeapons.GetState()) robberyProg &= ~(1 << 7);
|
||||
if (!_KortzCenterCaracara.GetState()) robberyProg &= ~(1 << 8);
|
||||
if (!_KortzCenterAnnihilator.GetState()) robberyProg &= ~(1 << 9);
|
||||
if (!_KortzCenterManchez.GetState()) robberyProg &= ~(1 << 10);
|
||||
if (!_KortzCenterPrepEMP.GetState()) robberyProg &= ~(1 << 11);
|
||||
if (!_KortzCenterGuardShipments.GetState()) robberyProg &= ~(1 << 12);
|
||||
if (!_KortzCenterGuardRoutesPrep.GetState()) robberyProg &= ~(1 << 13);
|
||||
if (!_KortzCenterGlassCutterPrep.GetState()) robberyProg &= ~(1 << 14);
|
||||
if (!_KortzCenterPowerDrillsPrep.GetState()) robberyProg &= ~(1 << 15);
|
||||
|
||||
int scopingBS = _KortzCenterScopeSecondary.GetState() ? -1 : 0;
|
||||
int poiBS = _KortzCenterScopePOI.GetState() ? -1 : 0;
|
||||
int caracaraPrepBS = _KortzCenterCaracaraPrep.GetState() ? -1 : 0;
|
||||
int annihilatorPrepBS = _KortzCenterAnnihilatorPrep.GetState() ? -1 : 0;
|
||||
int manchezPrepBS = _KortzCenterManchezPrep.GetState() ? -1 : 0;
|
||||
int empChargesPrepBS = _KortzCenterEMPChargesPrep.GetState() ? -1 : 0;
|
||||
|
||||
Stats::SetInt("MPX_K26_GENERAL_BS", generalBits);
|
||||
Stats::SetInt("MPX_K26_GENERAL_BS2", -1);
|
||||
Stats::SetInt("MPX_K26_ROBBERY_PROG", robberyProg);
|
||||
Stats::SetInt("MPX_K26_SCOPING_BS", scopingBS);
|
||||
Stats::SetInt("MPX_K26_POI_BS", poiBS);
|
||||
Stats::SetInt("MPX_K26_HEIST_TARGET", _KortzCenterPrimaryTarget.GetState());
|
||||
}
|
||||
};
|
||||
|
||||
static SkipFingerprint _KortzCenterSkipFingerprint{"kortzcenterheistskipfingerprint", "Skip Fingerprint Hack", "Skips fingerprint hacking minigame in computer room"};
|
||||
static SkipSignalNodes _KortzCenterSkipSignalNodes{"kortzcenterheistskipsignalnodes", "Skip Signal Nodes", "Skips signal nodes hacking at vault keypad"};
|
||||
static SkipDataCrack _KortzCenterSkipDataCrack{"kortzcenterheistskipdatacrack", "Skip Data Crack", "Skips data crack minigame"};
|
||||
static CutGlass _KortzCenterCutGlass{"kortzcenterheistcutglass", "Cut Glass", "Cuts display case glass instantly"};
|
||||
static DisableLaserGrid _KortzCenterDisableLaser{"kortzcenterheistdisablelaser", "Disable Laser Grid", "Disables laser security grid"};
|
||||
static TakePrimaryTarget _KortzCenterTakePrimary{"kortzcenterheisttakeprimary", "Take Primary Target", "Takes primary target painting (stand near it)"};
|
||||
static TakeSecondaryTarget _KortzCenterTakeSecondary{"kortzcenterheisttakesecondary", "Take Secondary Target", "Takes secondary loot (stand near it)"};
|
||||
static Setup _KortzCenterSetup{"kortzcenterheistsetup", "Setup", "Sets up Kortz Center heist"};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
#include "KortzCenterHeist.hpp"
|
||||
|
||||
namespace YimMenu::Submenus
|
||||
{
|
||||
std::shared_ptr<TabItem> RenderKortzCenterHeistMenu()
|
||||
{
|
||||
auto tab = std::make_shared<TabItem>("Kortz Center Heist");
|
||||
|
||||
auto target = std::make_shared<Group>("Primary Target", 1);
|
||||
auto general = std::make_shared<Group>("General", 2);
|
||||
|
||||
auto vehicles = std::make_shared<CollapsingHeaderItem>("Vehicles");
|
||||
auto equipment = std::make_shared<CollapsingHeaderItem>("Equipment");
|
||||
auto intel = std::make_shared<CollapsingHeaderItem>("Intel");
|
||||
|
||||
auto action = std::make_shared<Group>("", 1);
|
||||
|
||||
target->AddItem(std::make_shared<ListCommandItem>("kortzcenterheistprimarytarget"_J));
|
||||
|
||||
general->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistguardroutes"_J));
|
||||
general->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistglasscutter"_J));
|
||||
general->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistpowerdrills"_J));
|
||||
general->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistempcharges"_J));
|
||||
|
||||
vehicles->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistcaracara"_J));
|
||||
vehicles->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistannihilator"_J));
|
||||
vehicles->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistmanchez"_J));
|
||||
vehicles->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistcaracaraprep"_J));
|
||||
vehicles->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistannihilatorprep"_J));
|
||||
vehicles->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistmanchezprep"_J));
|
||||
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheisthazmat"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheiststaffkeycard"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheisttacticalequip"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheisthackingdevice"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistaccesscode"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistunmarkedweapons"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistguardshipments"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistprepemp"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistguardroutesprep"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistglasscutterprep"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistpowerdrillsprep"_J));
|
||||
equipment->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistempchargesprep"_J));
|
||||
|
||||
intel->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistscopeout"_J));
|
||||
intel->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistalphamail"_J));
|
||||
intel->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistscopesecondary"_J));
|
||||
intel->AddItem(std::make_shared<BoolCommandItem>("kortzcenterheistscopepoi"_J));
|
||||
|
||||
auto inHeist = std::make_shared<Group>("In-Heist", 2);
|
||||
|
||||
inHeist->AddItem(std::make_shared<CommandItem>("kortzcenterheistskipfingerprint"_J));
|
||||
inHeist->AddItem(std::make_shared<CommandItem>("kortzcenterheistskipsignalnodes"_J));
|
||||
inHeist->AddItem(std::make_shared<CommandItem>("kortzcenterheistskipdatacrack"_J));
|
||||
inHeist->AddItem(std::make_shared<CommandItem>("kortzcenterheistcutglass"_J));
|
||||
inHeist->AddItem(std::make_shared<CommandItem>("kortzcenterheistdisablelaser"_J));
|
||||
inHeist->AddItem(std::make_shared<CommandItem>("kortzcenterheisttakeprimary"_J));
|
||||
inHeist->AddItem(std::make_shared<CommandItem>("kortzcenterheisttakesecondary"_J));
|
||||
|
||||
action->AddItem(std::make_shared<CommandItem>("kortzcenterheistsetup"_J));
|
||||
|
||||
tab->AddItem(target);
|
||||
tab->AddItem(general);
|
||||
tab->AddItem(vehicles);
|
||||
tab->AddItem(equipment);
|
||||
tab->AddItem(intel);
|
||||
tab->AddItem(inHeist);
|
||||
tab->AddItem(action);
|
||||
|
||||
return tab;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
#pragma once
|
||||
#include "game/frontend/submenus/Recovery/HeistModifier.hpp"
|
||||
|
||||
namespace YimMenu::Submenus
|
||||
{
|
||||
std::shared_ptr<TabItem> RenderKortzCenterHeistMenu();
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
#include "Heist/DiamondCasinoHeist.hpp"
|
||||
#include "Heist/CayoPericoHeist.hpp"
|
||||
#include "Heist/DoomsdayHeist.hpp"
|
||||
#include "Heist/KortzCenterHeist.hpp"
|
||||
|
||||
namespace YimMenu::Submenus
|
||||
{
|
||||
@@ -15,6 +16,7 @@ namespace YimMenu::Submenus
|
||||
heistTabBar->AddItem(RenderDiamondCasinoHeistMenu());
|
||||
heistTabBar->AddItem(RenderCayoPericoHeistMenu());
|
||||
heistTabBar->AddItem(RenderDoomsdayHeistMenu());
|
||||
heistTabBar->AddItem(RenderKortzCenterHeistMenu());
|
||||
|
||||
menu->AddItem(std::move(heistTabBar));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user