ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

chore: Remove patched toxic features (#709)

Browse Source
This commit is contained in:
Yimura 2022-12-16 22:12:01 +01:00 committed by GitHub
parent f2f3c28048
commit d728fabe14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/util/toxic.hpp
View File

@ -32,51 +32,6 @@ namespace big::toxic
blame_explode_coord(to_blame, coords, explosion_type, damage, is_audible, is_invisible, camera_shake);
}
inline void ceo_kick(player_ptr target)
{
auto leader = *scr_globals::gpbd_fm_3.at(target->id(), scr_globals::size::gpbd_fm_3).at(10).as<int*>();
if (leader == -1)
g_notification_service->push_warning("CEO Kick", "Player is not in a CEO/MC");
else if (leader == target->id())
{
// use "normal" method to remove from CEO
const size_t arg_count = 4;
int64_t args[arg_count] = {
(int64_t)eRemoteEvent::CeoKick,
(int64_t)self::id,
FALSE,
5
};
g_pointers->m_trigger_script_event(1, args, arg_count, 1 << target->id());
}
else
{
// use a more private method to remove associate
const size_t arg_count = 3;
int64_t args[arg_count] = {
(int64_t)eRemoteEvent::MarkPlayerAsBeast,
(int64_t)self::id,
leader
};
g_pointers->m_trigger_script_event(1, args, arg_count, 1 << target->id());
}
}
inline void ceo_ban(player_ptr target)
{
const size_t arg_count = 3;
int64_t args[arg_count] = {
(int64_t)eRemoteEvent::CeoBan,
(int64_t)self::id,
TRUE
};
g_pointers->m_trigger_script_event(1, args, arg_count, 1 << target->id());
}
inline void send_player_to_island(player_ptr target)
{
const size_t arg_count = 2;
@ -198,34 +153,6 @@ namespace big::toxic
g_pointers->m_trigger_script_event(1, args, arg_count, 1 << target->id());
}
inline void turn_player_into_animal(player_ptr target)
{
bool bOldPlayerControl = PLAYER::IS_PLAYER_CONTROL_ON(target->id());
for (int i = 0; i < 30; i++)
{
session::give_collectible(target->id(), eCollectibleType::Treat, 0, false);
session::give_collectible(target->id(), eCollectibleType::Treat, 0, true);
g_pointers->m_give_pickup_rewards(1 << target->id(), REWARD_HEALTH); // try to keep them alive
g_pointers->m_give_pickup_rewards(1 << target->id(), REWARD_ARMOUR);
script::get_current()->yield(400ms);
Ped playerPed = PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(target->id());
Hash model = ENTITY::GET_ENTITY_MODEL(playerPed);
if (bOldPlayerControl && !PLAYER::IS_PLAYER_CONTROL_ON(target->id()))
return;
if (model != RAGE_JOAAT("mp_m_freemode_01") && model != RAGE_JOAAT("mp_f_freemode_01"))
return;
if (ENTITY::IS_ENTITY_DEAD(playerPed, FALSE))
script::get_current()->yield(7s);
}
g_notification_service->push_warning("Turn to Animal", "Failed to turn player into an animal");
}
inline void set_wanted_level(player_ptr target, int wanted_level)
{
int id = target->id();

16
src/views/network/view_session.cpp
View File

@ -163,22 +163,6 @@ namespace big
ImGui::SameLine();
components::button("Remove All Weapons", [] { g_player_service->iterate([](auto& plyr) { toxic::remove_all_weapons(plyr.second); }); });
components::button("CEO Kick", [] {
g_player_service->iterate([](auto& plyr)
{
if (*scr_globals::gpbd_fm_3.at(plyr.second->id(), scr_globals::size::gpbd_fm_3).at(10).as<int*>() != -1)
toxic::ceo_kick(plyr.second);
});
});
components::button("CEO Ban", [] {
g_player_service->iterate([](auto& plyr)
{
if (*scr_globals::gpbd_fm_3.at(plyr.second->id(), scr_globals::size::gpbd_fm_3).at(10).as<int*>() != -1)
toxic::ceo_ban(plyr.second);
});
});
components::small_text("Teleports");
if (ImGui::BeginCombo("##apartment", apartment_names[g->session.send_to_apartment_idx]))

7
src/views/players/player/player_toxic.cpp
View File

@ -15,18 +15,11 @@ namespace big
toxic::kill_player(g_player_service->get_selected(), g_player_service->get_self());
});
components::button("CEO Kick", [] { toxic::ceo_kick(g_player_service->get_selected()); });
ImGui::SameLine();
components::button("CEO Ban", [] { toxic::ceo_ban(g_player_service->get_selected()); });
components::button("Kick From Vehicle", [] { toxic::kick_player_from_vehicle(g_player_service->get_selected()); });
ImGui::SameLine();
components::button("Ragdoll Player", [] { toxic::ragdoll_player(g_player_service->get_selected()); });
components::button("Kick From Interior", [] { toxic::kick_player_from_interior(g_player_service->get_selected()); });
components::button("Turn Into Animal", [] { toxic::turn_player_into_animal(g_player_service->get_selected()); });
if (ImGui::IsItemHovered())
ImGui::SetTooltip("Turns player into a random animal");
ImGui::SameLine();
components::button("Turn Into Beast", [] { toxic::turn_player_into_beast(g_player_service->get_selected()); });