diff --git a/VehicleCollisions/Folder.DotSettings.user b/VehicleCollisions/Folder.DotSettings.user index a5d2064..ac76b91 100644 --- a/VehicleCollisions/Folder.DotSettings.user +++ b/VehicleCollisions/Folder.DotSettings.user @@ -1,4 +1,6 @@  + True + True <AssemblyExplorer> <Assembly Path="C:\Users\Dennis\Desktop\fivepd libs\CalloutAPI.net.dll" /> </AssemblyExplorer> \ No newline at end of file diff --git a/VehicleCollisions/VehicleCollisions.cs b/VehicleCollisions/VehicleCollisions.cs index 63fb6be..53640d0 100644 --- a/VehicleCollisions/VehicleCollisions.cs +++ b/VehicleCollisions/VehicleCollisions.cs @@ -1,15 +1,15 @@ using System; using System.Threading.Tasks; -using CalloutAPI; using CitizenFX.Core; +using FivePD.API; using VehicleCollisions.Scenes; -using VehicleCollisions.Utils; using static CitizenFX.Core.Native.API; using static CitizenFX.Core.UI.Screen; +using Utilities = VehicleCollisions.Utils.Utilities; namespace VehicleCollisions { - [CalloutProperties("Vehicle Collisions", "Dennis Smink", "1.0.0", Probability.Medium)] + [CalloutProperties("Vehicle Collisions", "Dennis Smink", "1.0.0")] public class VehicleCollisions : Callout { private readonly IScene _scene; @@ -24,7 +24,7 @@ public VehicleCollisions() _scene = new SceneFactory(Utilities.Between(1, 10)).GetScene(this); //scene = new SceneFactory(2).GetScene(this); - InitBase(new Vector3(_scene.Coordinates.X, _scene.Coordinates.Y, _scene.Coordinates.Z)); + InitInfo(new Vector3(_scene.Coordinates.X, _scene.Coordinates.Y, _scene.Coordinates.Z)); ShortName = _scene.Title; CalloutDescription = _scene.Description; @@ -32,10 +32,10 @@ public VehicleCollisions() StartDistance = _scene.StartDistance; } - public override async Task Init() + public override async Task OnAccept() { // When user accepts, continue - OnAccept(); + InitBlip(); // Spawn the on-scene cop car (if any) await SpawnOnSceneCopCars(); diff --git a/VehicleCollisions/VehicleCollisions.csproj b/VehicleCollisions/VehicleCollisions.csproj index 123fdc5..777356b 100644 --- a/VehicleCollisions/VehicleCollisions.csproj +++ b/VehicleCollisions/VehicleCollisions.csproj @@ -32,12 +32,12 @@ 4 - - ..\..\..\Desktop\fivepd libs\CalloutAPI.net.dll - ..\..\..\Desktop\fivepd libs\CitizenFX.Core.dll + + ..\..\..\Desktop\fivepd libs\FivePD.net.dll + diff --git a/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.CoreCompileInputs.cache b/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.CoreCompileInputs.cache index ff9db4a..b39351b 100644 --- a/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.CoreCompileInputs.cache +++ b/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -375a38557920ea8e67b6cc7bc995f84ffd0f6a6c +bff92150bbfa29ca23fefc80c4e57a698ac27d63 diff --git a/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.FileListAbsolute.txt b/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.FileListAbsolute.txt index e988de0..bb145e3 100644 --- a/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.FileListAbsolute.txt +++ b/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.FileListAbsolute.txt @@ -1,9 +1,9 @@ C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\VehicleIncidents.net.dll C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\VehicleIncidents.net.pdb -C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\CalloutAPI.net.dll C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\CitizenFX.Core.dll C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleCollisions.csprojAssemblyReference.cache C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleCollisions.csproj.CoreCompileInputs.cache C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleCollisions.csproj.CopyComplete C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleIncidents.net.dll C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleIncidents.net.pdb +C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\FivePD.net.dll diff --git a/VehicleCollisions/obj/Debug/VehicleCollisions.csprojAssemblyReference.cache b/VehicleCollisions/obj/Debug/VehicleCollisions.csprojAssemblyReference.cache index 4b868fa..9f5427a 100644 Binary files a/VehicleCollisions/obj/Debug/VehicleCollisions.csprojAssemblyReference.cache and b/VehicleCollisions/obj/Debug/VehicleCollisions.csprojAssemblyReference.cache differ diff --git a/VehicleCollisions/obj/Debug/VehicleIncidents.net.dll b/VehicleCollisions/obj/Debug/VehicleIncidents.net.dll index 4623f41..5d9fd89 100644 Binary files a/VehicleCollisions/obj/Debug/VehicleIncidents.net.dll and b/VehicleCollisions/obj/Debug/VehicleIncidents.net.dll differ diff --git a/VehicleCollisions/obj/Debug/VehicleIncidents.net.pdb b/VehicleCollisions/obj/Debug/VehicleIncidents.net.pdb index 6bee9ba..124b02c 100644 Binary files a/VehicleCollisions/obj/Debug/VehicleIncidents.net.pdb and b/VehicleCollisions/obj/Debug/VehicleIncidents.net.pdb differ