From 5d5e6fc0027e6d7abf79aa5ca57aa6013c49e77e Mon Sep 17 00:00:00 2001
From: bicatcho11 <151503460+bicatcho11@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:35:01 +0300
Subject: [PATCH] feat: SetVehicleModelIsSuppressed | add more blacklisted
 scenarios (#61)

* BlacklistedScenarios addons

* Update hudcomponents.lua

* Update config.lua

* Update ignore.lua

* Update config.lua

* chore: remove duplicate use of StartAudioScene

* chore: remove whitespace

* chore: config comments

---------

Co-authored-by: ChatDisabled <44729807+ChatDisabled@users.noreply.github.com>
---
 client/ignore.lua |  3 +++
 config.lua        | 67 ++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/client/ignore.lua b/client/ignore.lua
index 23facf9..b6f48ae 100644
--- a/client/ignore.lua
+++ b/client/ignore.lua
@@ -3,6 +3,9 @@ CreateThread(function()
 		for _, sctyp in next, Config.BlacklistedScenarios['TYPES'] do
 			SetScenarioTypeEnabled(sctyp, false)
 		end
+		for _, scmdl in next, Config.BlacklistedScenarios['SUPPRESSED'] do
+			SetVehicleModelIsSuppressed(GetHashKey(model), true)
+		end
 		for _, scgrp in next, Config.BlacklistedScenarios['GROUPS'] do
 			SetScenarioGroupEnabled(scgrp, false)
 		end
diff --git a/config.lua b/config.lua
index 0ded6c8..afdd1d1 100644
--- a/config.lua
+++ b/config.lua
@@ -52,12 +52,70 @@ ConsumablesAlcohol = {
 
 Config.BlacklistedScenarios = {
     ['TYPES'] = {
-        'WORLD_VEHICLE_MILITARY_PLANES_SMALL',
-        'WORLD_VEHICLE_MILITARY_PLANES_BIG',
+        'WORLD_VEHICLE_ATTRACTOR',
         'WORLD_VEHICLE_AMBULANCE',
-        'WORLD_VEHICLE_POLICE_NEXT_TO_CAR',
-        'WORLD_VEHICLE_POLICE_CAR',
+        'WORLD_VEHICLE_BICYCLE_BMX',
+        'WORLD_VEHICLE_BICYCLE_BMX_BALLAS',
+        'WORLD_VEHICLE_BICYCLE_BMX_FAMILY',
+        'WORLD_VEHICLE_BICYCLE_BMX_HARMONY',
+        'WORLD_VEHICLE_BICYCLE_BMX_VAGOS',
+        'WORLD_VEHICLE_BICYCLE_MOUNTAIN',
+        'WORLD_VEHICLE_BICYCLE_ROAD',
+        'WORLD_VEHICLE_BIKE_OFF_ROAD_RACE',
+        'WORLD_VEHICLE_BIKER',
+        'WORLD_VEHICLE_BOAT_IDLE',
+        'WORLD_VEHICLE_BOAT_IDLE_ALAMO',
+        'WORLD_VEHICLE_BOAT_IDLE_MARQUIS',
+        'WORLD_VEHICLE_BOAT_IDLE_MARQUIS',
+        'WORLD_VEHICLE_BROKEN_DOWN',
+        'WORLD_VEHICLE_BUSINESSMEN',
+        'WORLD_VEHICLE_HELI_LIFEGUARD',
+        'WORLD_VEHICLE_CLUCKIN_BELL_TRAILER',
+        'WORLD_VEHICLE_CONSTRUCTION_SOLO',
+        'WORLD_VEHICLE_CONSTRUCTION_PASSENGERS',
+        'WORLD_VEHICLE_DRIVE_PASSENGERS',
+        'WORLD_VEHICLE_DRIVE_PASSENGERS_LIMITED',
+        'WORLD_VEHICLE_DRIVE_SOLO',
+        'WORLD_VEHICLE_FIRE_TRUCK',
+        'WORLD_VEHICLE_EMPTY',
+        'WORLD_VEHICLE_MARIACHI',
+        'WORLD_VEHICLE_MECHANIC',
+        'WORLD_VEHICLE_MILITARY_PLANES_BIG',
+        'WORLD_VEHICLE_MILITARY_PLANES_SMALL',
+        'WORLD_VEHICLE_PARK_PARALLEL',
+        'WORLD_VEHICLE_PARK_PERPENDICULAR_NOSE_IN',
+        'WORLD_VEHICLE_PASSENGER_EXIT',
         'WORLD_VEHICLE_POLICE_BIKE',
+        'WORLD_VEHICLE_POLICE_CAR',
+        'WORLD_VEHICLE_POLICE',
+        'WORLD_VEHICLE_POLICE_NEXT_TO_CAR',
+        'WORLD_VEHICLE_QUARRY',
+        'WORLD_VEHICLE_SALTON',
+        'WORLD_VEHICLE_SALTON_DIRT_BIKE',
+        'WORLD_VEHICLE_SECURITY_CAR',
+        'WORLD_VEHICLE_STREETRACE',
+        'WORLD_VEHICLE_TOURBUS',
+        'WORLD_VEHICLE_TOURIST',
+        'WORLD_VEHICLE_TANDL',
+        'WORLD_VEHICLE_TRACTOR',
+        'WORLD_VEHICLE_TRACTOR_BEACH',
+        'WORLD_VEHICLE_TRUCK_LOGS',
+        'WORLD_VEHICLE_TRUCKS_TRAILERS',
+        'WORLD_VEHICLE_DISTANT_EMPTY_GROUND',
+    },
+    -- These vehicles will be stopped from being spawned in traffic only. (unsure if this affects car generators as well)
+    ['SUPPRESSED'] = {
+        "SHAMAL",
+        "LUXOR",
+        "LUXOR2",
+        "LAZER",
+        "TITAN",
+        "CRUSADER",
+        "RHINO",
+        "AIRTUG",
+        "RIPLEY",
+        "SUNTRAP",
+	"BLIMP",
     },
     ['GROUPS'] = {
         2017590552,
@@ -67,6 +125,7 @@ Config.BlacklistedScenarios = {
     }
 }
 
+-- these vehicles will always be deleted once anything tries to create them.
 Config.BlacklistedVehs = {
     [`SHAMAL`] = true,
     [`LUXOR`] = true,