diff --git a/src/core/scr_globals.hpp b/src/core/scr_globals.hpp index 13722eea..50397fc1 100644 --- a/src/core/scr_globals.hpp +++ b/src/core/scr_globals.hpp @@ -4,19 +4,19 @@ namespace big::scr_globals { - static inline const script_global gsbd(2648918); - static inline const script_global gsbd_fm(1845263); + static inline const script_global gsbd(2648938); + static inline const script_global gsbd_fm(1845281); static inline const script_global gsbd_kicking(1877042); - static inline const script_global gsbd_fm_events(1916087); - static inline const script_global gsbd_block_c(2652572); - static inline const script_global gsbd_property_instances(1936138); - - static inline const script_global globalplayer_bd(2657921); - static inline const script_global gpbd_fm_3(1886967); - static inline const script_global gpbd_fm_1(1845263); - static inline const script_global interiors(1942781); - - static inline const script_global launcher_global(2698947); + static inline const script_global gsbd_fm_events(1916617); + static inline const script_global gsbd_block_c(2657971); + static inline const script_global gsbd_property_instances(1936863); + + static inline const script_global globalplayer_bd(2657971); + static inline const script_global gpbd_fm_3(1887305); + static inline const script_global gpbd_fm_1(1845281); + static inline const script_global interiors(1943520); + + static inline const script_global launcher_global(2699171); static inline const script_global sp(114370); // check flow_controller static inline const script_global mission_definition(92160); // standard_global_init (66, "agency_heist1", "AH1", 230, 1, 1, -1, -1, 8192) @@ -24,81 +24,81 @@ namespace big::scr_globals // creator globals usually remain the same after updates static inline const script_global creator_job_metadata(4718592); static inline const script_global terminate_creator(1574607); // NETWORK::NETWORK_BAIL(1, 0, 0); fm_*_creator - static inline const script_global switch_struct(1574632); + static inline const script_global switch_struct(1574633); static inline const script_global mission_creator_radar_follows_camera(2621443); static inline const script_global mission_creator_exited(1574530); - static inline const script_global in_multiplayer(79248); // g_bInMultiplayer - static inline const script_global transition_state(1575008); - static inline const script_global sctv_spectator(2697509); // pausemenu_multiplayer function 0xE49C42EC + static inline const script_global in_multiplayer(79389); // g_bInMultiplayer + static inline const script_global transition_state(1575011); + static inline const script_global sctv_spectator(2697731); // pausemenu_multiplayer function 0xE49C42EC - static inline const script_global vehicle_global(1586504); + static inline const script_global vehicle_global(1586521); - static inline const script_global freemode_properties(2672741); - static inline const script_global freemode_global(2738587); - - static inline const script_global spawn_global(2695991); - - static inline const script_global dance_state(1942774); - - static inline const script_global transaction_overlimit(20796); + static inline const script_global freemode_properties(2672855); + static inline const script_global freemode_global(2738934); + + static inline const script_global spawn_global(2696212); + + static inline const script_global dance_state(1943520); + + static inline const script_global transaction_overlimit(20913); static inline const script_global stats(2359296); static inline const script_global session(1574589); - static inline const script_global session2(1575032); - static inline const script_global session3(32829); - static inline const script_global session4(1574941); - static inline const script_global session5(1575007); - static inline const script_global session6(2695909); + static inline const script_global session2(1575035); + static inline const script_global session3(32949); + static inline const script_global session4(1574942); + static inline const script_global session5(1575010); + static inline const script_global session6(2696130); // freemode -> if (NETWORK::NETWORK_IS_GAME_IN_PROGRESS() && !NETWORK::NETWORK_IS_ACTIVITY_SESSION()) - static inline const script_global gun_van(1948900); + static inline const script_global interaction_menu_access(2710429); // am_pi_menu -> if (NETWORK::NETWORK_IS_SIGNED_ONLINE()) first global after that + + static inline const script_global disable_wasted_sound(2707679); // freemode -> AUDIO::PLAY_SOUND_FRONTEND(-1, "Wasted", "POWER_PLAY_General_Soundset", true); + + static inline const script_global passive(1574582); // if (((!PED::IS_PED_IN_ANY_VEHICLE(PLAYER::GET_PLAYER_PED(bVar1), false) || Global_ + + static inline const script_global property_garage(1586521); + static inline const script_global property_names(1312298); - static inline const script_global interaction_menu_access(2710115); // am_pi_menu -> PI_BIK_13_2_H -> global = true; + static inline const script_global reset_clothing(104077); // freemode 75, &iLocal_.*, 2\); - static inline const script_global disable_wasted_sound(2707352); // freemode -> AUDIO::PLAY_SOUND_FRONTEND(-1, "Wasted", "POWER_PLAY_General_Soundset", true); - - static inline const script_global passive(1574582); - - static inline const script_global property_garage(1936959); - static inline const script_global property_names(1312263); - - static inline const script_global reset_clothing(103936); // freemode 75, &iLocal_.*, 2\); + static inline const script_global gun_van(1949748); // return -29.532f, 6435.136f, 31.162f; } namespace big::scr_locals { namespace am_hunt_the_beast { - constexpr static auto broadcast_idx = 602; - constexpr static auto player_broadcast_idx = 2586; + constexpr static auto broadcast_idx = 607; // (bParam0) != 0; + constexpr static auto player_broadcast_idx = 2588; // if (NETWORK::PARTICIPANT_ID_TO_INT() != -1) } namespace am_criminal_damage { - constexpr static auto broadcast_idx = 113; - constexpr static auto score_idx = 108; + constexpr static auto broadcast_idx = 115; // /* Tunable: CRIMINAL_DAMAGE_DISABLE_SHARE_CASH */) + constexpr static auto score_idx = 110; // AUDIO::PLAY_SOUND_FRONTEND(-1, "Criminal_Damage_High_Value", "GTAO_FM_Events_Soundset", false); } namespace am_cp_collection { - constexpr static auto broadcast_idx = 818; - constexpr static auto player_broadcast_idx = 3459; + constexpr static auto broadcast_idx = 820; // bVar1 = NETWORK::NETWORK_GET_PLAYER_INDEX(PLAYER::INT_TO_PARTICIPANTINDEX(iVar0)); + constexpr static auto player_broadcast_idx = 3461; // bVar1 = NETWORK::NETWORK_GET_PLAYER_INDEX(PLAYER::INT_TO_PARTICIPANTINDEX(iVar0)); } namespace am_king_of_the_castle { - constexpr static auto broadcast_idx = 96; + constexpr static auto broadcast_idx = 98; // KING_OF_THE_CASTLE_EVENT_TIME_LIMIT } namespace fmmc_launcher { - constexpr static auto broadcast_idx = 12327; + constexpr static auto broadcast_idx = 12564; // if (NETWORK::NETWORK_IS_PLAYER_ACTIVE(PLAYER::INT_TO_PLAYERINDEX(Global_ } namespace fm_mission_controller { - constexpr static auto mission_controller_wanted_state_flags = 60051; + constexpr static auto mission_controller_wanted_state_flags = 60096; // if (PLAYER::GET_PLAYER_WANTED_LEVEL(bLocal_ } namespace freemode @@ -118,4 +118,4 @@ namespace big::scr_locals inline static auto vehicle_state = 638; //P"4F ? ? 46 ? ? 4F ? ?" +4 W ="vehicle_ent_id" inline static auto vehicle_ent_id = 409; //P"4F ? ? 47 ? ? 39 ? 55 ? ? 38 ? 73" +4 W ="vehicle_ent_id" } -} \ No newline at end of file +} diff --git a/src/util/mobile.hpp b/src/util/mobile.hpp index 6f557809..11cc751a 100644 --- a/src/util/mobile.hpp +++ b/src/util/mobile.hpp @@ -31,27 +31,27 @@ namespace big::mobile { inline void request_ammo_drop() { - *scr_globals::freemode_global.at(891).as() = 1; + *scr_globals::freemode_global.at(906).as() = 1; } inline void request_boat_pickup() { - *scr_globals::freemode_global.at(892).as() = 1; + *scr_globals::freemode_global.at(907).as() = 1; } inline void request_helicopter_pickup() { - *scr_globals::freemode_global.at(893).as() = 1; + *scr_globals::freemode_global.at(908).as() = 1; } inline void request_backup_helicopter() { - *scr_globals::freemode_global.at(4491).as() = 1; + *scr_globals::freemode_global.at(4506).as() = 1; } inline void request_airstrike() { - *scr_globals::freemode_global.at(4492).as() = 1; + *scr_globals::freemode_global.at(4507).as() = 1; } } @@ -90,12 +90,12 @@ namespace big::mobile { inline void request_bullshark_testosterone() { - *scr_globals::freemode_properties.at(3694).as() = 1; + *scr_globals::freemode_properties.at(3733).as() = 1; } inline void request_ballistic_armor() //i think this is a ceo ability atleast? { - *scr_globals::freemode_global.at(896).as() = 1; + *scr_globals::freemode_global.at(906).as() = 1; } } @@ -103,32 +103,32 @@ namespace big::mobile { inline void request_avenger() { - *scr_globals::freemode_global.at(938).as() = 1; + *scr_globals::freemode_global.at(953).as() = 1; } inline void request_kosatka() { - *scr_globals::freemode_global.at(960).as() = 1; + *scr_globals::freemode_global.at(975).as() = 1; } inline void request_mobile_operations_center() { - *scr_globals::freemode_global.at(930).as() = 1; + *scr_globals::freemode_global.at(945).as() = 1; } inline void request_terrorbyte() { - *scr_globals::freemode_global.at(943).as() = 1; + *scr_globals::freemode_global.at(958).as() = 1; } inline void request_acidlab() { - *scr_globals::freemode_global.at(944).as() = 1; + *scr_globals::freemode_global.at(959).as() = 1; } inline void request_acidlab_bike() { - *scr_globals::freemode_global.at(994).as() = 1; + *scr_globals::freemode_global.at(1009).as() = 1; } } @@ -136,12 +136,12 @@ namespace big::mobile { inline Vehicle get_personal_vehicle() { - return *scr_globals::freemode_global.at(299).as(); + return *scr_globals::freemode_global.at(301).as(); } inline void summon_vehicle_by_index(int veh_idx) { - if (*scr_globals::freemode_global.at(985).as() != -1) + if (*scr_globals::freemode_global.at(1000).as() != -1) return g_notification_service.push_warning("VEHICLE"_T.data(), "VEHICLE_MECHANIC_BUSY"_T.data()); if (g.clone_pv.spawn_inside && self::veh) @@ -156,11 +156,11 @@ namespace big::mobile // only do this when spawn inside is enabled otherwise the vehicle will spawn relatively far away from players if (g.clone_pv.spawn_inside) { - *scr_globals::freemode_global.at(942).as() = 1; // disable vehicle node distance check + *scr_globals::freemode_global.at(957).as() = 1; // disable vehicle node distance check } - *scr_globals::freemode_global.at(928).as() = 1; // tell freemode to spawn our vehicle - *scr_globals::freemode_global.at(988).as() = 0; // required - *scr_globals::freemode_global.at(985).as() = veh_idx; + *scr_globals::freemode_global.at(943).as() = 1; // tell freemode to spawn our vehicle + *scr_globals::freemode_global.at(1003).as() = 0; // required + *scr_globals::freemode_global.at(1000).as() = veh_idx; script::get_current()->yield(100ms); @@ -175,7 +175,7 @@ namespace big::mobile } // blocking call till vehicle is delivered - notify::busy_spinner("Delivering vehicle...", scr_globals::freemode_global.at(985).as(), -1); + notify::busy_spinner("Delivering vehicle...", scr_globals::freemode_global.at(1000).as(), -1); if (g.clone_pv.spawn_inside) { @@ -188,7 +188,7 @@ namespace big::mobile { inline void request_taxi() { - *scr_globals::freemode_global.at(853).as() = 1; + *scr_globals::freemode_global.at(868).as() = 1; } inline void request_gun_van() diff --git a/src/util/outfit.hpp b/src/util/outfit.hpp index c053016a..1a8a8544 100644 --- a/src/util/outfit.hpp +++ b/src/util/outfit.hpp @@ -54,28 +54,29 @@ namespace big::outfit item->texture_id = -1; } + // usually each update increases 1// inline char* get_slot_name_address(int slot) { - return scr_globals::stats.at(0, 5568).at(681).at(2461).at(slot, 8).as(); + return scr_globals::stats.at(0, 5568).at(681).at(2462).at(slot, 8).as(); } - + inline int* get_component_drawable_id_address(int slot, int id) { - return scr_globals::stats.at(0, 5568).at(681).at(1336).at(slot, 13).at(id, 1).as(); + return scr_globals::stats.at(0, 5568).at(681).at(1338).at(slot, 13).at(id, 1).as(); } - + inline int* get_component_texture_id_address(int slot, int id) { - return scr_globals::stats.at(0, 5568).at(681).at(1610).at(slot, 13).at(id, 1).as(); + return scr_globals::stats.at(0, 5568).at(681).at(1612).at(slot, 13).at(id, 1).as(); } - + inline int* get_prop_drawable_id_address(int slot, int id) { - return scr_globals::stats.at(0, 5568).at(681).at(1884).at(slot, 10).at(id, 1).as(); + return scr_globals::stats.at(0, 5568).at(681).at(1886).at(slot, 10).at(id, 1).as(); } - + inline int* get_prop_texture_id_address(int slot, int id) { - return scr_globals::stats.at(0, 5568).at(681).at(2095).at(slot, 10).at(id, 1).as(); + return scr_globals::stats.at(0, 5568).at(681).at(2097).at(slot, 10).at(id, 1).as(); } }