Remove meta files, bl scenarios, and added lib (#63)

* Remove meta files, bl scenarios, and added lib * Added back empty config table and code * Update client/ignore.lua Co-authored-by: Solareon <[email protected]> --------- Co-authored-by: Matthew <[email protected]> Co-authored-by: Solareon <[email protected]>
Qbox-project · Feb 7, 2024 · 2e5b9de · 2e5b9de
1 parent cb33f40
commit 2e5b9de
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 6,678 deletions.
diff --git a/client/ignore.lua b/client/ignore.lua
@@ -4,7 +4,7 @@ CreateThread(function()
 			SetScenarioTypeEnabled(sctyp, false)
 		end
 		for _, scmdl in next, Config.BlacklistedScenarios['SUPPRESSED'] do
-			SetVehicleModelIsSuppressed(GetHashKey(model), true)
+			SetVehicleModelIsSuppressed(joaat(scmdl), true)
 		end
 		for _, scgrp in next, Config.BlacklistedScenarios['GROUPS'] do
 			SetScenarioGroupEnabled(scgrp, false)
@@ -52,7 +52,6 @@ CreateThread(function()
 	end
 end)
 
-
 CreateThread(function()
 	for i = 1, 15 do
 		EnableDispatchService(i, false)

diff --git a/client/teleports.lua b/client/teleports.lua
@@ -12,7 +12,7 @@ CreateThread(function()
                     DrawMarker(2, v.coords.x, v.coords.y, v.coords.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.3, 0.3, 0.15, 255, 255, 255, 255, false, false, 0, true, nil, nil, false)
 
                     if dist < 1 then
-                        DrawText3D(v.drawText, v.coords)
+                        qbx.drawText3d({ text = v.drawText, coords = v.coords})
                         if IsControlJustReleased(0, 51) then
                             if k == 1 then
                                 if v.AllowVehicle then

diff --git a/client/vehiclepush.lua b/client/vehiclepush.lua
@@ -47,7 +47,7 @@ CreateThread(function()
 
             if IsVehicleSeatFree(Vehicle.Vehicle, -1) and GetVehicleEngineHealth(Vehicle.Vehicle) <= Config.DamageNeeded and GetVehicleEngineHealth(Vehicle.Vehicle) >= 0 then
                 if vehClass ~= 13 or vehClass ~= 14 or vehClass ~= 15 or vehClass ~= 16 then
-                    DrawText3D('Press [~g~SHIFT~w~] and [~g~E~w~] to push the vehicle', Vehicle.Coords)
+                    qbx.drawText3d({ text = 'Press [~g~SHIFT~w~] and [~g~E~w~] to push the vehicle', coords = Vehicle.Coords})
                 end
             end
 

diff --git a/config.lua b/config.lua
@@ -52,58 +52,8 @@ ConsumablesAlcohol = {
 
 Config.BlacklistedScenarios = {
     ['TYPES'] = {
-        'WORLD_VEHICLE_ATTRACTOR',
-        'WORLD_VEHICLE_AMBULANCE',
-        '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',
+        -- "WORLD_VEHICLE_MILITARY_PLANES_SMALL",
     },
-    -- These vehicles will be stopped from being spawned in traffic only. (unsure if this affects car generators as well)
     ['SUPPRESSED'] = {
         "SHAMAL",
         "LUXOR",