Merge pull request #600 from bitpredator/dev

chore: supports map point through local translation

.github/CHANGELOG.md

@@ -88,4 +88,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
 61. [bpt_importjob]: refactor: bpt_importjob inventory implementation @bitpredator
 62. [bpt_loadscreen]: chore: bpt_loadscreen improves code formatting @bitpredator
 63. [bpt_lumberjack]: fix: bpt_lumberjack fixed typos and removed unused code @bitpredator
-64. [bpt_crafting]: fix: correct ingredients to use @bitpredator
+64. [bpt_crafting]: fix: correct ingredients to use @bitpredator
+65. [bpt_streetfight]: chore: supports map point through local translation @bitpredator

server-data/resources/[bpt_addons]/bpt_streetfight/LICENSE

@@ -632,7 +632,7 @@ 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) 2022-2023 bitpredator
+    Copyright (C) 2022-2024 bitpredator
 
     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:
 
-    <program>  Copyright (C) 2022-2023 bitpredator
+    <program>  Copyright (C) 2022-2024 bitpredator
     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.

server-data/resources/[bpt_addons]/bpt_streetfight/README.md

@@ -1,17 +1,19 @@
-# bpt_streetfight
+<h1 align='center'>bpt_streetfight</a></h1>
+<p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2022-2023 bitpredator
+Copyright (C) 2022-2024 bitpredator
 
-This program is a project for the fivem community, you have legal permission to distribute and / or modify it only if you have forked this repository, if it is not a fork repository, the version will be removed from the DMCA request.
+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.
 
 ATTENTION:
-You are not authorized to change the name of the resource.
+You are not authorized to change the name of the resource and the resources within it.
 
 If you want to contribute you can open a pull request.
 
-You are not authorized to sell this software (this is a free project).
+You are not authorized to sell this software (this is free project).
 
 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/.
+You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.

server-data/resources/[bpt_addons]/bpt_streetfight/client/client.lua

@@ -162,7 +162,9 @@ function putGloves()
 end
 
 function removeGloves()
-    for _,v in pairs(Gloves) do DeleteObject(v); end
+    for _, v in pairs(Gloves)
+      do DeleteObject(v);
+    end
 end
 
 function spawnMarker(coords)

server-data/resources/[bpt_addons]/bpt_streetfight/config.lua

@@ -9,12 +9,12 @@ Config.TP_DISTANCE = 6 -- Minimum distance between fight and spectators
 Config.LEAVE_FIGHT_DISTANCE = 15 -- Distance to quit fight
 Config.DISTANCE_INTERACTION = 2.0 -- Interaction for fighter events
 Config.E_KEY = 38 -- Action key 'E' default
-Config.Locale = 'it'
+Config.Locale = 'en'
 
 Config.BLIP = {
     coords = {x = -517.61, y = -1712.04, z = 20.45},
-    text   = 'Combattimenti di strada',
+    text   = _U('street_fighting'),
     sprite = 491,
     color  = 1,
     scale  = 1.0
-}
+}

server-data/resources/[bpt_addons]/bpt_streetfight/fxmanifest.lua

@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'bpt_streetfight'
 
-version '0.0.4'
+version '1.0.0'
 
 server_script {
     '@es_extended/locale.lua',

server-data/resources/[bpt_addons]/bpt_streetfight/locales/en.lua

@@ -8,4 +8,5 @@ Locales['en'] = {
     ['not_money'] = 'not enough money',
     ['press_to_join_blue'] = 'press ~INPUT_CONTEXT~ to join the blue side',
     ['press_to_join_red'] = 'press ~INPUT_CONTEXT~ to join the red side.',
+    ['street_fighting'] = 'Street fighting'
 }

server-data/resources/[bpt_addons]/bpt_streetfight/locales/it.lua

@@ -7,5 +7,6 @@ Locales['it'] = {
     ['successfully_signed'] = 'Ti sei iscritto con successo',
     ['not_money'] = 'denaro non sufficente',
     ['press_to_join_blue'] = 'premi ~INPUT_CONTEXT~ per unirti al lato blu.',
-    ['press_to_join_red'] = 'premi ~INPUT_CONTEXT~ per unirti al lato rosso.'
+    ['press_to_join_red'] = 'premi ~INPUT_CONTEXT~ per unirti al lato rosso.',
+    ['street_fighting'] = 'Combattimenti di strada'
 }