feat(TSE): Added protection against more script hashes

fixes #205
This commit is contained in:
Yimura 2022-05-16 00:56:15 +02:00
parent f086efc4a6
commit 790d47932d
No known key found for this signature in database
GPG Key ID: 3D8FF4397E768682
4 changed files with 24 additions and 4 deletions

View File

@ -114,9 +114,11 @@ namespace big
CeoKick = 248967238, CeoKick = 248967238,
CeoMoney = 1890277845, CeoMoney = 1890277845,
ClearWantedLevel = -91354030, ClearWantedLevel = -91354030,
Crash = -1386010354,
FakeDeposit = 677240627, FakeDeposit = 677240627,
ForceMission = 2020588206, ForceMission = 2020588206,
GtaBanner = 1572255940, GtaBanner = 1572255940,
MCTeleport = 962740265,
NetworkBail = 1228916411, NetworkBail = 1228916411,
PersonalVehicleDestroyed = 802133775, PersonalVehicleDestroyed = 802133775,
RemoteOffradar = -391633760, RemoteOffradar = -391633760,

View File

@ -46,10 +46,12 @@ namespace big
pair ceo_kick{}; pair ceo_kick{};
pair ceo_money{}; pair ceo_money{};
pair clear_wanted_level{}; pair clear_wanted_level{};
pair crash{};
pair fake_deposit{}; pair fake_deposit{};
pair force_mission{}; pair force_mission{};
pair force_teleport{}; pair force_teleport{};
pair gta_banner{}; pair gta_banner{};
pair mc_teleport{};
pair network_bail{}; pair network_bail{};
pair personal_vehicle_destroyed{}; pair personal_vehicle_destroyed{};
pair remote_off_radar{}; pair remote_off_radar{};
@ -96,10 +98,12 @@ namespace big
bool ceo_kick = true; bool ceo_kick = true;
bool ceo_money = true; bool ceo_money = true;
bool clear_wanted_level = true; bool clear_wanted_level = true;
bool crash = true;
bool fake_deposit = true; bool fake_deposit = true;
bool force_mission = true; bool force_mission = true;
bool force_teleport = true; bool force_teleport = true;
bool gta_banner = true; bool gta_banner = true;
bool mc_teleport = true;
bool network_bail = true; bool network_bail = true;
bool personal_vehicle_destroyed = true; bool personal_vehicle_destroyed = true;
bool remote_off_radar = true; bool remote_off_radar = true;
@ -348,6 +352,8 @@ namespace big
script_handler.ceo_money.notify = script_handler_j["ceo_money"]["notify"]; script_handler.ceo_money.notify = script_handler_j["ceo_money"]["notify"];
script_handler.clear_wanted_level.log = script_handler_j["clear_wanted_level"]["log"]; script_handler.clear_wanted_level.log = script_handler_j["clear_wanted_level"]["log"];
script_handler.clear_wanted_level.notify = script_handler_j["clear_wanted_level"]["notify"]; script_handler.clear_wanted_level.notify = script_handler_j["clear_wanted_level"]["notify"];
script_handler.crash.log = script_handler_j["crash"]["log"];
script_handler.crash.notify = script_handler_j["crash"]["notify"];
script_handler.fake_deposit.log = script_handler_j["fake_deposit"]["log"]; script_handler.fake_deposit.log = script_handler_j["fake_deposit"]["log"];
script_handler.fake_deposit.notify = script_handler_j["fake_deposit"]["notify"]; script_handler.fake_deposit.notify = script_handler_j["fake_deposit"]["notify"];
script_handler.force_mission.log = script_handler_j["force_mission"]["log"]; script_handler.force_mission.log = script_handler_j["force_mission"]["log"];
@ -356,6 +362,8 @@ namespace big
script_handler.force_teleport.notify = script_handler_j["force_teleport"]["notify"]; script_handler.force_teleport.notify = script_handler_j["force_teleport"]["notify"];
script_handler.gta_banner.log = script_handler_j["gta_banner"]["log"]; script_handler.gta_banner.log = script_handler_j["gta_banner"]["log"];
script_handler.gta_banner.notify = script_handler_j["gta_banner"]["notify"]; script_handler.gta_banner.notify = script_handler_j["gta_banner"]["notify"];
script_handler.mc_teleport.log = script_handler_j["mc_teleport"]["log"];
script_handler.mc_teleport.notify = script_handler_j["mc_teleport"]["notify"];
script_handler.network_bail.log = script_handler_j["network_bail"]["log"]; script_handler.network_bail.log = script_handler_j["network_bail"]["log"];
script_handler.network_bail.notify = script_handler_j["network_bail"]["notify"]; script_handler.network_bail.notify = script_handler_j["network_bail"]["notify"];
script_handler.personal_vehicle_destroyed.log = script_handler_j["personal_vehicle_destroyed"]["log"]; script_handler.personal_vehicle_destroyed.log = script_handler_j["personal_vehicle_destroyed"]["log"];
@ -393,10 +401,12 @@ namespace big
script_handler.ceo_kick = script_handler_j["ceo_kick"]; script_handler.ceo_kick = script_handler_j["ceo_kick"];
script_handler.ceo_money = script_handler_j["ceo_money"]; script_handler.ceo_money = script_handler_j["ceo_money"];
script_handler.clear_wanted_level = script_handler_j["clear_wanted_level"]; script_handler.clear_wanted_level = script_handler_j["clear_wanted_level"];
script_handler.crash = script_handler_j["crash"];
script_handler.fake_deposit = script_handler_j["fake_deposit"]; script_handler.fake_deposit = script_handler_j["fake_deposit"];
script_handler.force_mission = script_handler_j["force_mission"]; script_handler.force_mission = script_handler_j["force_mission"];
script_handler.force_teleport = script_handler_j["force_teleport"]; script_handler.force_teleport = script_handler_j["force_teleport"];
script_handler.gta_banner = script_handler_j["gta_banner"]; script_handler.gta_banner = script_handler_j["gta_banner"];
script_handler.mc_teleport = script_handler_j["mc_teleport"];
script_handler.network_bail = script_handler_j["network_bail"]; script_handler.network_bail = script_handler_j["network_bail"];
script_handler.personal_vehicle_destroyed = script_handler_j["personal_vehicle_destroyed"]; script_handler.personal_vehicle_destroyed = script_handler_j["personal_vehicle_destroyed"];
script_handler.remote_off_radar = script_handler_j["remote_off_radar"]; script_handler.remote_off_radar = script_handler_j["remote_off_radar"];
@ -555,10 +565,12 @@ namespace big
{ "ceo_kick", return_notify_pair(script_handler_notifications.ceo_kick) }, { "ceo_kick", return_notify_pair(script_handler_notifications.ceo_kick) },
{ "ceo_money", return_notify_pair(script_handler_notifications.ceo_money) }, { "ceo_money", return_notify_pair(script_handler_notifications.ceo_money) },
{ "clear_wanted_level", return_notify_pair(script_handler_notifications.clear_wanted_level) }, { "clear_wanted_level", return_notify_pair(script_handler_notifications.clear_wanted_level) },
{ "crash", return_notify_pair(script_handler_notifications.crash) },
{ "fake_deposit", return_notify_pair(script_handler_notifications.fake_deposit) }, { "fake_deposit", return_notify_pair(script_handler_notifications.fake_deposit) },
{ "force_mission", return_notify_pair(script_handler_notifications.force_mission) }, { "force_mission", return_notify_pair(script_handler_notifications.force_mission) },
{ "force_teleport", return_notify_pair(script_handler_notifications.force_teleport) }, { "force_teleport", return_notify_pair(script_handler_notifications.force_teleport) },
{ "gta_banner", return_notify_pair(script_handler_notifications.gta_banner) }, { "gta_banner", return_notify_pair(script_handler_notifications.gta_banner) },
{ "mc_teleport", return_notify_pair(script_handler_notifications.mc_teleport) },
{ "network_bail", return_notify_pair(script_handler_notifications.network_bail) }, { "network_bail", return_notify_pair(script_handler_notifications.network_bail) },
{ "personal_vehicle_destroyed", return_notify_pair(script_handler_notifications.personal_vehicle_destroyed) }, { "personal_vehicle_destroyed", return_notify_pair(script_handler_notifications.personal_vehicle_destroyed) },
{ "remote_off_radar", return_notify_pair(script_handler_notifications.remote_off_radar) }, { "remote_off_radar", return_notify_pair(script_handler_notifications.remote_off_radar) },
@ -585,10 +597,12 @@ namespace big
{ "ceo_kick", script_handler_protections.ceo_kick }, { "ceo_kick", script_handler_protections.ceo_kick },
{ "ceo_money", script_handler_protections.ceo_money }, { "ceo_money", script_handler_protections.ceo_money },
{ "clear_wanted_level", script_handler_protections.clear_wanted_level }, { "clear_wanted_level", script_handler_protections.clear_wanted_level },
{ "crash", script_handler_protections.crash },
{ "fake_deposit", script_handler_protections.fake_deposit }, { "fake_deposit", script_handler_protections.fake_deposit },
{ "force_mission", script_handler_protections.force_mission }, { "force_mission", script_handler_protections.force_mission },
{ "force_teleport", script_handler_protections.force_teleport }, { "force_teleport", script_handler_protections.force_teleport },
{ "gta_banner", script_handler_protections.gta_banner }, { "gta_banner", script_handler_protections.gta_banner },
{ "mc_teleport", script_handler_protections.mc_teleport },
{ "network_bail", script_handler_protections.network_bail }, { "network_bail", script_handler_protections.network_bail },
{ "personal_vehicle_destroyed", script_handler_protections.personal_vehicle_destroyed }, { "personal_vehicle_destroyed", script_handler_protections.personal_vehicle_destroyed },
{ "remote_off_radar", script_handler_protections.remote_off_radar }, { "remote_off_radar", script_handler_protections.remote_off_radar },

