From 9b7ccc617ed4e5b708a13688cf00e9930525d496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:15:15 +0200 Subject: [PATCH 01/29] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..af8a195d --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-instance +FXServer Instance From 06d2a0bc5af9d2b4ca49b1d49f5a32cc3b5afaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:16:23 +0200 Subject: [PATCH 02/29] Update README.md --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index af8a195d..1d59060d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,15 @@ # fxserver-instance FXServer Instance + +[INSTALLATION] + +1) CD in your resources folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-instance instance +``` +3) Add this in your server.cfg : + +``` +start instance +``` From ded115ae9efbe3d961aa43894e464d910847438e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:17:02 +0200 Subject: [PATCH 03/29] Add files --- __resource.lua | 6 ++ client/main.lua | 212 ++++++++++++++++++++++++++++++++++++++++++++++++ server/main.lua | 128 +++++++++++++++++++++++++++++ 3 files changed, 346 insertions(+) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..4b1f559e --- /dev/null +++ b/__resource.lua @@ -0,0 +1,6 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'Instance' + +server_script 'server/main.lua' +client_script 'client/main.lua' diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..0d446792 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,212 @@ +local Keys = { + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 +} + +local GUI = {} +GUI.Time = 0 +local Instance = {} +local InstanceInvite = nil +local InstancedPlayers = {} + +function ShowNotification(msg) + SetNotificationTextEntry('STRING') + AddTextComponentString(msg) + DrawNotification(0,1) +end + +function GetInstance() + return Instance +end + +function CreateInstance() + TriggerServerEvent('instance:create') +end + +function EnterInstance(instance) + TriggerServerEvent('instance:enter', InstanceInvite.host) +end + +function LeaveInstance() + + if Instance.host ~= nil then + + if #Instance.players > 1 then + TriggerEvent('esx:showNotification', 'Vous avez quitté l\'instance') + end + + TriggerServerEvent('instance:leave', Instance.host) + end + +end + +function InviteToInstance(player, pos) + TriggerServerEvent('instance:invite', Instance.host, player, pos) +end + +AddEventHandler('instance:get', function(cb) + cb(GetInstance()) +end) + +AddEventHandler('instance:create', function() + CreateInstance() +end) + +AddEventHandler('instance:enter', function(instance) + EnterInstance(instance) +end) + +AddEventHandler('instance:leave', function() + LeaveInstance() +end) + +AddEventHandler('instance:invite', function(player, pos) + InviteToInstance(player, pos) +end) + +RegisterNetEvent('instance:onData') +AddEventHandler('instance:onData', function(instance) + Instance = instance +end) + +RegisterNetEvent('instance:onInstancedPlayersData') +AddEventHandler('instance:onInstancedPlayersData', function(instancedPlayers) + InstancedPlayers = instancedPlayers +end) + +RegisterNetEvent('instance:onInvite') +AddEventHandler('instance:onInvite', function(instance, pos) + + InstanceInvite = { + host = instance, + pos = pos + } + + Citizen.CreateThread(function() + + Citizen.Wait(10000) + + if InstanceInvite ~= nil then + ShowNotification('Invitation expirée') + InstanceInvite = nil + end + + end) + +end) + +-- Input invites +Citizen.CreateThread(function() + while true do + + Wait(0) + + if InstanceInvite ~= nil then + SetTextComponentFormat('STRING') + AddTextComponentString('Appuyez sur ~INPUT_CONTEXT~ pour entrer dans l\'instance') + DisplayHelpTextFromStringLabel(0, 0, 1, -1) + end + + end +end) + +-- Controls +Citizen.CreateThread(function() + while true do + + Wait(0) + + if InstanceInvite ~= nil and IsControlPressed(0, Keys['E']) and (GetGameTimer() - GUI.Time) > 150 then + + local playerPed = GetPlayerPed(-1) + + EnterInstance(InstanceInvite.host) + + SetEntityCoords(playerPed, InstanceInvite.pos.x, InstanceInvite.pos.y, InstanceInvite.pos.z) + + ShowNotification('Vous êtes entré dans l\'instance') + + InstanceInvite = nil + GUI.Time = GetGameTimer() + + end + + end + +end) + +-- Instance players +Citizen.CreateThread(function() + + while true do + + Wait(0) + + if Instance.host ~= nil then + + local playerPed = GetPlayerPed(-1) + + for i=0, 32, 1 do + + local found = false + + for j=1, #Instance.players, 1 do + + instancePlayer = GetPlayerFromServerId(Instance.players[j]) + + if i == instancePlayer then + found = true + end + + end + + if not found then + + local otherPlayerPed = GetPlayerPed(i) + + SetEntityLocallyInvisible(otherPlayerPed) + SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) + end + + end + + else + + local playerPed = GetPlayerPed(-1) + + for i=0, 32, 1 do + + local found = false + + for j=1, #InstancedPlayers, 1 do + + instancePlayer = GetPlayerFromServerId(InstancedPlayers[j]) + + if i == instancePlayer then + found = true + end + + end + + if found then + + local otherPlayerPed = GetPlayerPed(i) + + SetEntityLocallyInvisible(otherPlayerPed) + SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) + end + + end + + end + + end + +end) \ No newline at end of file diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..9b08a315 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,128 @@ +local Instances = {} + +function GetInstancedPlayers() + + local players = {} + + for k,v in pairs(Instances) do + for i=1, #v.players, 1 do + table.insert(players, v.players[i]) + end + end + + return players + +end + +function CreateInstance(player) + + Instances[player] = { + host = player, + players = {player} + } + + TriggerClientEvent('instance:onData', player, Instances[player]) + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + +end + +function CloseInstance(instance) + + for i=1, #Instances[instance].players, 1 do + TriggerClientEvent('instance:onData', Instances[instance].players[i], {}) + end + + Instances[instance] = nil + + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + +end + +function AddPlayerToInstance(instance, player) + + local found = false + + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] == player then + found = true + break + end + end + + if not found then + table.insert(Instances[instance].players, player) + end + + for i=1, #Instances[instance].players, 1 do + TriggerClientEvent('instance:onData', Instances[instance].players[i], Instances[instance]) + end + + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + +end + +function RemovePlayerFromInstance(instance, player) + + if Instances[instance].host == player then + + CloseInstance(instance) + + else + + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] == player then + Instances[instance].players[i] = nil + end + end + + TriggerClientEvent('instance:onData', player, {}) + + for i=1, #Instances[instance].players, 1 do + TriggerClientEvent('instance:onData', Instances[instance].players[i], Instances[instance]) + end + + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + + end + +end + +function InvitePlayerToInstance(instance, player, pos) + TriggerClientEvent('instance:onInvite', player, instance, pos) +end + +RegisterServerEvent('instance:create') +AddEventHandler('instance:create', function() + CreateInstance(source) +end) + +RegisterServerEvent('instance:enter') +AddEventHandler('instance:enter', function(instance) + AddPlayerToInstance(instance, source) +end) + +RegisterServerEvent('instance:leave') +AddEventHandler('instance:leave', function(instance) + RemovePlayerFromInstance(instance, source) +end) + +RegisterServerEvent('instance:invite') +AddEventHandler('instance:invite', function(instance, player, pos) + InvitePlayerToInstance(instance, player, pos) +end) + +TriggerEvent('es:addCommand', 'instance_create', function(source, args, user) + CreateInstance(source) +end) + +TriggerEvent('es:addCommand', 'instance_invite', function(source, args, user) + InvitePlayerToInstance(tonumber(args[2]), tonumber(args[3]), { + x = tonumber(args[4]), + y = tonumber(args[5]), + z = tonumber(args[6]), + }) +end) + +TriggerEvent('es:addCommand', 'instance_enter', function(source, args, user) + AddPlayerToInstance(source, tonumber(args[2])) +end) From a4be86055589adf2fbe04b8695ed30ecde9a6769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 3 Aug 2017 15:45:09 +0200 Subject: [PATCH 04/29] Add CloseInstance and instance:close event --- client/main.lua | 8 ++++++++ server/main.lua | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/client/main.lua b/client/main.lua index 0d446792..d61a7d0a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -30,6 +30,10 @@ function CreateInstance() TriggerServerEvent('instance:create') end +function CloseInstance() + TriggerServerEvent('instance:close') +end + function EnterInstance(instance) TriggerServerEvent('instance:enter', InstanceInvite.host) end @@ -59,6 +63,10 @@ AddEventHandler('instance:create', function() CreateInstance() end) +AddEventHandler('instance:close', function() + CloseInstance() +end) + AddEventHandler('instance:enter', function(instance) EnterInstance(instance) end) diff --git a/server/main.lua b/server/main.lua index 9b08a315..d8309566 100644 --- a/server/main.lua +++ b/server/main.lua @@ -96,6 +96,11 @@ AddEventHandler('instance:create', function() CreateInstance(source) end) +RegisterServerEvent('instance:close') +AddEventHandler('instance:close', function() + CloseInstance(source) +end) + RegisterServerEvent('instance:enter') AddEventHandler('instance:enter', function(instance) AddPlayerToInstance(instance, source) From c5dcbc5cc78bd770507f89be0146ec39fd9277c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 9 Aug 2017 14:16:28 +0200 Subject: [PATCH 05/29] Add LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 1f8c37fd0a22a1b01ccd1b9441ad17c736abe884 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Wed, 16 Aug 2017 20:08:14 -0400 Subject: [PATCH 06/29] Multi-language support --- __resource.lua | 22 ++++++++++++++++++++-- client/main.lua | 32 ++++++++++++++++---------------- config.lua | 2 ++ locales/en.lua | 8 ++++++++ locales/fr.lua | 8 ++++++++ 5 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 config.lua create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index 4b1f559e..3bcf89ea 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,5 +2,23 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'Instance' -server_script 'server/main.lua' -client_script 'client/main.lua' +server_scripts { + + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'server/main.lua' + +} + + +client_scripts { + + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'client/main.lua' + +} diff --git a/client/main.lua b/client/main.lua index d61a7d0a..80989c6d 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,10 +1,10 @@ local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 @@ -41,9 +41,9 @@ end function LeaveInstance() if Instance.host ~= nil then - + if #Instance.players > 1 then - TriggerEvent('esx:showNotification', 'Vous avez quitté l\'instance') + TriggerEvent('esx:showNotification', _U('left_instance')) end TriggerServerEvent('instance:leave', Instance.host) @@ -91,18 +91,18 @@ end) RegisterNetEvent('instance:onInvite') AddEventHandler('instance:onInvite', function(instance, pos) - + InstanceInvite = { host = instance, pos = pos } Citizen.CreateThread(function() - + Citizen.Wait(10000) if InstanceInvite ~= nil then - ShowNotification('Invitation expirée') + ShowNotification(_U('invite_expired')) InstanceInvite = nil end @@ -118,7 +118,7 @@ Citizen.CreateThread(function() if InstanceInvite ~= nil then SetTextComponentFormat('STRING') - AddTextComponentString('Appuyez sur ~INPUT_CONTEXT~ pour entrer dans l\'instance') + AddTextComponentString(_U('press_to_enter')) DisplayHelpTextFromStringLabel(0, 0, 1, -1) end @@ -139,8 +139,8 @@ Citizen.CreateThread(function() SetEntityCoords(playerPed, InstanceInvite.pos.x, InstanceInvite.pos.y, InstanceInvite.pos.z) - ShowNotification('Vous êtes entré dans l\'instance') - + ShowNotification(_U('entered_instance')) + InstanceInvite = nil GUI.Time = GetGameTimer() @@ -162,11 +162,11 @@ Citizen.CreateThread(function() local playerPed = GetPlayerPed(-1) for i=0, 32, 1 do - + local found = false for j=1, #Instance.players, 1 do - + instancePlayer = GetPlayerFromServerId(Instance.players[j]) if i == instancePlayer then @@ -190,11 +190,11 @@ Citizen.CreateThread(function() local playerPed = GetPlayerPed(-1) for i=0, 32, 1 do - + local found = false for j=1, #InstancedPlayers, 1 do - + instancePlayer = GetPlayerFromServerId(InstancedPlayers[j]) if i == instancePlayer then @@ -217,4 +217,4 @@ Citizen.CreateThread(function() end -end) \ No newline at end of file +end) diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..56a8b5e9 --- /dev/null +++ b/config.lua @@ -0,0 +1,2 @@ +Config = {} +Config.Locale = 'fr' diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..2ba5f274 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,8 @@ +Locales['en'] = { + + ['left_instance'] = 'you have left the instance', + ['invite_expired'] = 'invite expired', + ['press_to_enter'] = 'press ~INPUT_CONTEXT~ to enter the instance', + ['entered_instance'] = 'you entered the instance', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..83f595e9 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,8 @@ +Locales['fr'] = { + + ['left_instance'] = 'vous avez quitté l\'instance', + ['invite_expired'] = 'invitation expirée', + ['press_to_enter'] = 'appuyez sur ~INPUT_CONTEXT~ pour entrer dans l\'instance', + ['entered_instance'] = 'vous êtes entré dans l\'instance', + +} From 40ffe31324b3f8765c06ac18791b60410f718cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 17 Aug 2017 17:40:47 +0200 Subject: [PATCH 07/29] New instance code --- client/main.lua | 97 +++++++++++++++++++++++++++++++++++++------------ server/main.lua | 91 ++++++++++++++++++++++++---------------------- 2 files changed, 122 insertions(+), 66 deletions(-) diff --git a/client/main.lua b/client/main.lua index 80989c6d..bea70293 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,32 +10,40 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -local GUI = {} -GUI.Time = 0 -local Instance = {} -local InstanceInvite = nil -local InstancedPlayers = {} +local GUI = {} +GUI.Time = 0 +local Instance = {} +local InstanceInvite = nil +local InstancedPlayers = {} +local RegisteredInstanceTypes = {} function ShowNotification(msg) SetNotificationTextEntry('STRING') AddTextComponentString(msg) - DrawNotification(0,1) + DrawNotification(0, 1) end function GetInstance() return Instance end -function CreateInstance() - TriggerServerEvent('instance:create') +function CreateInstance(type, data) + TriggerServerEvent('instance:create', type, data) end function CloseInstance() + Instance = {} TriggerServerEvent('instance:close') end function EnterInstance(instance) - TriggerServerEvent('instance:enter', InstanceInvite.host) + + TriggerServerEvent('instance:enter', instance.host) + + if RegisteredInstanceTypes[instance.type].enter ~= nil then + RegisteredInstanceTypes[instance.type].enter(instance) + end + end function LeaveInstance() @@ -46,21 +54,32 @@ function LeaveInstance() TriggerEvent('esx:showNotification', _U('left_instance')) end + if RegisteredInstanceTypes[Instance.type].exit ~= nil then + RegisteredInstanceTypes[Instance.type].exit(Instance) + end + TriggerServerEvent('instance:leave', Instance.host) end end -function InviteToInstance(player, pos) - TriggerServerEvent('instance:invite', Instance.host, player, pos) +function InviteToInstance(type, player, pos) + TriggerServerEvent('instance:invite', Instance.host, type, player, pos) +end + +function RegisterInstanceType(type, enter, exit) + RegisteredInstanceTypes[type] = { + enter = enter, + exit = exit + } end AddEventHandler('instance:get', function(cb) cb(GetInstance()) end) -AddEventHandler('instance:create', function() - CreateInstance() +AddEventHandler('instance:create', function(type, data) + CreateInstance(type, data) end) AddEventHandler('instance:close', function() @@ -75,13 +94,12 @@ AddEventHandler('instance:leave', function() LeaveInstance() end) -AddEventHandler('instance:invite', function(player, pos) - InviteToInstance(player, pos) +AddEventHandler('instance:invite', function(type, player, pos) + InviteToInstance(type, player, pos) end) -RegisterNetEvent('instance:onData') -AddEventHandler('instance:onData', function(instance) - Instance = instance +AddEventHandler('instance:registerType', function(name, enter, exit) + RegisterInstanceType(name, enter, exit) end) RegisterNetEvent('instance:onInstancedPlayersData') @@ -89,12 +107,45 @@ AddEventHandler('instance:onInstancedPlayersData', function(instancedPlayers) InstancedPlayers = instancedPlayers end) +RegisterNetEvent('instance:onCreate') +AddEventHandler('instance:onCreate', function(instance) + Instance = {} +end) + +RegisterNetEvent('instance:onEnter') +AddEventHandler('instance:onEnter', function(instance) + Instance = instance +end) + +RegisterNetEvent('instance:onLeave') +AddEventHandler('instance:onClose', function(instance) + Instance = {} +end) + +RegisterNetEvent('instance:onClose') +AddEventHandler('instance:onClose', function(instance) + Instance = {} +end) + +RegisterNetEvent('instance:onPlayerEntered') +AddEventHandler('instance:onPlayerEntered', function(instance, player) + Instance = instance + ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. ' est entré dans l\'instance') +end) + +RegisterNetEvent('instance:onPlayerLeft') +AddEventHandler('instance:onPlayerLeft', function(instance, player) + Instance = instance + ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. ' est sorti dans l\'instance') +end) + RegisterNetEvent('instance:onInvite') -AddEventHandler('instance:onInvite', function(instance, pos) +AddEventHandler('instance:onInvite', function(instance, type, data) InstanceInvite = { + type = type, host = instance, - pos = pos + data = data } Citizen.CreateThread(function() @@ -110,6 +161,8 @@ AddEventHandler('instance:onInvite', function(instance, pos) end) +RegisterInstanceType('default') + -- Input invites Citizen.CreateThread(function() while true do @@ -135,9 +188,7 @@ Citizen.CreateThread(function() local playerPed = GetPlayerPed(-1) - EnterInstance(InstanceInvite.host) - - SetEntityCoords(playerPed, InstanceInvite.pos.x, InstanceInvite.pos.y, InstanceInvite.pos.z) + EnterInstance(InstanceInvite) ShowNotification(_U('entered_instance')) diff --git a/server/main.lua b/server/main.lua index d8309566..47dd9cc4 100644 --- a/server/main.lua +++ b/server/main.lua @@ -14,14 +14,16 @@ function GetInstancedPlayers() end -function CreateInstance(player) - +function CreateInstance(type, player, data) + Instances[player] = { + type = type, host = player, - players = {player} + players = {}, + data = data } - TriggerClientEvent('instance:onData', player, Instances[player]) + TriggerClientEvent('instance:onCreate', player, Instances[player]) TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) end @@ -29,7 +31,7 @@ end function CloseInstance(instance) for i=1, #Instances[instance].players, 1 do - TriggerClientEvent('instance:onData', Instances[instance].players[i], {}) + TriggerClientEvent('instance:onClose', Instances[instance].players[i]) end Instances[instance] = nil @@ -53,8 +55,13 @@ function AddPlayerToInstance(instance, player) table.insert(Instances[instance].players, player) end + TriggerClientEvent('instance:onEnter', player, Instances[instance]) + for i=1, #Instances[instance].players, 1 do - TriggerClientEvent('instance:onData', Instances[instance].players[i], Instances[instance]) + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerEntered', Instances[instance].players[i], Instances[instance], player) + end + end TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) @@ -63,37 +70,50 @@ end function RemovePlayerFromInstance(instance, player) - if Instances[instance].host == player then - - CloseInstance(instance) - - else + if Instances[instance] ~= nil then - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] == player then - Instances[instance].players[i] = nil + TriggerClientEvent('instance:onLeave', player, Instances[instance]) + + if Instances[instance].host == player then + + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) + end end + + CloseInstance(instance) + + else + + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] == player then + Instances[instance].players[i] = nil + end + end + + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) + end + + end + + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + end - TriggerClientEvent('instance:onData', player, {}) - - for i=1, #Instances[instance].players, 1 do - TriggerClientEvent('instance:onData', Instances[instance].players[i], Instances[instance]) - end - - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) - end end -function InvitePlayerToInstance(instance, player, pos) - TriggerClientEvent('instance:onInvite', player, instance, pos) +function InvitePlayerToInstance(instance, type, player, data) + TriggerClientEvent('instance:onInvite', player, instance, type, data) end RegisterServerEvent('instance:create') -AddEventHandler('instance:create', function() - CreateInstance(source) +AddEventHandler('instance:create', function(type, data) + CreateInstance(type, source, data) end) RegisterServerEvent('instance:close') @@ -112,22 +132,7 @@ AddEventHandler('instance:leave', function(instance) end) RegisterServerEvent('instance:invite') -AddEventHandler('instance:invite', function(instance, player, pos) - InvitePlayerToInstance(instance, player, pos) +AddEventHandler('instance:invite', function(instance, type, player, data) + InvitePlayerToInstance(instance, type, player, data) end) -TriggerEvent('es:addCommand', 'instance_create', function(source, args, user) - CreateInstance(source) -end) - -TriggerEvent('es:addCommand', 'instance_invite', function(source, args, user) - InvitePlayerToInstance(tonumber(args[2]), tonumber(args[3]), { - x = tonumber(args[4]), - y = tonumber(args[5]), - z = tonumber(args[6]), - }) -end) - -TriggerEvent('es:addCommand', 'instance_enter', function(source, args, user) - AddPlayerToInstance(source, tonumber(args[2])) -end) From 61bbb536a1e0ff1b1efefb8024a55f0cde82f7d2 Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 09:39:57 -0700 Subject: [PATCH 08/29] Multi-language support Brazilian Portuguese translation. --- __resource.lua | 2 ++ locales/br.lua | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index 3bcf89ea..8321f96c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,6 +5,7 @@ description 'Instance' server_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', @@ -16,6 +17,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..47c85b40 --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,8 @@ +Locales['br'] = { + + ['left_instance'] = 'Você deixou a instância', + ['invite_expired'] = 'Convite expirado', + ['press_to_enter'] = 'Pressione ~INPUT_CONTEXT~ para entrar na instância', + ['entered_instance'] = 'Você entrou na instância', + +} From c25a32e6deef54b85d926c06c651d86b1041c055 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Thu, 17 Aug 2017 12:51:41 -0400 Subject: [PATCH 09/29] Updated multi-language support --- client/main.lua | 6 +++--- locales/en.lua | 2 ++ locales/fr.lua | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index bea70293..7852e340 100644 --- a/client/main.lua +++ b/client/main.lua @@ -37,7 +37,7 @@ function CloseInstance() end function EnterInstance(instance) - + TriggerServerEvent('instance:enter', instance.host) if RegisteredInstanceTypes[instance.type].enter ~= nil then @@ -130,13 +130,13 @@ end) RegisterNetEvent('instance:onPlayerEntered') AddEventHandler('instance:onPlayerEntered', function(instance, player) Instance = instance - ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. ' est entré dans l\'instance') + ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _U('entered_into')) end) RegisterNetEvent('instance:onPlayerLeft') AddEventHandler('instance:onPlayerLeft', function(instance, player) Instance = instance - ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. ' est sorti dans l\'instance') + ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _U('left_out')) end) RegisterNetEvent('instance:onInvite') diff --git a/locales/en.lua b/locales/en.lua index 2ba5f274..41f01dcb 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -4,5 +4,7 @@ Locales['en'] = { ['invite_expired'] = 'invite expired', ['press_to_enter'] = 'press ~INPUT_CONTEXT~ to enter the instance', ['entered_instance'] = 'you entered the instance', + ['entered_into'] = ' entered the instance', + ['left_out'] = ' left the instance', } diff --git a/locales/fr.lua b/locales/fr.lua index 83f595e9..02a2f407 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -4,5 +4,7 @@ Locales['fr'] = { ['invite_expired'] = 'invitation expirée', ['press_to_enter'] = 'appuyez sur ~INPUT_CONTEXT~ pour entrer dans l\'instance', ['entered_instance'] = 'vous êtes entré dans l\'instance', + ['entered_into'] = ' est entré dans l\'instance', + ['left_out'] = ' est sorti dans l\'instance', } From f34ea3c42fb039ec7f82183952bae834fdd3ed24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 23 Aug 2017 12:58:28 +0200 Subject: [PATCH 10/29] Add check on instance close --- server/main.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/server/main.lua b/server/main.lua index 47dd9cc4..958bcb50 100644 --- a/server/main.lua +++ b/server/main.lua @@ -30,14 +30,18 @@ end function CloseInstance(instance) - for i=1, #Instances[instance].players, 1 do - TriggerClientEvent('instance:onClose', Instances[instance].players[i]) + if Instances[instance] ~= nil then + + for i=1, #Instances[instance].players, 1 do + TriggerClientEvent('instance:onClose', Instances[instance].players[i]) + end + + Instances[instance] = nil + + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + end - Instances[instance] = nil - - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) - end function AddPlayerToInstance(instance, player) From f9936dc41dbb0f0f7dcf9d3ff4841376d4381247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 13 Sep 2017 14:48:38 +0200 Subject: [PATCH 11/29] Fix typo + add some events --- client/main.lua | 18 +++++++++++------- server/main.lua | 3 ++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/client/main.lua b/client/main.lua index 7852e340..9120d0ab 100644 --- a/client/main.lua +++ b/client/main.lua @@ -37,7 +37,7 @@ function CloseInstance() end function EnterInstance(instance) - + TriggerServerEvent('instance:enter', instance.host) if RegisteredInstanceTypes[instance.type].enter ~= nil then @@ -63,8 +63,8 @@ function LeaveInstance() end -function InviteToInstance(type, player, pos) - TriggerServerEvent('instance:invite', Instance.host, type, player, pos) +function InviteToInstance(type, player, data) + TriggerServerEvent('instance:invite', Instance.host, type, player, data) end function RegisterInstanceType(type, enter, exit) @@ -94,8 +94,8 @@ AddEventHandler('instance:leave', function() LeaveInstance() end) -AddEventHandler('instance:invite', function(type, player, pos) - InviteToInstance(type, player, pos) +AddEventHandler('instance:invite', function(type, player, data) + InviteToInstance(type, player, data) end) AddEventHandler('instance:registerType', function(name, enter, exit) @@ -130,13 +130,13 @@ end) RegisterNetEvent('instance:onPlayerEntered') AddEventHandler('instance:onPlayerEntered', function(instance, player) Instance = instance - ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _U('entered_into')) + ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('entered_into')) end) RegisterNetEvent('instance:onPlayerLeft') AddEventHandler('instance:onPlayerLeft', function(instance, player) Instance = instance - ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _U('left_out')) + ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('left_out')) end) RegisterNetEvent('instance:onInvite') @@ -269,3 +269,7 @@ Citizen.CreateThread(function() end end) + +Citizen.CreateThread(function() + TriggerEvent('instance:loaded') +end) \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 958bcb50..c461a425 100644 --- a/server/main.lua +++ b/server/main.lua @@ -23,6 +23,7 @@ function CreateInstance(type, player, data) data = data } + TriggerEvent('instance:onCreate', Instances[player]) TriggerClientEvent('instance:onCreate', player, Instances[player]) TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) @@ -39,7 +40,7 @@ function CloseInstance(instance) Instances[instance] = nil TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) - + TriggerEvent('instance:onClose', instance) end end From 39bd6a80f080dd474aeac3fbfcc0bef9b4f40eee Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Thu, 14 Sep 2017 16:52:50 +0200 Subject: [PATCH 12/29] chore(coding-style): correct indentation --- .editorconfig | 9 ++ __resource.lua | 28 +++--- client/main.lua | 238 ++++++++++++++++++++++++------------------------ locales/br.lua | 10 +- locales/en.lua | 14 ++- locales/fr.lua | 14 ++- server/main.lua | 148 +++++++++++++++--------------- 7 files changed, 230 insertions(+), 231 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..41c2aaf2 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index 8321f96c..adf1086e 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,24 +3,20 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'Instance' server_scripts { - - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'server/main.lua' - + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'client/main.lua' - + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index 9120d0ab..de9a5a3a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,13 +1,13 @@ local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } local GUI = {} @@ -18,146 +18,146 @@ local InstancedPlayers = {} local RegisteredInstanceTypes = {} function ShowNotification(msg) - SetNotificationTextEntry('STRING') - AddTextComponentString(msg) - DrawNotification(0, 1) + SetNotificationTextEntry('STRING') + AddTextComponentString(msg) + DrawNotification(0, 1) end function GetInstance() - return Instance + return Instance end function CreateInstance(type, data) - TriggerServerEvent('instance:create', type, data) + TriggerServerEvent('instance:create', type, data) end function CloseInstance() - Instance = {} - TriggerServerEvent('instance:close') + Instance = {} + TriggerServerEvent('instance:close') end function EnterInstance(instance) - - TriggerServerEvent('instance:enter', instance.host) - if RegisteredInstanceTypes[instance.type].enter ~= nil then - RegisteredInstanceTypes[instance.type].enter(instance) - end + TriggerServerEvent('instance:enter', instance.host) + + if RegisteredInstanceTypes[instance.type].enter ~= nil then + RegisteredInstanceTypes[instance.type].enter(instance) + end end function LeaveInstance() - if Instance.host ~= nil then + if Instance.host ~= nil then - if #Instance.players > 1 then - TriggerEvent('esx:showNotification', _U('left_instance')) - end + if #Instance.players > 1 then + TriggerEvent('esx:showNotification', _U('left_instance')) + end - if RegisteredInstanceTypes[Instance.type].exit ~= nil then - RegisteredInstanceTypes[Instance.type].exit(Instance) - end + if RegisteredInstanceTypes[Instance.type].exit ~= nil then + RegisteredInstanceTypes[Instance.type].exit(Instance) + end - TriggerServerEvent('instance:leave', Instance.host) - end + TriggerServerEvent('instance:leave', Instance.host) + end end function InviteToInstance(type, player, data) - TriggerServerEvent('instance:invite', Instance.host, type, player, data) + TriggerServerEvent('instance:invite', Instance.host, type, player, data) end function RegisterInstanceType(type, enter, exit) - RegisteredInstanceTypes[type] = { - enter = enter, - exit = exit - } + RegisteredInstanceTypes[type] = { + enter = enter, + exit = exit + } end AddEventHandler('instance:get', function(cb) - cb(GetInstance()) + cb(GetInstance()) end) AddEventHandler('instance:create', function(type, data) - CreateInstance(type, data) + CreateInstance(type, data) end) AddEventHandler('instance:close', function() - CloseInstance() + CloseInstance() end) AddEventHandler('instance:enter', function(instance) - EnterInstance(instance) + EnterInstance(instance) end) AddEventHandler('instance:leave', function() - LeaveInstance() + LeaveInstance() end) AddEventHandler('instance:invite', function(type, player, data) - InviteToInstance(type, player, data) + InviteToInstance(type, player, data) end) AddEventHandler('instance:registerType', function(name, enter, exit) - RegisterInstanceType(name, enter, exit) + RegisterInstanceType(name, enter, exit) end) RegisterNetEvent('instance:onInstancedPlayersData') AddEventHandler('instance:onInstancedPlayersData', function(instancedPlayers) - InstancedPlayers = instancedPlayers + InstancedPlayers = instancedPlayers end) RegisterNetEvent('instance:onCreate') AddEventHandler('instance:onCreate', function(instance) - Instance = {} + Instance = {} end) RegisterNetEvent('instance:onEnter') AddEventHandler('instance:onEnter', function(instance) - Instance = instance + Instance = instance end) RegisterNetEvent('instance:onLeave') AddEventHandler('instance:onClose', function(instance) - Instance = {} + Instance = {} end) RegisterNetEvent('instance:onClose') AddEventHandler('instance:onClose', function(instance) - Instance = {} + Instance = {} end) RegisterNetEvent('instance:onPlayerEntered') AddEventHandler('instance:onPlayerEntered', function(instance, player) - Instance = instance - ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('entered_into')) + Instance = instance + ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('entered_into')) end) RegisterNetEvent('instance:onPlayerLeft') AddEventHandler('instance:onPlayerLeft', function(instance, player) - Instance = instance - ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('left_out')) + Instance = instance + ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('left_out')) end) RegisterNetEvent('instance:onInvite') AddEventHandler('instance:onInvite', function(instance, type, data) - InstanceInvite = { - type = type, - host = instance, - data = data - } + InstanceInvite = { + type = type, + host = instance, + data = data + } - Citizen.CreateThread(function() + Citizen.CreateThread(function() - Citizen.Wait(10000) + Citizen.Wait(10000) - if InstanceInvite ~= nil then - ShowNotification(_U('invite_expired')) - InstanceInvite = nil - end + if InstanceInvite ~= nil then + ShowNotification(_U('invite_expired')) + InstanceInvite = nil + end - end) + end) end) @@ -165,111 +165,111 @@ RegisterInstanceType('default') -- Input invites Citizen.CreateThread(function() - while true do + while true do - Wait(0) + Wait(0) - if InstanceInvite ~= nil then - SetTextComponentFormat('STRING') - AddTextComponentString(_U('press_to_enter')) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) - end + if InstanceInvite ~= nil then + SetTextComponentFormat('STRING') + AddTextComponentString(_U('press_to_enter')) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) + end - end + end end) -- Controls Citizen.CreateThread(function() - while true do + while true do - Wait(0) + Wait(0) - if InstanceInvite ~= nil and IsControlPressed(0, Keys['E']) and (GetGameTimer() - GUI.Time) > 150 then + if InstanceInvite ~= nil and IsControlPressed(0, Keys['E']) and (GetGameTimer() - GUI.Time) > 150 then - local playerPed = GetPlayerPed(-1) + local playerPed = GetPlayerPed(-1) - EnterInstance(InstanceInvite) + EnterInstance(InstanceInvite) - ShowNotification(_U('entered_instance')) + ShowNotification(_U('entered_instance')) - InstanceInvite = nil - GUI.Time = GetGameTimer() + InstanceInvite = nil + GUI.Time = GetGameTimer() - end + end - end + end end) -- Instance players Citizen.CreateThread(function() - while true do + while true do - Wait(0) + Wait(0) - if Instance.host ~= nil then + if Instance.host ~= nil then - local playerPed = GetPlayerPed(-1) + local playerPed = GetPlayerPed(-1) - for i=0, 32, 1 do + for i=0, 32, 1 do - local found = false + local found = false - for j=1, #Instance.players, 1 do + for j=1, #Instance.players, 1 do - instancePlayer = GetPlayerFromServerId(Instance.players[j]) + instancePlayer = GetPlayerFromServerId(Instance.players[j]) - if i == instancePlayer then - found = true - end + if i == instancePlayer then + found = true + end - end + end - if not found then + if not found then - local otherPlayerPed = GetPlayerPed(i) + local otherPlayerPed = GetPlayerPed(i) - SetEntityLocallyInvisible(otherPlayerPed) - SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) - end + SetEntityLocallyInvisible(otherPlayerPed) + SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) + end - end + end - else + else - local playerPed = GetPlayerPed(-1) + local playerPed = GetPlayerPed(-1) - for i=0, 32, 1 do + for i=0, 32, 1 do - local found = false + local found = false - for j=1, #InstancedPlayers, 1 do + for j=1, #InstancedPlayers, 1 do - instancePlayer = GetPlayerFromServerId(InstancedPlayers[j]) + instancePlayer = GetPlayerFromServerId(InstancedPlayers[j]) - if i == instancePlayer then - found = true - end + if i == instancePlayer then + found = true + end - end + end - if found then + if found then - local otherPlayerPed = GetPlayerPed(i) + local otherPlayerPed = GetPlayerPed(i) - SetEntityLocallyInvisible(otherPlayerPed) - SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) - end + SetEntityLocallyInvisible(otherPlayerPed) + SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) + end - end + end - end + end - end + end end) Citizen.CreateThread(function() - TriggerEvent('instance:loaded') -end) \ No newline at end of file + TriggerEvent('instance:loaded') +end) diff --git a/locales/br.lua b/locales/br.lua index 47c85b40..180c39f1 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,8 +1,6 @@ Locales['br'] = { - - ['left_instance'] = 'Você deixou a instância', - ['invite_expired'] = 'Convite expirado', - ['press_to_enter'] = 'Pressione ~INPUT_CONTEXT~ para entrar na instância', - ['entered_instance'] = 'Você entrou na instância', - + ['left_instance'] = 'Você deixou a instância', + ['invite_expired'] = 'Convite expirado', + ['press_to_enter'] = 'Pressione ~INPUT_CONTEXT~ para entrar na instância', + ['entered_instance'] = 'Você entrou na instância', } diff --git a/locales/en.lua b/locales/en.lua index 41f01dcb..522e7c03 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,10 +1,8 @@ Locales['en'] = { - - ['left_instance'] = 'you have left the instance', - ['invite_expired'] = 'invite expired', - ['press_to_enter'] = 'press ~INPUT_CONTEXT~ to enter the instance', - ['entered_instance'] = 'you entered the instance', - ['entered_into'] = ' entered the instance', - ['left_out'] = ' left the instance', - + ['left_instance'] = 'you have left the instance', + ['invite_expired'] = 'invite expired', + ['press_to_enter'] = 'press ~INPUT_CONTEXT~ to enter the instance', + ['entered_instance'] = 'you entered the instance', + ['entered_into'] = ' entered the instance', + ['left_out'] = ' left the instance', } diff --git a/locales/fr.lua b/locales/fr.lua index 02a2f407..766bad80 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,10 +1,8 @@ Locales['fr'] = { - - ['left_instance'] = 'vous avez quitté l\'instance', - ['invite_expired'] = 'invitation expirée', - ['press_to_enter'] = 'appuyez sur ~INPUT_CONTEXT~ pour entrer dans l\'instance', - ['entered_instance'] = 'vous êtes entré dans l\'instance', - ['entered_into'] = ' est entré dans l\'instance', - ['left_out'] = ' est sorti dans l\'instance', - + ['left_instance'] = 'vous avez quitté l\'instance', + ['invite_expired'] = 'invitation expirée', + ['press_to_enter'] = 'appuyez sur ~INPUT_CONTEXT~ pour entrer dans l\'instance', + ['entered_instance'] = 'vous êtes entré dans l\'instance', + ['entered_into'] = ' est entré dans l\'instance', + ['left_out'] = ' est sorti dans l\'instance', } diff --git a/server/main.lua b/server/main.lua index c461a425..9c5e3c72 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,142 +2,142 @@ local Instances = {} function GetInstancedPlayers() - local players = {} + local players = {} - for k,v in pairs(Instances) do - for i=1, #v.players, 1 do - table.insert(players, v.players[i]) - end - end + for k,v in pairs(Instances) do + for i=1, #v.players, 1 do + table.insert(players, v.players[i]) + end + end - return players + return players end function CreateInstance(type, player, data) - Instances[player] = { - type = type, - host = player, - players = {}, - data = data - } + Instances[player] = { + type = type, + host = player, + players = {}, + data = data + } - TriggerEvent('instance:onCreate', Instances[player]) - TriggerClientEvent('instance:onCreate', player, Instances[player]) - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + TriggerEvent('instance:onCreate', Instances[player]) + TriggerClientEvent('instance:onCreate', player, Instances[player]) + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) end function CloseInstance(instance) - if Instances[instance] ~= nil then + if Instances[instance] ~= nil then - for i=1, #Instances[instance].players, 1 do - TriggerClientEvent('instance:onClose', Instances[instance].players[i]) - end + for i=1, #Instances[instance].players, 1 do + TriggerClientEvent('instance:onClose', Instances[instance].players[i]) + end - Instances[instance] = nil + Instances[instance] = nil - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) - TriggerEvent('instance:onClose', instance) - end + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + TriggerEvent('instance:onClose', instance) + end end function AddPlayerToInstance(instance, player) - - local found = false - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] == player then - found = true - break - end - end + local found = false - if not found then - table.insert(Instances[instance].players, player) - end + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] == player then + found = true + break + end + end - TriggerClientEvent('instance:onEnter', player, Instances[instance]) + if not found then + table.insert(Instances[instance].players, player) + end - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerEntered', Instances[instance].players[i], Instances[instance], player) - end + TriggerClientEvent('instance:onEnter', player, Instances[instance]) - end + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerEntered', Instances[instance].players[i], Instances[instance], player) + end - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + end + + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) end function RemovePlayerFromInstance(instance, player) - if Instances[instance] ~= nil then + if Instances[instance] ~= nil then - TriggerClientEvent('instance:onLeave', player, Instances[instance]) + TriggerClientEvent('instance:onLeave', player, Instances[instance]) - if Instances[instance].host == player then - - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) - end - end + if Instances[instance].host == player then - CloseInstance(instance) - - else + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) + end + end - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] == player then - Instances[instance].players[i] = nil - end - end + CloseInstance(instance) - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) - end - - end + else - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] == player then + Instances[instance].players[i] = nil + end + end - end + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) + end - end + end + + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + + end + + end end function InvitePlayerToInstance(instance, type, player, data) - TriggerClientEvent('instance:onInvite', player, instance, type, data) + TriggerClientEvent('instance:onInvite', player, instance, type, data) end RegisterServerEvent('instance:create') AddEventHandler('instance:create', function(type, data) - CreateInstance(type, source, data) + CreateInstance(type, source, data) end) RegisterServerEvent('instance:close') AddEventHandler('instance:close', function() - CloseInstance(source) + CloseInstance(source) end) RegisterServerEvent('instance:enter') AddEventHandler('instance:enter', function(instance) - AddPlayerToInstance(instance, source) + AddPlayerToInstance(instance, source) end) RegisterServerEvent('instance:leave') AddEventHandler('instance:leave', function(instance) - RemovePlayerFromInstance(instance, source) + RemovePlayerFromInstance(instance, source) end) RegisterServerEvent('instance:invite') AddEventHandler('instance:invite', function(instance, type, player, data) - InvitePlayerToInstance(instance, type, player, data) + InvitePlayerToInstance(instance, type, player, data) end) From dea7f73d2eb366f8cf5fd13593aebc5038176327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:19:04 +0200 Subject: [PATCH 13/29] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..3790339c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + fxserver-instance + Copyright (C) 2015 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + fxserver-instance Copyright (C) 2015 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. From 180a1273524a487351e7e60f78b2d70f0fc473b6 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 30 Apr 2018 15:37:05 +0200 Subject: [PATCH 14/29] Fixed vehicles randomly spawning #3 --- README.md | 3 +-- __resource.lua | 28 +++++++++++++++------------ client/main.lua | 50 +++++++++++++++++++++++++++++++++---------------- config.lua | 5 +++-- locales/sv.lua | 8 ++++++++ 5 files changed, 62 insertions(+), 32 deletions(-) create mode 100644 locales/sv.lua diff --git a/README.md b/README.md index 1d59060d..25a712af 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# fxserver-instance -FXServer Instance +# instance [INSTALLATION] diff --git a/__resource.lua b/__resource.lua index adf1086e..b725b5b0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,21 +2,25 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'Instance' +version '1.1.0' + server_scripts { - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'config.lua', + 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index de9a5a3a..170a436d 100644 --- a/client/main.lua +++ b/client/main.lua @@ -16,12 +16,14 @@ local Instance = {} local InstanceInvite = nil local InstancedPlayers = {} local RegisteredInstanceTypes = {} +local InsideInstance = false +ESX = nil -function ShowNotification(msg) - SetNotificationTextEntry('STRING') - AddTextComponentString(msg) - DrawNotification(0, 1) -end +Citizen.CreateThread(function() + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) function GetInstance() return Instance @@ -37,7 +39,7 @@ function CloseInstance() end function EnterInstance(instance) - + InsideInstance = true TriggerServerEvent('instance:enter', instance.host) if RegisteredInstanceTypes[instance.type].enter ~= nil then @@ -60,7 +62,7 @@ function LeaveInstance() TriggerServerEvent('instance:leave', Instance.host) end - + InsideInstance = false end function InviteToInstance(type, player, data) @@ -130,13 +132,13 @@ end) RegisterNetEvent('instance:onPlayerEntered') AddEventHandler('instance:onPlayerEntered', function(instance, player) Instance = instance - ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('entered_into')) + ESX.ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('entered_into')) end) RegisterNetEvent('instance:onPlayerLeft') AddEventHandler('instance:onPlayerLeft', function(instance, player) Instance = instance - ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('left_out')) + ESX.ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('left_out')) end) RegisterNetEvent('instance:onInvite') @@ -153,7 +155,7 @@ AddEventHandler('instance:onInvite', function(instance, type, data) Citizen.Wait(10000) if InstanceInvite ~= nil then - ShowNotification(_U('invite_expired')) + ESX.ShowNotification(_U('invite_expired')) InstanceInvite = nil end @@ -167,7 +169,7 @@ RegisterInstanceType('default') Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(0) if InstanceInvite ~= nil then SetTextComponentFormat('STRING') @@ -182,7 +184,7 @@ end) Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(10) if InstanceInvite ~= nil and IsControlPressed(0, Keys['E']) and (GetGameTimer() - GUI.Time) > 150 then @@ -190,7 +192,7 @@ Citizen.CreateThread(function() EnterInstance(InstanceInvite) - ShowNotification(_U('entered_instance')) + ESX.ShowNotification(_U('entered_instance')) InstanceInvite = nil GUI.Time = GetGameTimer() @@ -206,13 +208,13 @@ Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(0) if Instance.host ~= nil then local playerPed = GetPlayerPed(-1) - for i=0, 32, 1 do + for i=0, Config.MaxPlayers, 1 do local found = false @@ -240,7 +242,7 @@ Citizen.CreateThread(function() local playerPed = GetPlayerPed(-1) - for i=0, 32, 1 do + for i=0, Config.MaxPlayers, 1 do local found = false @@ -273,3 +275,19 @@ end) Citizen.CreateThread(function() TriggerEvent('instance:loaded') end) + +-- Fix vehicles randomly spawning nearby the player inside an instance +Citizen.CreateThread(function() + while true do + Citizen.Wait(0) -- must be run every frame + + if InsideInstance then + SetVehicleDensityMultiplierThisFrame(0.0) + SetParkedVehicleDensityMultiplierThisFrame(0.0) + local pos = GetEntityCoords(GetPlayerPed(-1)) + RemoveVehiclesFromGeneratorsInArea(pos['x'] - 900.0, pos['y'] - 900.0, pos['z'] - 900.0, pos['x'] + 900.0, pos['y'] + 900.0, pos['z'] + 900.0); + else + Citizen.Wait(1000) + end + end +end) \ No newline at end of file diff --git a/config.lua b/config.lua index 56a8b5e9..4a13c6bf 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,3 @@ -Config = {} -Config.Locale = 'fr' +Config = {} +Config.Locale = 'fr' +Config.MaxPlayers = 32 diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..2723a78e --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,8 @@ +Locales['sv'] = { + ['left_instance'] = 'du har lämnat byggnaden', + ['invite_expired'] = 'din inbjudan har nekas', + ['press_to_enter'] = 'tryck ~INPUT_CONTEXT~ för att gå in i byggnaden', + ['entered_instance'] = 'du är inne i byggnaden', + ['entered_into'] = 'du gick in i byggnaden', + ['left_out'] = 'du har lämnat byggnaden', +} \ No newline at end of file From 4dcaf6b9ba25d02fc86bd3389171ff01af58eae0 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 30 Apr 2018 15:37:28 +0200 Subject: [PATCH 15/29] Fixed vehicles randomly spawning --- client/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.lua b/client/main.lua index 170a436d..87ece1e8 100644 --- a/client/main.lua +++ b/client/main.lua @@ -20,6 +20,7 @@ local InsideInstance = false ESX = nil Citizen.CreateThread(function() + while ESX == nil do TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) Citizen.Wait(0) end From 72a733747b967aadd490fa39e9ea597dad2960b8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 22 May 2018 19:58:39 +0200 Subject: [PATCH 16/29] Fixed bug with esx_garage, updated readme --- README.md | 33 ++++++++++++++++++++++++++++----- client/main.lua | 7 ++++--- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 25a712af..75e4a94a 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,37 @@ # instance -[INSTALLATION] +## Download & Installation -1) CD in your resources folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/FXServer-ESX/fxserver-instance instance +fvm install --save --folder=esx esx-org/instance ``` -3) Add this in your server.cfg : + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/instance [esx]/instance +``` + +### Manually +- Download https://github.com/ESX-Org/instance/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Add this to your `server.cfg`: ``` start instance ``` + +# Legal +### License +instance - enter buildings! + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index 87ece1e8..910d9f52 100644 --- a/client/main.lua +++ b/client/main.lua @@ -37,6 +37,7 @@ end function CloseInstance() Instance = {} TriggerServerEvent('instance:close') + InsideInstance = false end function EnterInstance(instance) @@ -282,13 +283,13 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) -- must be run every frame - if InsideInstance then + if InsideInstance then SetVehicleDensityMultiplierThisFrame(0.0) SetParkedVehicleDensityMultiplierThisFrame(0.0) local pos = GetEntityCoords(GetPlayerPed(-1)) - RemoveVehiclesFromGeneratorsInArea(pos['x'] - 900.0, pos['y'] - 900.0, pos['z'] - 900.0, pos['x'] + 900.0, pos['y'] + 900.0, pos['z'] + 900.0); + RemoveVehiclesFromGeneratorsInArea(pos.x - 900.0, pos.y - 900.0, pos.z - 900.0, pos.x + 900.0, pos.y + 900.0, pos.z + 900.0); else - Citizen.Wait(1000) + Citizen.Wait(5000) end end end) \ No newline at end of file From 39c03cb0b6c29136489e87ee94157dfda61fe939 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:56:49 -0400 Subject: [PATCH 17/29] Repo Update --- .editorconfig | 6 +++--- LICENSE.txt => LICENSE | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig index 41c2aaf2..9b425256 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,9 @@ root = true [*] -indent_size = 2 -indent_style = space -end_of_line = lf +indent_size = 4 +indent_style = tab +end_of_line = crlf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 9db250359a3874b7ea88f23bfefabfe5bc708d79 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 21 Aug 2018 20:22:50 +0200 Subject: [PATCH 18/29] Locale formatting, 4 tab indent --- client/main.lua | 247 +++++++++++++++++++++++------------------------- locales/br.lua | 10 +- locales/en.lua | 4 +- locales/fr.lua | 4 +- locales/sv.lua | 4 +- server/main.lua | 150 ++++++++++++++--------------- 6 files changed, 199 insertions(+), 220 deletions(-) diff --git a/client/main.lua b/client/main.lua index 910d9f52..2b4db27c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,8 +10,6 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -local GUI = {} -GUI.Time = 0 local Instance = {} local InstanceInvite = nil local InstancedPlayers = {} @@ -27,255 +25,243 @@ Citizen.CreateThread(function() end) function GetInstance() - return Instance + return Instance end function CreateInstance(type, data) - TriggerServerEvent('instance:create', type, data) + TriggerServerEvent('instance:create', type, data) end function CloseInstance() - Instance = {} - TriggerServerEvent('instance:close') - InsideInstance = false + Instance = {} + TriggerServerEvent('instance:close') + InsideInstance = false end function EnterInstance(instance) - InsideInstance = true - TriggerServerEvent('instance:enter', instance.host) - - if RegisteredInstanceTypes[instance.type].enter ~= nil then - RegisteredInstanceTypes[instance.type].enter(instance) - end + InsideInstance = true + TriggerServerEvent('instance:enter', instance.host) + if RegisteredInstanceTypes[instance.type].enter ~= nil then + RegisteredInstanceTypes[instance.type].enter(instance) + end end function LeaveInstance() + if Instance.host ~= nil then - if Instance.host ~= nil then + if #Instance.players > 1 then + TriggerEvent('esx:showNotification', _U('left_instance')) + end - if #Instance.players > 1 then - TriggerEvent('esx:showNotification', _U('left_instance')) - end + if RegisteredInstanceTypes[Instance.type].exit ~= nil then + RegisteredInstanceTypes[Instance.type].exit(Instance) + end - if RegisteredInstanceTypes[Instance.type].exit ~= nil then - RegisteredInstanceTypes[Instance.type].exit(Instance) - end + TriggerServerEvent('instance:leave', Instance.host) + end - TriggerServerEvent('instance:leave', Instance.host) - end - InsideInstance = false + InsideInstance = false end function InviteToInstance(type, player, data) - TriggerServerEvent('instance:invite', Instance.host, type, player, data) + TriggerServerEvent('instance:invite', Instance.host, type, player, data) end function RegisterInstanceType(type, enter, exit) - RegisteredInstanceTypes[type] = { - enter = enter, - exit = exit - } + RegisteredInstanceTypes[type] = { + enter = enter, + exit = exit + } end AddEventHandler('instance:get', function(cb) - cb(GetInstance()) + cb(GetInstance()) end) AddEventHandler('instance:create', function(type, data) - CreateInstance(type, data) + CreateInstance(type, data) end) AddEventHandler('instance:close', function() - CloseInstance() + CloseInstance() end) AddEventHandler('instance:enter', function(instance) - EnterInstance(instance) + EnterInstance(instance) end) AddEventHandler('instance:leave', function() - LeaveInstance() + LeaveInstance() end) AddEventHandler('instance:invite', function(type, player, data) - InviteToInstance(type, player, data) + InviteToInstance(type, player, data) end) AddEventHandler('instance:registerType', function(name, enter, exit) - RegisterInstanceType(name, enter, exit) + RegisterInstanceType(name, enter, exit) end) RegisterNetEvent('instance:onInstancedPlayersData') AddEventHandler('instance:onInstancedPlayersData', function(instancedPlayers) - InstancedPlayers = instancedPlayers + InstancedPlayers = instancedPlayers end) RegisterNetEvent('instance:onCreate') AddEventHandler('instance:onCreate', function(instance) - Instance = {} + Instance = {} end) RegisterNetEvent('instance:onEnter') AddEventHandler('instance:onEnter', function(instance) - Instance = instance + Instance = instance end) RegisterNetEvent('instance:onLeave') AddEventHandler('instance:onClose', function(instance) - Instance = {} + Instance = {} end) RegisterNetEvent('instance:onClose') AddEventHandler('instance:onClose', function(instance) - Instance = {} + Instance = {} end) RegisterNetEvent('instance:onPlayerEntered') AddEventHandler('instance:onPlayerEntered', function(instance, player) - Instance = instance - ESX.ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('entered_into')) + Instance = instance + local playerName = GetPlayerName(GetPlayerFromServerId(player)) + + ESX.ShowNotification(_('entered_into', playerName)) end) RegisterNetEvent('instance:onPlayerLeft') AddEventHandler('instance:onPlayerLeft', function(instance, player) - Instance = instance - ESX.ShowNotification(GetPlayerName(GetPlayerFromServerId(player)) .. _('left_out')) + Instance = instance + local playerName = GetPlayerName(GetPlayerFromServerId(player)) + + ESX.ShowNotification(_('left_out', playerName)) end) RegisterNetEvent('instance:onInvite') AddEventHandler('instance:onInvite', function(instance, type, data) + InstanceInvite = { + type = type, + host = instance, + data = data + } - InstanceInvite = { - type = type, - host = instance, - data = data - } - - Citizen.CreateThread(function() - - Citizen.Wait(10000) - - if InstanceInvite ~= nil then - ESX.ShowNotification(_U('invite_expired')) - InstanceInvite = nil - end - - end) + Citizen.CreateThread(function() + Citizen.Wait(10000) + if InstanceInvite ~= nil then + ESX.ShowNotification(_U('invite_expired')) + InstanceInvite = nil + end + end) end) RegisterInstanceType('default') -- Input invites Citizen.CreateThread(function() - while true do + while true do + Citizen.Wait(0) - Citizen.Wait(0) + if InstanceInvite ~= nil then + ESX.ShowHelpNotification(_U('press_to_enter')) + else + Citizen.Wait(500) + end - if InstanceInvite ~= nil then - SetTextComponentFormat('STRING') - AddTextComponentString(_U('press_to_enter')) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) - end - - end + end end) -- Controls Citizen.CreateThread(function() - while true do + while true do - Citizen.Wait(10) + Citizen.Wait(10) - if InstanceInvite ~= nil and IsControlPressed(0, Keys['E']) and (GetGameTimer() - GUI.Time) > 150 then + if InstanceInvite ~= nil and IsControlJustReleased(0, Keys['E']) then + local playerPed = PlayerPedId() - local playerPed = GetPlayerPed(-1) + EnterInstance(InstanceInvite) + ESX.ShowNotification(_U('entered_instance')) + InstanceInvite = nil - EnterInstance(InstanceInvite) + elseif InstanceInvite == nil then + Citizen.Wait(500) + end - ESX.ShowNotification(_U('entered_instance')) - - InstanceInvite = nil - GUI.Time = GetGameTimer() - - end - - end + end end) -- Instance players Citizen.CreateThread(function() - while true do + while true do - Citizen.Wait(0) + Citizen.Wait(0) - if Instance.host ~= nil then + if Instance.host ~= nil then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() - for i=0, Config.MaxPlayers, 1 do + for i=0, Config.MaxPlayers, 1 do - local found = false + local found = false + for j=1, #Instance.players, 1 do + instancePlayer = GetPlayerFromServerId(Instance.players[j]) - for j=1, #Instance.players, 1 do + if i == instancePlayer then + found = true + end + end - instancePlayer = GetPlayerFromServerId(Instance.players[j]) + if not found then + local otherPlayerPed = GetPlayerPed(i) - if i == instancePlayer then - found = true - end + SetEntityLocallyInvisible(otherPlayerPed) + SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) + end - end + end - if not found then + else - local otherPlayerPed = GetPlayerPed(i) + local playerPed = PlayerPedId() - SetEntityLocallyInvisible(otherPlayerPed) - SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) - end + for i=0, Config.MaxPlayers, 1 do - end + local found = false + for j=1, #InstancedPlayers, 1 do + instancePlayer = GetPlayerFromServerId(InstancedPlayers[j]) - else + if i == instancePlayer then + found = true + end + end - local playerPed = GetPlayerPed(-1) + if found then + local otherPlayerPed = GetPlayerPed(i) - for i=0, Config.MaxPlayers, 1 do + SetEntityLocallyInvisible(otherPlayerPed) + SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) + end - local found = false + end - for j=1, #InstancedPlayers, 1 do + end - instancePlayer = GetPlayerFromServerId(InstancedPlayers[j]) - - if i == instancePlayer then - found = true - end - - end - - if found then - - local otherPlayerPed = GetPlayerPed(i) - - SetEntityLocallyInvisible(otherPlayerPed) - SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) - end - - end - - end - - end + end end) Citizen.CreateThread(function() - TriggerEvent('instance:loaded') + TriggerEvent('instance:loaded') end) -- Fix vehicles randomly spawning nearby the player inside an instance @@ -283,11 +269,12 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) -- must be run every frame - if InsideInstance then + if InsideInstance then SetVehicleDensityMultiplierThisFrame(0.0) SetParkedVehicleDensityMultiplierThisFrame(0.0) - local pos = GetEntityCoords(GetPlayerPed(-1)) - RemoveVehiclesFromGeneratorsInArea(pos.x - 900.0, pos.y - 900.0, pos.z - 900.0, pos.x + 900.0, pos.y + 900.0, pos.z + 900.0); + + local pos = GetEntityCoords(PlayerPedId()) + RemoveVehiclesFromGeneratorsInArea(pos.x - 900.0, pos.y - 900.0, pos.z - 900.0, pos.x + 900.0, pos.y + 900.0, pos.z + 900.0) else Citizen.Wait(5000) end diff --git a/locales/br.lua b/locales/br.lua index 180c39f1..fc61fd64 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,6 +1,8 @@ Locales['br'] = { - ['left_instance'] = 'Você deixou a instância', - ['invite_expired'] = 'Convite expirado', - ['press_to_enter'] = 'Pressione ~INPUT_CONTEXT~ para entrar na instância', - ['entered_instance'] = 'Você entrou na instância', + ['left_instance'] = 'você deixou a instância', + ['invite_expired'] = 'convite expirado', + ['press_to_enter'] = 'pressione ~INPUT_CONTEXT~ para entrar na instância', + ['entered_instance'] = 'você entrou na instância', + ['entered_into'] = '%s entered the instance', + ['left_out'] = '%s left the instance', } diff --git a/locales/en.lua b/locales/en.lua index 522e7c03..0c2a0daa 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -3,6 +3,6 @@ Locales['en'] = { ['invite_expired'] = 'invite expired', ['press_to_enter'] = 'press ~INPUT_CONTEXT~ to enter the instance', ['entered_instance'] = 'you entered the instance', - ['entered_into'] = ' entered the instance', - ['left_out'] = ' left the instance', + ['entered_into'] = '%s entered the instance', + ['left_out'] = '%s left the instance', } diff --git a/locales/fr.lua b/locales/fr.lua index 766bad80..7b480d29 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -3,6 +3,6 @@ Locales['fr'] = { ['invite_expired'] = 'invitation expirée', ['press_to_enter'] = 'appuyez sur ~INPUT_CONTEXT~ pour entrer dans l\'instance', ['entered_instance'] = 'vous êtes entré dans l\'instance', - ['entered_into'] = ' est entré dans l\'instance', - ['left_out'] = ' est sorti dans l\'instance', + ['entered_into'] = '%s est entré dans l\'instance', + ['left_out'] = '%s est sorti dans l\'instance', } diff --git a/locales/sv.lua b/locales/sv.lua index 2723a78e..ae466b65 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -3,6 +3,6 @@ Locales['sv'] = { ['invite_expired'] = 'din inbjudan har nekas', ['press_to_enter'] = 'tryck ~INPUT_CONTEXT~ för att gå in i byggnaden', ['entered_instance'] = 'du är inne i byggnaden', - ['entered_into'] = 'du gick in i byggnaden', - ['left_out'] = 'du har lämnat byggnaden', + ['entered_into'] = '%s gick in i byggnaden', + ['left_out'] = '%s har lämnat byggnaden', } \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 9c5e3c72..fa2949ce 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,143 +1,133 @@ local Instances = {} function GetInstancedPlayers() + local players = {} - local players = {} - - for k,v in pairs(Instances) do - for i=1, #v.players, 1 do - table.insert(players, v.players[i]) - end - end - - return players + for k,v in pairs(Instances) do + for i=1, #v.players, 1 do + table.insert(players, v.players[i]) + end + end + return players end function CreateInstance(type, player, data) + Instances[player] = { + type = type, + host = player, + players = {}, + data = data + } - Instances[player] = { - type = type, - host = player, - players = {}, - data = data - } - - TriggerEvent('instance:onCreate', Instances[player]) - TriggerClientEvent('instance:onCreate', player, Instances[player]) - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) - + TriggerEvent('instance:onCreate', Instances[player]) + TriggerClientEvent('instance:onCreate', player, Instances[player]) + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) end function CloseInstance(instance) + if Instances[instance] ~= nil then - if Instances[instance] ~= nil then + for i=1, #Instances[instance].players, 1 do + TriggerClientEvent('instance:onClose', Instances[instance].players[i]) + end - for i=1, #Instances[instance].players, 1 do - TriggerClientEvent('instance:onClose', Instances[instance].players[i]) - end - - Instances[instance] = nil - - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) - TriggerEvent('instance:onClose', instance) - end + Instances[instance] = nil + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + TriggerEvent('instance:onClose', instance) + end end function AddPlayerToInstance(instance, player) + local found = false - local found = false + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] == player then + found = true + break + end + end - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] == player then - found = true - break - end - end + if not found then + table.insert(Instances[instance].players, player) + end - if not found then - table.insert(Instances[instance].players, player) - end + TriggerClientEvent('instance:onEnter', player, Instances[instance]) - TriggerClientEvent('instance:onEnter', player, Instances[instance]) - - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerEntered', Instances[instance].players[i], Instances[instance], player) - end - - end - - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerEntered', Instances[instance].players[i], Instances[instance], player) + end + end + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) end function RemovePlayerFromInstance(instance, player) - if Instances[instance] ~= nil then + if Instances[instance] ~= nil then - TriggerClientEvent('instance:onLeave', player, Instances[instance]) + TriggerClientEvent('instance:onLeave', player, Instances[instance]) - if Instances[instance].host == player then + if Instances[instance].host == player then - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) - end - end + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) + end + end - CloseInstance(instance) + CloseInstance(instance) - else + else - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] == player then - Instances[instance].players[i] = nil - end - end + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] == player then + Instances[instance].players[i] = nil + end + end - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) - end + for i=1, #Instances[instance].players, 1 do + if Instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) + end - end + end - TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) + TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) - end + end - end + end end function InvitePlayerToInstance(instance, type, player, data) - TriggerClientEvent('instance:onInvite', player, instance, type, data) + TriggerClientEvent('instance:onInvite', player, instance, type, data) end RegisterServerEvent('instance:create') AddEventHandler('instance:create', function(type, data) - CreateInstance(type, source, data) + CreateInstance(type, source, data) end) RegisterServerEvent('instance:close') AddEventHandler('instance:close', function() - CloseInstance(source) + CloseInstance(source) end) RegisterServerEvent('instance:enter') AddEventHandler('instance:enter', function(instance) - AddPlayerToInstance(instance, source) + AddPlayerToInstance(instance, source) end) RegisterServerEvent('instance:leave') AddEventHandler('instance:leave', function(instance) - RemovePlayerFromInstance(instance, source) + RemovePlayerFromInstance(instance, source) end) RegisterServerEvent('instance:invite') AddEventHandler('instance:invite', function(instance, type, player, data) - InvitePlayerToInstance(instance, type, player, data) + InvitePlayerToInstance(instance, type, player, data) end) - From b3adca599deedeeb496ef3cf16e45de02d804885 Mon Sep 17 00:00:00 2001 From: MajorMarcin Date: Mon, 27 Aug 2018 09:28:21 +0200 Subject: [PATCH 19/29] add pl --- __resource.lua | 2 ++ locales/pl.lua | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index b725b5b0..b5859d1f 100644 --- a/__resource.lua +++ b/__resource.lua @@ -10,6 +10,7 @@ server_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -21,6 +22,7 @@ client_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..efb78eeb --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,8 @@ +Locales['pl'] = { + ['left_instance'] = 'opuszczasz instancję', + ['invite_expired'] = 'zaproszenie wygasło', + ['press_to_enter'] = 'wciśnij ~INPUT_CONTEXT~ aby wejść do instancji', + ['entered_instance'] = 'wchodzisz do instancji', + ['entered_into'] = '%s wchodzi do instancji', + ['left_out'] = '%s opuszcza instancję', +} \ No newline at end of file From 5ee7566d9253dc1d5b47e884b365745ac74fd152 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Dec 2018 21:53:36 +0100 Subject: [PATCH 20/29] Check IsControlJustReleased() every frame --- client/main.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index 2b4db27c..214455fa 100644 --- a/client/main.lua +++ b/client/main.lua @@ -51,7 +51,7 @@ function LeaveInstance() if Instance.host ~= nil then if #Instance.players > 1 then - TriggerEvent('esx:showNotification', _U('left_instance')) + ESX.ShowNotification(_U('left_instance')) end if RegisteredInstanceTypes[Instance.type].exit ~= nil then @@ -182,7 +182,7 @@ end) Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) if InstanceInvite ~= nil and IsControlJustReleased(0, Keys['E']) then local playerPed = PlayerPedId() @@ -201,7 +201,6 @@ end) -- Instance players Citizen.CreateThread(function() - while true do Citizen.Wait(0) @@ -257,7 +256,6 @@ Citizen.CreateThread(function() end end - end) Citizen.CreateThread(function() @@ -276,7 +274,7 @@ Citizen.CreateThread(function() local pos = GetEntityCoords(PlayerPedId()) RemoveVehiclesFromGeneratorsInArea(pos.x - 900.0, pos.y - 900.0, pos.z - 900.0, pos.x + 900.0, pos.y + 900.0, pos.z + 900.0) else - Citizen.Wait(5000) + Citizen.Wait(500) end end end) \ No newline at end of file From 8bb102c843a66395be68711cb2f21de4237e1940 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 25 Jul 2019 12:24:02 +0200 Subject: [PATCH 21/29] Performance improvements, removed keys table --- client/main.lua | 191 +++++++++++++++++------------------------------- config.lua | 6 +- server/main.lua | 68 ++++++++--------- 3 files changed, 99 insertions(+), 166 deletions(-) diff --git a/client/main.lua b/client/main.lua index 214455fa..43e0ce69 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,21 +1,6 @@ -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - -local Instance = {} -local InstanceInvite = nil -local InstancedPlayers = {} -local RegisteredInstanceTypes = {} -local InsideInstance = false -ESX = nil +local instance, instancedPlayers, registeredInstanceTypes = {}, {}, {} +local instanceInvite, insideInstance +ESX = nil Citizen.CreateThread(function() while ESX == nil do @@ -25,7 +10,7 @@ Citizen.CreateThread(function() end) function GetInstance() - return Instance + return instance end function CreateInstance(type, data) @@ -33,43 +18,42 @@ function CreateInstance(type, data) end function CloseInstance() - Instance = {} + instance = {} TriggerServerEvent('instance:close') - InsideInstance = false + insideInstance = false end function EnterInstance(instance) - InsideInstance = true + insideInstance = true TriggerServerEvent('instance:enter', instance.host) - if RegisteredInstanceTypes[instance.type].enter ~= nil then - RegisteredInstanceTypes[instance.type].enter(instance) + if registeredInstanceTypes[instance.type].enter then + registeredInstanceTypes[instance.type].enter(instance) end end function LeaveInstance() - if Instance.host ~= nil then - - if #Instance.players > 1 then + if instance.host then + if #instance.players > 1 then ESX.ShowNotification(_U('left_instance')) end - if RegisteredInstanceTypes[Instance.type].exit ~= nil then - RegisteredInstanceTypes[Instance.type].exit(Instance) + if registeredInstanceTypes[instance.type].exit then + registeredInstanceTypes[instance.type].exit(instance) end - TriggerServerEvent('instance:leave', Instance.host) + TriggerServerEvent('instance:leave', instance.host) end - InsideInstance = false + insideInstance = false end function InviteToInstance(type, player, data) - TriggerServerEvent('instance:invite', Instance.host, type, player, data) + TriggerServerEvent('instance:invite', instance.host, type, player, data) end function RegisterInstanceType(type, enter, exit) - RegisteredInstanceTypes[type] = { + registeredInstanceTypes[type] = { enter = enter, exit = exit } @@ -87,8 +71,8 @@ AddEventHandler('instance:close', function() CloseInstance() end) -AddEventHandler('instance:enter', function(instance) - EnterInstance(instance) +AddEventHandler('instance:enter', function(_instance) + EnterInstance(_instance) end) AddEventHandler('instance:leave', function() @@ -104,157 +88,114 @@ AddEventHandler('instance:registerType', function(name, enter, exit) end) RegisterNetEvent('instance:onInstancedPlayersData') -AddEventHandler('instance:onInstancedPlayersData', function(instancedPlayers) - InstancedPlayers = instancedPlayers +AddEventHandler('instance:onInstancedPlayersData', function(_instancedPlayers) + instancedPlayers = _instancedPlayers end) RegisterNetEvent('instance:onCreate') -AddEventHandler('instance:onCreate', function(instance) - Instance = {} +AddEventHandler('instance:onCreate', function(_instance) + instance = {} end) RegisterNetEvent('instance:onEnter') -AddEventHandler('instance:onEnter', function(instance) - Instance = instance +AddEventHandler('instance:onEnter', function(_instance) + instance = _instance end) RegisterNetEvent('instance:onLeave') -AddEventHandler('instance:onClose', function(instance) - Instance = {} +AddEventHandler('instance:onLeave', function(_instance) + instance = {} end) RegisterNetEvent('instance:onClose') -AddEventHandler('instance:onClose', function(instance) - Instance = {} +AddEventHandler('instance:onClose', function(_instance) + instance = {} end) RegisterNetEvent('instance:onPlayerEntered') -AddEventHandler('instance:onPlayerEntered', function(instance, player) - Instance = instance +AddEventHandler('instance:onPlayerEntered', function(_instance, player) + instance = _instance local playerName = GetPlayerName(GetPlayerFromServerId(player)) ESX.ShowNotification(_('entered_into', playerName)) end) RegisterNetEvent('instance:onPlayerLeft') -AddEventHandler('instance:onPlayerLeft', function(instance, player) - Instance = instance +AddEventHandler('instance:onPlayerLeft', function(_instance, player) + instance = _instance local playerName = GetPlayerName(GetPlayerFromServerId(player)) ESX.ShowNotification(_('left_out', playerName)) end) RegisterNetEvent('instance:onInvite') -AddEventHandler('instance:onInvite', function(instance, type, data) - InstanceInvite = { +AddEventHandler('instance:onInvite', function(_instance, type, data) + instanceInvite = { type = type, - host = instance, + host = _instance, data = data } Citizen.CreateThread(function() Citizen.Wait(10000) - if InstanceInvite ~= nil then + if instanceInvite then ESX.ShowNotification(_U('invite_expired')) - InstanceInvite = nil + instanceInvite = nil end end) end) RegisterInstanceType('default') --- Input invites +-- Controls for invite Citizen.CreateThread(function() while true do Citizen.Wait(0) - if InstanceInvite ~= nil then + if instanceInvite then ESX.ShowHelpNotification(_U('press_to_enter')) + + if IsControlJustReleased(0, 38) then + EnterInstance(instanceInvite) + ESX.ShowNotification(_U('entered_instance')) + instanceInvite = nil + end else Citizen.Wait(500) end - end end) --- Controls -Citizen.CreateThread(function() - while true do - - Citizen.Wait(0) - - if InstanceInvite ~= nil and IsControlJustReleased(0, Keys['E']) then - local playerPed = PlayerPedId() - - EnterInstance(InstanceInvite) - ESX.ShowNotification(_U('entered_instance')) - InstanceInvite = nil - - elseif InstanceInvite == nil then - Citizen.Wait(500) - end - - end - -end) - -- Instance players Citizen.CreateThread(function() while true do + Citizen.Wait(10) + local playerPed = PlayerPedId() + local playersToHide = {} - Citizen.Wait(0) - - if Instance.host ~= nil then - - local playerPed = PlayerPedId() - - for i=0, Config.MaxPlayers, 1 do - - local found = false - for j=1, #Instance.players, 1 do - instancePlayer = GetPlayerFromServerId(Instance.players[j]) - - if i == instancePlayer then - found = true - end - end - - if not found then - local otherPlayerPed = GetPlayerPed(i) - - SetEntityLocallyInvisible(otherPlayerPed) - SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) - end - + if instance.host then + -- Get players and sets them as pairs + for k,v in ipairs(GetActivePlayers()) do + playersToHide[v] = true end + -- Dont set our instanced players invisible + for _,player in ipairs(instance.players) do + playersToHide[GetPlayerFromServerId(player)] = nil + end else - - local playerPed = PlayerPedId() - - for i=0, Config.MaxPlayers, 1 do - - local found = false - for j=1, #InstancedPlayers, 1 do - instancePlayer = GetPlayerFromServerId(InstancedPlayers[j]) - - if i == instancePlayer then - found = true - end - end - - if found then - local otherPlayerPed = GetPlayerPed(i) - - SetEntityLocallyInvisible(otherPlayerPed) - SetEntityNoCollisionEntity(playerPed, otherPlayerPed, true) - end - + for player,_ in pairs(instancedPlayers) do + playersToHide[GetPlayerFromServerId(player)] = true end - end + -- Hide all these players + for player,_ in pairs(playersToHide) do + local otherPlayerPed = GetPlayerPed(player) + SetEntityVisible(otherPlayerPed, false, false) + SetEntityNoCollisionEntity(playerPed, otherPlayerPed, false) + end end end) @@ -267,7 +208,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) -- must be run every frame - if InsideInstance then + if insideInstance then SetVehicleDensityMultiplierThisFrame(0.0) SetParkedVehicleDensityMultiplierThisFrame(0.0) diff --git a/config.lua b/config.lua index 4a13c6bf..ef4f22f6 100644 --- a/config.lua +++ b/config.lua @@ -1,3 +1,3 @@ -Config = {} -Config.Locale = 'fr' -Config.MaxPlayers = 32 +Config = {} + +Config.Locale = 'fr' \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index fa2949ce..b7fcf132 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,11 +1,11 @@ -local Instances = {} +local instances = {} function GetInstancedPlayers() local players = {} - for k,v in pairs(Instances) do - for i=1, #v.players, 1 do - table.insert(players, v.players[i]) + for k,v in pairs(instances) do + for k2,v2 in ipairs(v.players) do + players[v2] = true end end @@ -13,26 +13,26 @@ function GetInstancedPlayers() end function CreateInstance(type, player, data) - Instances[player] = { + instances[player] = { type = type, host = player, players = {}, data = data } - TriggerEvent('instance:onCreate', Instances[player]) - TriggerClientEvent('instance:onCreate', player, Instances[player]) + TriggerEvent('instance:onCreate', instances[player]) + TriggerClientEvent('instance:onCreate', player, instances[player]) TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) end function CloseInstance(instance) - if Instances[instance] ~= nil then + if instances[instance] then - for i=1, #Instances[instance].players, 1 do - TriggerClientEvent('instance:onClose', Instances[instance].players[i]) + for i=1, #instances[instance].players do + TriggerClientEvent('instance:onClose', instances[instance].players[i]) end - Instances[instance] = nil + instances[instance] = nil TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) TriggerEvent('instance:onClose', instance) @@ -42,22 +42,22 @@ end function AddPlayerToInstance(instance, player) local found = false - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] == player then + for i=1, #instances[instance].players do + if instances[instance].players[i] == player then found = true break end end if not found then - table.insert(Instances[instance].players, player) + table.insert(instances[instance].players, player) end - TriggerClientEvent('instance:onEnter', player, Instances[instance]) + TriggerClientEvent('instance:onEnter', player, instances[instance]) - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerEntered', Instances[instance].players[i], Instances[instance], player) + for i=1, #instances[instance].players do + if instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerEntered', instances[instance].players[i], instances[instance], player) end end @@ -65,42 +65,34 @@ function AddPlayerToInstance(instance, player) end function RemovePlayerFromInstance(instance, player) + if instances[instance] then + TriggerClientEvent('instance:onLeave', player, instances[instance]) - if Instances[instance] ~= nil then - - TriggerClientEvent('instance:onLeave', player, Instances[instance]) - - if Instances[instance].host == player then - - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) + if instances[instance].host == player then + for i=1, #instances[instance].players do + if instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerLeft', instances[instance].players[i], instances[instance], player) end end CloseInstance(instance) - else - - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] == player then - Instances[instance].players[i] = nil + for i=1, #instances[instance].players do + if instances[instance].players[i] == player then + instances[instance].players[i] = nil end end - for i=1, #Instances[instance].players, 1 do - if Instances[instance].players[i] ~= player then - TriggerClientEvent('instance:onPlayerLeft', Instances[instance].players[i], Instances[instance], player) + for i=1, #instances[instance].players do + if instances[instance].players[i] ~= player then + TriggerClientEvent('instance:onPlayerLeft', instances[instance].players[i], instances[instance], player) end end TriggerClientEvent('instance:onInstancedPlayersData', -1, GetInstancedPlayers()) - end - end - end function InvitePlayerToInstance(instance, type, player, data) From 0cafd722a963902f705012a692582ab78d921eaa Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 27 Jul 2019 16:49:14 +0200 Subject: [PATCH 22/29] Seperate code to improve performance --- client/main.lua | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/client/main.lua b/client/main.lua index 43e0ce69..189d77d6 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,4 +1,4 @@ -local instance, instancedPlayers, registeredInstanceTypes = {}, {}, {} +local instance, instancedPlayers, registeredInstanceTypes, playersToHide = {}, {}, {}, {} local instanceInvite, insideInstance ESX = nil @@ -114,7 +114,7 @@ end) RegisterNetEvent('instance:onPlayerEntered') AddEventHandler('instance:onPlayerEntered', function(_instance, player) - instance = _instance + instance = _instance local playerName = GetPlayerName(GetPlayerFromServerId(player)) ESX.ShowNotification(_('entered_into', playerName)) @@ -170,9 +170,8 @@ end) -- Instance players Citizen.CreateThread(function() while true do - Citizen.Wait(10) - local playerPed = PlayerPedId() - local playersToHide = {} + Citizen.Wait(1000) + playersToHide = {} if instance.host then -- Get players and sets them as pairs @@ -189,6 +188,13 @@ Citizen.CreateThread(function() playersToHide[GetPlayerFromServerId(player)] = true end end + end +end) + +Citizen.CreateThread(function() + while true do + Citizen.Wait(10) + local playerPed = PlayerPedId() -- Hide all these players for player,_ in pairs(playersToHide) do @@ -207,7 +213,7 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(0) -- must be run every frame - + if insideInstance then SetVehicleDensityMultiplierThisFrame(0.0) SetParkedVehicleDensityMultiplierThisFrame(0.0) From cf39f7c7d76242958ff88b255758d172df1681d9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 8 Sep 2019 13:22:09 +0200 Subject: [PATCH 23/29] Fixed invisable bug once and for all, closes #13 --- client/main.lua | 18 +++++++++++------- server/main.lua | 6 ++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/client/main.lua b/client/main.lua index 189d77d6..c8336ea8 100644 --- a/client/main.lua +++ b/client/main.lua @@ -176,16 +176,16 @@ Citizen.CreateThread(function() if instance.host then -- Get players and sets them as pairs for k,v in ipairs(GetActivePlayers()) do - playersToHide[v] = true + playersToHide[GetPlayerServerId(v)] = true end -- Dont set our instanced players invisible for _,player in ipairs(instance.players) do - playersToHide[GetPlayerFromServerId(player)] = nil + playersToHide[player] = nil end else for player,_ in pairs(instancedPlayers) do - playersToHide[GetPlayerFromServerId(player)] = true + playersToHide[player] = true end end end @@ -197,10 +197,14 @@ Citizen.CreateThread(function() local playerPed = PlayerPedId() -- Hide all these players - for player,_ in pairs(playersToHide) do - local otherPlayerPed = GetPlayerPed(player) - SetEntityVisible(otherPlayerPed, false, false) - SetEntityNoCollisionEntity(playerPed, otherPlayerPed, false) + for serverId,_ in pairs(playersToHide) do + local player = GetPlayerFromServerId(serverId) + + if NetworkIsPlayerActive(player) then + local otherPlayerPed = GetPlayerPed(player) + SetEntityVisible(otherPlayerPed, false, false) + SetEntityNoCollisionEntity(playerPed, otherPlayerPed, false) + end end end end) diff --git a/server/main.lua b/server/main.lua index b7fcf132..3f51be44 100644 --- a/server/main.lua +++ b/server/main.lua @@ -12,6 +12,12 @@ function GetInstancedPlayers() return players end +AddEventHandler('playerDropped', function(reason) + if instances[source] then + CloseInstance(source) + end +end) + function CreateInstance(type, player, data) instances[player] = { type = type, From 7b3f5edc4cde79cba02f6f582e95adcca475a8c5 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:17:35 +0100 Subject: [PATCH 24/29] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (86%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 86% rename from __resource.lua rename to fxmanifest.lua index b5859d1f..6b03126e 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'Instance' From 22b88b59b5f68d8e8ab20fc034ea53c84cd23e76 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 23 Feb 2020 20:57:29 +0100 Subject: [PATCH 25/29] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75e4a94a..8df3fb52 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ start instance ### License instance - enter buildings! -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. From 6514da2f0c4566b22899b1c023fcca5a1a372848 Mon Sep 17 00:00:00 2001 From: goncalobsccosta <65927483+goncalobsccosta@users.noreply.github.com> Date: Tue, 8 Dec 2020 21:00:59 +0000 Subject: [PATCH 26/29] Fixed other players blinking when instanced and fixed the collision problem Since now the invisibility is updated every frame, the collision is only removed in the same frame. I also noticed that the ped order was wrong, because players were colliding when they were in diferent instances. --- client/main.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index c8336ea8..72359b10 100644 --- a/client/main.lua +++ b/client/main.lua @@ -193,7 +193,7 @@ end) Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) local playerPed = PlayerPedId() -- Hide all these players @@ -203,7 +203,7 @@ Citizen.CreateThread(function() if NetworkIsPlayerActive(player) then local otherPlayerPed = GetPlayerPed(player) SetEntityVisible(otherPlayerPed, false, false) - SetEntityNoCollisionEntity(playerPed, otherPlayerPed, false) + SetEntityNoCollisionEntity(otherPlayerPed, playerPed, true) end end end @@ -228,4 +228,4 @@ Citizen.CreateThread(function() Citizen.Wait(500) end end -end) \ No newline at end of file +end) From 6f485d1e0820c0cd3e02d2acb6bbc71daa169188 Mon Sep 17 00:00:00 2001 From: goncalobsccosta <65927483+goncalobsccosta@users.noreply.github.com> Date: Sat, 12 Dec 2020 20:32:25 +0000 Subject: [PATCH 27/29] general client optimization --- client/main.lua | 70 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/client/main.lua b/client/main.lua index 72359b10..3c4c778f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -2,6 +2,7 @@ local instance, instancedPlayers, registeredInstanceTypes, playersToHide = {}, { local instanceInvite, insideInstance ESX = nil + Citizen.CreateThread(function() while ESX == nil do TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) @@ -25,6 +26,18 @@ end function EnterInstance(instance) insideInstance = true + -- Fix vehicles randomly spawning nearby the player inside an instance + Citizen.CreateThread(function() + while insideInstance do + Citizen.Wait(0) -- must be run every frame + + SetVehicleDensityMultiplierThisFrame(0.0) + SetParkedVehicleDensityMultiplierThisFrame(0.0) + + local pos = GetEntityCoords(PlayerPedId()) + RemoveVehiclesFromGeneratorsInArea(pos.x - 900.0, pos.y - 900.0, pos.z - 900.0, pos.x + 900.0, pos.y + 900.0, pos.z + 900.0) + end + end) TriggerServerEvent('instance:enter', instance.host) if registeredInstanceTypes[instance.type].enter then @@ -137,6 +150,20 @@ AddEventHandler('instance:onInvite', function(_instance, type, data) } Citizen.CreateThread(function() + -- Controls for invite + Citizen.CreateThread(function() + while instanceInvite do + Citizen.Wait(0) + + ESX.ShowHelpNotification(_U('press_to_enter')) + + if IsControlJustReleased(0, 38) then + EnterInstance(instanceInvite) + ESX.ShowNotification(_U('entered_instance')) + instanceInvite = nil + end + end + end) Citizen.Wait(10000) if instanceInvite then @@ -148,25 +175,6 @@ end) RegisterInstanceType('default') --- Controls for invite -Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - - if instanceInvite then - ESX.ShowHelpNotification(_U('press_to_enter')) - - if IsControlJustReleased(0, 38) then - EnterInstance(instanceInvite) - ESX.ShowNotification(_U('entered_instance')) - instanceInvite = nil - end - else - Citizen.Wait(500) - end - end -end) - -- Instance players Citizen.CreateThread(function() while true do @@ -191,10 +199,13 @@ Citizen.CreateThread(function() end end) +local letSleep = true + Citizen.CreateThread(function() while true do Citizen.Wait(0) local playerPed = PlayerPedId() + letSleep = true -- Hide all these players for serverId,_ in pairs(playersToHide) do @@ -204,8 +215,13 @@ Citizen.CreateThread(function() local otherPlayerPed = GetPlayerPed(player) SetEntityVisible(otherPlayerPed, false, false) SetEntityNoCollisionEntity(otherPlayerPed, playerPed, true) + letSleep = false end end + + if letSleep then + Citizen.Wait(1000) + end end end) @@ -213,19 +229,3 @@ Citizen.CreateThread(function() TriggerEvent('instance:loaded') end) --- Fix vehicles randomly spawning nearby the player inside an instance -Citizen.CreateThread(function() - while true do - Citizen.Wait(0) -- must be run every frame - - if insideInstance then - SetVehicleDensityMultiplierThisFrame(0.0) - SetParkedVehicleDensityMultiplierThisFrame(0.0) - - local pos = GetEntityCoords(PlayerPedId()) - RemoveVehiclesFromGeneratorsInArea(pos.x - 900.0, pos.y - 900.0, pos.z - 900.0, pos.x + 900.0, pos.y + 900.0, pos.z + 900.0) - else - Citizen.Wait(500) - end - end -end) From 79e4abc832e20d75aefcd988c3a62d8f3beed879 Mon Sep 17 00:00:00 2001 From: goncalobsccosta <65927483+goncalobsccosta@users.noreply.github.com> Date: Sat, 6 Feb 2021 04:49:33 +0000 Subject: [PATCH 28/29] Remove nested thread --- client/main.lua | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/client/main.lua b/client/main.lua index 3c4c778f..94f0404b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -148,22 +148,22 @@ AddEventHandler('instance:onInvite', function(_instance, type, data) host = _instance, data = data } + Citizen.CreateThread(function() + while instanceInvite do + Citizen.Wait(0) + ESX.ShowHelpNotification(_U('press_to_enter')) + + if IsControlJustReleased(0, 38) then + EnterInstance(instanceInvite) + ESX.ShowNotification(_U('entered_instance')) + instanceInvite = nil + end + end + end) + Citizen.CreateThread(function() -- Controls for invite - Citizen.CreateThread(function() - while instanceInvite do - Citizen.Wait(0) - - ESX.ShowHelpNotification(_U('press_to_enter')) - - if IsControlJustReleased(0, 38) then - EnterInstance(instanceInvite) - ESX.ShowNotification(_U('entered_instance')) - instanceInvite = nil - end - end - end) Citizen.Wait(10000) if instanceInvite then @@ -171,6 +171,7 @@ AddEventHandler('instance:onInvite', function(_instance, type, data) instanceInvite = nil end end) + end) RegisterInstanceType('default') From 07b9861ee0640ed09ef4252c58aaa93923ac7602 Mon Sep 17 00:00:00 2001 From: Hamy <64610533+Hamy-os@users.noreply.github.com> Date: Sat, 20 Mar 2021 22:13:40 +0300 Subject: [PATCH 29/29] Update config.lua --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index ef4f22f6..a3d6aa84 100644 --- a/config.lua +++ b/config.lua @@ -1,3 +1,3 @@ Config = {} -Config.Locale = 'fr' \ No newline at end of file +Config.Locale = 'en'