Fixed ooc being proximity only, fixes #11

This commit is contained in:
ElPumpo
2018-05-07 22:29:53 +02:00
parent 191f12f5e0
commit 1ed507693d
6 changed files with 16 additions and 7 deletions
+13 -1
View File
@@ -23,4 +23,16 @@ git clone https://github.com/ESX-Org/esx_rpchat
#### Installation
1) Add `start esx_rpchat` to your server.cfg
1) Add `start esx_rpchat` to your server.cfg
# Legal
### License
esx_rpchat - RP chat for ESX
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/.
+2 -2
View File
@@ -8,7 +8,7 @@ server_scripts {
'@es_extended/locale.lua',
'locates/sv.lua',
'locates/en.lua',
'locates/fr.lua',
'locates/fr.lua',
'config.lua',
'server/main.lua'
}
@@ -17,7 +17,7 @@ client_scripts {
'@es_extended/locale.lua',
'locates/sv.lua',
'locates/en.lua',
'locates/fr.lua',
'locates/fr.lua',
'config.lua',
'client/main.lua'
}
-1
View File
@@ -1,5 +1,4 @@
Locales['en'] = {
-- ooc chat
['ooc_help'] = 'type an out of character message',
['ooc_prefix'] = 'OOC | %s',
['twt_help'] = 'send a tweet',
-1
View File
@@ -1,5 +1,4 @@
Locales['fr'] = {
-- ooc chat
['ooc_help'] = 'ecrit un message hors du personnage',
['ooc_prefix'] = 'hrp | %s',
['twt_help'] = 'envoie un tweet',
-1
View File
@@ -1,5 +1,4 @@
Locales['sv'] = {
-- ooc chat
['ooc_help'] = 'skicka ett meddelande som inte kopplat till din karaktär',
['ooc_prefix'] = 'OOC | %s',
['twt_help'] = 'skicka en tweet',
+1 -1
View File
@@ -3,7 +3,7 @@ AddEventHandler('chatMessage', function(source, name, msg)
if command == "/ooc" then
CancelEvent()
TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('ooc_prefix', name), string.sub(msg, 5), { 128, 128, 128 })
TriggerClientEvent('chatMessage', -1, _U('ooc_prefix', name), { 128, 128, 128 }, string.sub(msg, 5))
elseif command == "/twt" then
CancelEvent()
TriggerClientEvent('chatMessage', -1, _U('twt_prefix', name), { 0, 153, 204 }, string.sub(msg, 5))