View File

@ -60,7 +60,7 @@ namespace big
draw_pair_option("CEO Ban", script_event_handler.ceo_ban); draw_pair_option("CEO Ban", script_event_handler.ceo_ban);
draw_pair_option("CEO Kick", script_event_handler.ceo_kick); draw_pair_option("CEO Kick", script_event_handler.ceo_kick);
draw_pair_option("CEO Money", script_event_handler.ceo_money); draw_pair_option("CEO Money", script_event_handler.ceo_money);
draw_pair_option("Wanted Level", script_event_handler.clear_wanted_level); draw_pair_option("Destroy Personal Vehicle", script_event_handler.personal_vehicle_destroyed);
draw_pair_option("Fake Deposit", script_event_handler.fake_deposit); draw_pair_option("Fake Deposit", script_event_handler.fake_deposit);
draw_pair_option("Force Mission", script_event_handler.force_mission); draw_pair_option("Force Mission", script_event_handler.force_mission);
ImGui::EndGroup(); ImGui::EndGroup();
@ -70,21 +70,23 @@ namespace big
ImGui::BeginGroup(); ImGui::BeginGroup();
draw_pair_option("Force Teleport", script_event_handler.force_teleport); draw_pair_option("Force Teleport", script_event_handler.force_teleport);
draw_pair_option("GTA Banner", script_event_handler.gta_banner); draw_pair_option("GTA Banner", script_event_handler.gta_banner);
draw_pair_option("MC Teleport", script_event_handler.mc_teleport);
draw_pair_option("Network Bail", script_event_handler.network_bail); draw_pair_option("Network Bail", script_event_handler.network_bail);
draw_pair_option("Destroy Personal Vehicle", script_event_handler.personal_vehicle_destroyed);
draw_pair_option("Remote Off Radar", script_event_handler.remote_off_radar); draw_pair_option("Remote Off Radar", script_event_handler.remote_off_radar);
draw_pair_option("Rotate Cam", script_event_handler.rotate_cam); draw_pair_option("Rotate Cam", script_event_handler.rotate_cam);
draw_pair_option("Send to Cutscene", script_event_handler.send_to_cutscene);
ImGui::EndGroup(); ImGui::EndGroup();
ImGui::SameLine(); ImGui::SameLine();
ImGui::BeginGroup(); ImGui::BeginGroup();
draw_pair_option("Send to Cutscene", script_event_handler.send_to_cutscene);
draw_pair_option("Send to Island", script_event_handler.send_to_island); draw_pair_option("Send to Island", script_event_handler.send_to_island);
draw_pair_option("Sound Spam", script_event_handler.sound_spam); draw_pair_option("Sound Spam", script_event_handler.sound_spam);
draw_pair_option("Spectate", script_event_handler.spectate); draw_pair_option("Spectate", script_event_handler.spectate);
draw_pair_option("Transaction Error", script_event_handler.transaction_error); draw_pair_option("Transaction Error", script_event_handler.transaction_error);
draw_pair_option("TSE Crash", script_event_handler.crash);
draw_pair_option("Vehicle Kick", script_event_handler.vehicle_kick); draw_pair_option("Vehicle Kick", script_event_handler.vehicle_kick);
draw_pair_option("Wanted Level", script_event_handler.clear_wanted_level);
ImGui::EndGroup(); ImGui::EndGroup();
components::small_text("Other"); components::small_text("Other");

