v1.3.3

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog    
 All notable changes to this project will be documented in this file.
 
+## v1.3.3
+
+- Added Doomsday heist facility.
+- Added Doomsday heist vehicles to the vehicle shop.
+
 ## v1.3.2
 
 - Deprecated default fivem maps: `fivem-map-hipster` and `fivem-map-hipster` are not required anymore.

README.md

@@ -1,5 +1,5 @@
 # fs_freemode
-[![Version](https://img.shields.io/badge/Version-v1.3.2-brightgreen.svg)]()
+[![Version](https://img.shields.io/badge/Version-v1.3.3-brightgreen.svg)]()
 [![License](https://img.shields.io/badge/License-AGPLv3-blue.svg)](LICENSE)
 <a href="https://discord.gg/Cgr5FU6" title="Chat on Discord"><img alt="Discord Status" src="https://discordapp.com/api/guilds/285462938691567627/widget.png"></a>
 
@@ -25,4 +25,4 @@ this repo is maintained under the [Semantic Versioning guidelines](http://semver
 
 ## License
 This resource is released under the [GNU AGPLv3](LICENSE) license.    
-The resource WarMenu is released under the [GNU GPLv3](LICENSE-Warmenu) license.
+WarMenu is released under the [GNU GPLv3](libs/Warmenu-License.txt) license.

__resource.lua

@@ -1,7 +1,7 @@
 resource_manifest_version '05cfa83c-a124-4cfa-a768-c24a5811d8f9'
 resource_repository 'https://github.com/FiveM-Scripts/fs_freemode'
 resource_type 'gametype' { name = 'fs_freemode'}
-resource_version 'v1.3.2'
+resource_version 'v1.3.3'
 
 dependency 'essentialmode'
 
@@ -31,7 +31,7 @@ client_scripts {
   'int/warehouses.lua',
   'ext/locations.lua',
   'ext/pickups.lua',
-  'ext/trains.lua'
+ -- 'ext/trains.lua'
 }
 
 server_scripts {

config/vehicles.lua

@@ -24,6 +24,7 @@ compacts = {
 }
 
 coupes = { 
+  {name= "Albany Hermes", costs=9800, model="hermes"},
   {name= "Cognoscenti Cabrio", costs = 180000, model = "cogcabrio"},
   {name= "Exemplar", costs = 200000, model = "exemplar"},
   {name= "F620", costs = 80000, model= "f620"},
@@ -92,8 +93,10 @@ sports = {
    {name= "Omnis", costs = 701000, model = "omnis"},
    {name= "Ruiner 2000", costs=5745600, model= "ruiner2"},
    {name= "Penumbra", costs = 24000, model = "penumbra"},
+   {name= "Coil Raiden", costs = 2400, model = "raiden"},
    {name= "Rapid GT", costs = 140000, model = "rapidgt"},
    {name= "Rapid GT Convertible", costs = 150000, model = "rapidgt2"},
+   {name= "Ocelot Pariah", costs = 250000, model = "pariah"},
    {name= "Schafter V12", costs = 140000, model = "schafter3"},
    {name= "Sultan", costs = 12000, model = "sultan"},
    {name= "Surano", costs = 110000, model = "surano"},
@@ -105,6 +108,7 @@ sportclassics = {
   {name = "Casco", costs = 680000, model = "casco"},
   {name = "Coquette Classic", costs = 665000, model = "coquette2"},
   {name = "JB 700", costs = 350000, model = "jb700"},
+  {name = "Lampadati Viseris", costs=450000, model= "viseris"},
   {name = "Pigalle", costs = 400000, model = "pigalle"},
   {name = "Stinger", costs = 850000, model = "stinger"},
   {name = "Stinger GT", costs = 875000, model = "stingergt"},
@@ -122,12 +126,14 @@ super = {
    {name = "FMJ", costs = 1750000, model = "fmj"},
    {name = "Infernus", costs = 440000, model = "infernus"},
    {name = "Osiris", costs = 1950000, model = "osiris"},
+   {name = "Overflod Autarch", costs=2250000, model= "autarch"},
    {name = "RE-7B", costs = 2475000, model = "le7b"},
    {name = "Reaper", costs = 1595000, model = "reaper"},
    {name = "Sultan RS", costs = 795000, model = "sultanrs"},
    {name = "T20", costs = 2200000, model = "t20"},
    {name = "Turismo R", costs = 500000, model = "turismor"},
    {name = "Tyrus", costs = 2550000, model = "tyrus"},
+   {name = "Ubermacht SC1", costs=2200000, model = "sc1"},
    {name = "Vacca", costs = 240000, model = "vacca"},
    {name = "Voltic", costs = 150000, model = "voltic"},
    {name = "X80 Proto", costs = 2700000, model = "prototipo"},
@@ -157,11 +163,13 @@ offroad = {
     {name = "Blazer", costs = 8000, model = "blazer"},
     {name = "Brawler", costs = 715000, model = "brawler"},
     {name = "Bubsta 6x6", costs = 249000, model = "dubsta3"},
+    {name = "Canis Kamacho", costs = 35000, model="kamacho"},
     {name = "Dune Buggy", costs = 20000, model = "dune"},
     {name = "Rebel", costs = 22000, model = "rebel2"},
     {name = "Sandking", costs = 38000, model = "sandking"},
     {name = "The Liberator", costs = 550000, model = "monster"},
     {name = "Trophy Truck", costs = 550000, model = "trophytruck"},
+    {name = "Vapid Riata", costs = 38000, model="riata"},
 }
 
 suvs = {

ext/locations.lua

@@ -36,6 +36,7 @@ local locations = {
   {name="Carwash", id=100, c=4, x=55.7, y=-1391.3, z=30.5},
   {name="Carwash", id=100, c=4, x=-699.320, y=-941.078, z=19.077},
   {name="Comedy Club", id=102, c=4, x=-420.087, y=264.681, z=83.1927},
+  {name="Facility", id=590, c=8, x=1837.92, y=220.767, z=176.917},
   {name="Movie Theater", id=135, c=4, x=298.278, y=195.984, z=104.313},
   {name="Masks store", id=362, c=4, x= -1166.284, y= -1586.368, z=4.377},
   {name="Strip club", id=121, c=4, x=134.476, y=-1307.887, z=28.983},

int/warehouses.lua

@@ -16,6 +16,7 @@ along with fs_freemode in the file "LICENSE". If not, see <http://www.gnu.org/li
 
 CokePeds = {}
 ForgeryPeds = {}
+ipls = {"xm_hatch_closed", "xm_hatch_terrain", "xm_hatches_terrain_lod"}
 
 local CokePedCoords = {
 	{gender= "female", x= 1091.372, y= -3196.633, z= -38.993, heading= 1.891},
@@ -410,4 +411,112 @@ Citizen.CreateThread(function()
 		end
 
   end	
+end)
+
+local function LoadFacilityIpls()
+	for k,v in pairs(ipls) do
+		if not IsIplActive(tostring(v)) then
+			RequestIpl(tostring(v))
+		end
+	end	
+end
+
+local function RemoveFacilityIpls()
+	for k,v in pairs(ipls) do
+		if IsIplActive(tostring(v)) then
+			RemoveIpl(tostring(v))
+		end
+	end	
+end
+
+local function AddFacilityInterior()
+	interiorID = GetInteriorAtCoordsWithType(345.0041, 4842.001, -59.9997, "xm_x17dlc_int_02")
+	if IsValidInterior(interiorID) then
+		EnableInteriorProp(interiorID, "set_int_02_decal_01")
+		SetInteriorPropColor(interiorID, "set_int_02_decal_01", 1)
+
+		EnableInteriorProp(interiorID, "set_int_02_lounge1")
+		SetInteriorPropColor(interiorID, "set_int_02_lounge1", 1)
+
+		EnableInteriorProp(interiorID, "set_int_02_cannon")
+		SetInteriorPropColor(interiorID, "set_int_02_cannon", 1)
+
+		EnableInteriorProp(interiorID, "set_int_02_clutter1")
+		SetInteriorPropColor(interiorID, "set_int_02_clutter1", 1)
+
+		EnableInteriorProp(interiorID, "set_int_02_crewemblem")
+
+		EnableInteriorProp(interiorID,   "set_int_02_shell")
+		SetInteriorPropColor(interiorID, "set_int_02_shell", 1)
+
+		EnableInteriorProp(interiorID, "set_int_02_security")
+		SetInteriorPropColor(interiorID, "set_int_02_security", 1)
+
+		EnableInteriorProp(interiorID,   "set_int_02_sleep")
+		SetInteriorPropColor(interiorID, "set_int_02_sleep", 1)
+
+		EnableInteriorProp(interiorID, "set_int_02_trophy1")
+		SetInteriorPropColor(interiorID, "set_int_02_trophy1", 1)
+
+		EnableInteriorProp(interiorID, "set_int_02_paramedic_complete")
+		SetInteriorPropColor(interiorID, "set_int_02_paramedic_complete", 1)
+
+		EnableInteriorProp(interiorID, "Set_Int_02_outfit_paramedic")
+		SetInteriorPropColor(interiorID, "Set_Int_02_outfit_paramedic", 1)
+
+		EnableInteriorProp(interiorID, "Set_Int_02_outfit_serverfarm")
+		SetInteriorPropColor(interiorID, "Set_Int_02_outfit_serverfarm", 1)
+
+		RefreshInterior(interiorID)
+	end	
+end
+
+local function RemoveFacilityInterior()
+	DisableInteriorProp(interiorID,  "set_int_02_decal_01")
+	DisableInteriorProp(interiorID,  "set_int_02_lounge1")
+	DisableInteriorProp(interiorID,  "set_int_02_cannon")
+	DisableInteriorProp(interiorID,  "set_int_02_clutter1")
+	DisableInteriorProp(interiorID,  "set_int_02_crewemblem")
+	DisableInteriorProp(interiorID,  "set_int_02_shell")
+	DisableInteriorProp(interiorID,  "set_int_02_security")
+	DisableInteriorProp(interiorID,  "set_int_02_sleep")
+	DisableInteriorProp(interiorID,  "set_int_02_trophy1")
+	DisableInteriorProp(interiorID,  "set_int_02_paramedic_complete")
+	DisableInteriorProp(interiorID,  "Set_Int_02_outfit_paramedic")
+	DisableInteriorProp(interiorID,  "Set_Int_02_outfit_serverfarm")
+end
+
+Citizen.CreateThread(function()
+	LoadFacilityIpls()
+
+	while true do
+		Wait(1)
+		if GetDistanceBetweenCoords(GetEntityCoords(PlayerPedId(), true), 1840.16, 226.137, 166.291, true) < 30.0 then
+			DrawMarker(1, 1840.16, 226.137, 166.291-1.000, 0, 0, 0, 0, 0, 0, 1.75, 1.75, 1.0, 198, 148, 21, 155, 0, 0, 2, 0, 0, 0, 0)
+		end
+
+		if GetDistanceBetweenCoords(GetEntityCoords(PlayerPedId(), true), 1840.16, 226.137, 166.291, true) < 2.0 then
+			TriggerEvent("fs_freemode:displayHelp", "Press ~INPUT_CONTEXT~ to enter the Facility.")
+			if IsControlJustPressed(0, 38) then
+				AddFacilityInterior()
+				Wait(1000)
+				DoScreenFadeOut(800)
+				Wait(850)
+				SetEntityCoordsNoOffset(PlayerPedId(), 482.51, 4832.033, -57.0314, -10.0613)
+				Wait(300)
+				DoScreenFadeIn(800)
+
+				RemoveFacilityIpls()
+			end
+		end
+
+		DrawMarker(1, 488.745, 4788.49, -58.3939-1.000, 0, 0, 0, 0, 0, 0, 0.75, 0.75, 2.0, 198, 148, 21, 155, 0, 0, 2, 0, 0, 0, 0)
+
+		if GetDistanceBetweenCoords(GetEntityCoords(PlayerPedId(), true), 488.745, 4788.49, -58.3939, true) < 2.0 then
+			RemoveFacilityInterior()
+			LoadFacilityIpls()
+
+			SetEntityCoordsNoOffset(PlayerPedId(), 1837.62, 192.348, 172.318)
+		end
+	end
 end)

server.lua

@@ -41,9 +41,6 @@ AddEventHandler('onResourceStart', function(resource)
 				end
 			end, "GET", "", {["Content-Type"] = 'application/json'})
 		end
-	else
-		print("Your folder is not set set to fs_freemode")
-		CancelEvent()
 	end
 end)