Merge pull request #39 from FiveM-Scripts/hotfix

v1.2.3

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog    
 All notable changes to this project will be documented in this file.
 
+## v1.2.3
+- Added language support.
+- Added money stats to the pause menu.
+- Changed resource manifest version to `05cfa83c-a124-4cfa-a768-c24a5811d8f9`.
+- Fixed error messages on linux servers.
+- Fixed an issue that some people reported on discord regarding the update api.
+
 ## v1.2.2
 - Small fix for updater.
 
@@ -10,8 +17,8 @@ All notable changes to this project will be documented in this file.
 ## v1.2 
 - Added meth, weed, cocaine warehouses.
 - Added Gunrunning DLC weapons.
-- Added Finance and Felony warehouses
-- Added bunker interior
+- Added Finance and Felony warehouses.
+- Added bunker interior.
 
 ## v1.1 - 19/09/2017
 

README.md

@@ -1,5 +1,5 @@
 # fs_freemode
-[![Version](https://img.shields.io/badge/Version-V1.2.2-brightgreen.svg)]()
+[![Version](https://img.shields.io/badge/Version-1.2.3-brightgreen.svg)]()
 <a href="https://discord.gg/Cgr5FU6" title="Chat on Discord"><img alt="Discord Status" src="https://discordapp.com/api/guilds/285462938691567627/widget.png"></a>
 
 ## Requirements

__resource.lua

@@ -1,6 +1,6 @@
 resource_type 'gametype' { name = 'fs_freemode'}
 
-resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
+resource_manifest_version '05cfa83c-a124-4cfa-a768-c24a5811d8f9'
 
 dependency 'essentialmode'
 
@@ -11,17 +11,20 @@ files {
 weaponfile 'weapons.xml'
 
 client_scripts {
+  'libs/i18n.lua',
   'bin/System.Xml.net.dll',
   'bin/NativeUI.net.dll',
   'bin/ShopMenu.net.dll',
+  'lang/en.lua',
   'libs/events.lua',
   'libs/scoreboard.lua',
+  'libs/warmenu.lua',
   'config.lua',
   'client.lua',
-  'int/bunkers.lua',
   'int/comedy.lua',
+  'int/office.lua',
   'int/weapons.lua',
-  'int/warehouses',
+  'int/warehouses.lua',
   'ext/locations.lua',
   'ext/pickups.lua',
   'ext/trains.lua'

client.lua

@@ -1,3 +1,5 @@
+i18n.setLang("en")
+
 AddEventHandler('onClientMapStart', function()
 	exports.spawnmanager:setAutoSpawn(true)
 	exports.spawnmanager:forceRespawn()
@@ -10,16 +12,17 @@ AddEventHandler("playerSpawned", function(spawn)
 
 		Citizen.InvokeNative(GetHashKey("ADD_TEXT_ENTRY"), 'FE_THDR_GTAO', Setup.ServerName)
 		if Setup.DisplayWelcomeNotification then
-			TriggerEvent("fs_freemode:notify", "CHAR_SOCIAL_CLUB", 4, 2, Setup.ServerName, false, "Welcome ~g~".. playerName)
+			TriggerEvent("fs_freemode:notify", "CHAR_SOCIAL_CLUB", 4, 2, Setup.ServerName, false, i18n.translate("welcome_message") .. playerName)
 		end
 
 		SetAudioFlag("LoadMPData", true)
 		SetAudioFlag("WantedMusicDisabled", Setup.WantedMusicDisabled)
-		
-		GiveWeaponToPed(player, GetHashKey("WEAPON_PISTOL"), true, true)
+
+		GiveWeaponToPed(player, GetHashKey("WEAPON_PISTOL"), 100, false, true)
 		GiveWeaponToPed(player, GetHashKey("WEAPON_KNIFE"), true, true)
 
-		TriggerServerEvent("fs_freemode:playerSpawned")		
+		TriggerServerEvent("fs_freemode:playerSpawned")
+		TriggerServerEvent("fs_freemode:initStats")
 end)
 
 Citizen.CreateThread(function()

config.lua

@@ -10,6 +10,7 @@ Setup.WantedMusicDisabled = true
 Setup.WantedHeadDisplay = true
 Setup.VoiceHeadDisplay = true
 Setup.SpawnPickups = true
+Setup.pvp = true
 Setup.debug = false
 
 PickupItems = {
@@ -21,4 +22,4 @@ PickupItems = {
     "PICKUP_WEAPON_GRENADE",
     "PICKUP_WEAPON_MINISMG",
     "PICKUP_WEAPON_AUTOSHOTGUN"
-}
+}

ext/locations.lua

@@ -59,6 +59,7 @@ Citizen.CreateThread(function()
     end
   end
 
+  RequestIpl("facelobby") 
   RequestIpl("FIBlobby")
   RequestIpl("v_tunnel_hole")
   RequestIpl("v_tunnel_hole_lod")