View File

@ -9,7 +9,7 @@ namespace big
ImGui::Checkbox("CEO Ban", &g->protections.script_events.ceo_ban); ImGui::Checkbox("CEO Ban", &g->protections.script_events.ceo_ban);
ImGui::Checkbox("CEO Kick", &g->protections.script_events.ceo_kick); ImGui::Checkbox("CEO Kick", &g->protections.script_events.ceo_kick);
ImGui::Checkbox("CEO Money", &g->protections.script_events.ceo_money); ImGui::Checkbox("CEO Money", &g->protections.script_events.ceo_money);
ImGui::Checkbox("Wanted Level", &g->protections.script_events.clear_wanted_level); ImGui::Checkbox("TSE Crash", &g->protections.script_events.crash);
ImGui::Checkbox("Fake Deposit", &g->protections.script_events.fake_deposit); ImGui::Checkbox("Fake Deposit", &g->protections.script_events.fake_deposit);
ImGui::Checkbox("Force Mission", &g->protections.script_events.force_mission); ImGui::Checkbox("Force Mission", &g->protections.script_events.force_mission);
ImGui::EndGroup(); ImGui::EndGroup();
@ -19,6 +19,7 @@ namespace big
ImGui::BeginGroup(); ImGui::BeginGroup();
ImGui::Checkbox("Force Teleport", &g->protections.script_events.force_teleport); ImGui::Checkbox("Force Teleport", &g->protections.script_events.force_teleport);
ImGui::Checkbox("GTA Banner", &g->protections.script_events.gta_banner); ImGui::Checkbox("GTA Banner", &g->protections.script_events.gta_banner);
ImGui::Checkbox("MC Teleport", &g->protections.script_events.mc_teleport);
ImGui::Checkbox("Network Bail", &g->protections.script_events.network_bail); ImGui::Checkbox("Network Bail", &g->protections.script_events.network_bail);
ImGui::Checkbox("Personal Vehicle Destroyed", &g->protections.script_events.personal_vehicle_destroyed); ImGui::Checkbox("Personal Vehicle Destroyed", &g->protections.script_events.personal_vehicle_destroyed);
ImGui::Checkbox("Remote Off Radar", &g->protections.script_events.remote_off_radar); ImGui::Checkbox("Remote Off Radar", &g->protections.script_events.remote_off_radar);
@ -34,6 +35,7 @@ namespace big
ImGui::Checkbox("Spectate", &g->protections.script_events.spectate); ImGui::Checkbox("Spectate", &g->protections.script_events.spectate);
ImGui::Checkbox("Transaction Error", &g->protections.script_events.transaction_error); ImGui::Checkbox("Transaction Error", &g->protections.script_events.transaction_error);
ImGui::Checkbox("Vehicle Kick", &g->protections.script_events.vehicle_kick); ImGui::Checkbox("Vehicle Kick", &g->protections.script_events.vehicle_kick);
ImGui::Checkbox("Wanted Level", &g->protections.script_events.clear_wanted_level);
ImGui::EndGroup(); ImGui::EndGroup();
} }