From 4c5d1532b21e9c4c6e7f6eff674c182f6efbca4f Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 22 Oct 2018 22:37:20 +0200 Subject: [PATCH] Added ESX.Math.* --- README.md | 1 - __resource.lua | 1 + config.weapons.lua | 184 ++++++++++++++++++++-------------------- locales/br.lua | 2 + locales/cs.lua | 2 + locales/de.lua | 2 + locales/en.lua | 4 +- locales/fi.lua | 2 + locales/fr.lua | 2 + locales/pl.lua | 2 + locales/sv.lua | 70 +++++++-------- shared/functions.lua | 5 +- shared/modules/math.lua | 12 +++ 13 files changed, 158 insertions(+), 131 deletions(-) create mode 100644 shared/modules/math.lua diff --git a/README.md b/README.md index 95f75664..aed31db4 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,6 @@ start baseevents start mysql-async start essentialmode start esplugin_mysql -start es_admin2 start es_extended diff --git a/__resource.lua b/__resource.lua index 256c1966..7e2f587c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -28,6 +28,7 @@ server_scripts { 'server/main.lua', 'server/commands.lua', + 'shared/modules/math.lua', 'shared/functions.lua' } diff --git a/config.weapons.lua b/config.weapons.lua index bff086bd..74627321 100644 --- a/config.weapons.lua +++ b/config.weapons.lua @@ -1,94 +1,94 @@ Config.Weapons = { - { name = 'WEAPON_KNIFE', label = _U('weapon_knife') }, - { name = 'WEAPON_NIGHTSTICK', label = _U('weapon_nightstick') }, - { name = 'WEAPON_HAMMER', label = _U('weapon_hammer') }, - { name = 'WEAPON_BAT', label = _U('weapon_bat') }, - { name = 'WEAPON_GOLFCLUB', label = _U('weapon_golfclub') }, - { name = 'WEAPON_CROWBAR', label = _U('weapon_crowbar') }, - { name = 'WEAPON_PISTOL', label = _U('weapon_pistol') }, - { name = 'WEAPON_COMBATPISTOL', label = _U('weapon_combatpistol') }, - { name = 'WEAPON_APPISTOL', label = _U('weapon_appistol') }, - { name = 'WEAPON_PISTOL50', label = _U('weapon_pistol50') }, - { name = 'WEAPON_MICROSMG', label = _U('weapon_microsmg') }, - { name = 'WEAPON_SMG', label = _U('weapon_smg') }, - { name = 'WEAPON_ASSAULTSMG', label = _U('weapon_assaultsmg') }, - { name = 'WEAPON_ASSAULTRIFLE', label = _U('weapon_assaultrifle') }, - { name = 'WEAPON_CARBINERIFLE', label = _U('weapon_carbinerifle') }, - { name = 'WEAPON_ADVANCEDRIFLE', label = _U('weapon_advancedrifle') }, - { name = 'WEAPON_MG', label = _U('weapon_mg') }, - { name = 'WEAPON_COMBATMG', label = _U('weapon_combatmg') }, - { name = 'WEAPON_PUMPSHOTGUN', label = _U('weapon_pumpshotgun') }, - { name = 'WEAPON_SAWNOFFSHOTGUN', label = _U('weapon_sawnoffshotgun') }, - { name = 'WEAPON_ASSAULTSHOTGUN', label = _U('weapon_assaultshotgun') }, - { name = 'WEAPON_BULLPUPSHOTGUN', label = _U('weapon_bullpupshotgun') }, - { name = 'WEAPON_STUNGUN', label = _U('weapon_stungun') }, - { name = 'WEAPON_SNIPERRIFLE', label = _U('weapon_sniperrifle') }, - { name = 'WEAPON_HEAVYSNIPER', label = _U('weapon_heavysniper') }, - { name = 'WEAPON_REMOTESNIPER', label = _U('weapon_remotesniper') }, - { name = 'WEAPON_GRENADELAUNCHER', label = _U('weapon_grenadelauncher') }, - { name = 'WEAPON_RPG', label = _U('weapon_rpg') }, - { name = 'WEAPON_STINGER', label = _U('weapon_stinger') }, - { name = 'WEAPON_MINIGUN', label = _U('weapon_minigun') }, - { name = 'WEAPON_GRENADE', label = _U('weapon_grenade') }, - { name = 'WEAPON_STICKYBOMB', label = _U('weapon_stickybomb') }, - { name = 'WEAPON_SMOKEGRENADE', label = _U('weapon_smokegrenade') }, - { name = 'WEAPON_BZGAS', label = _U('weapon_bzgas') }, - { name = 'WEAPON_MOLOTOV', label = _U('weapon_molotov') }, - { name = 'WEAPON_FIREEXTINGUISHER', label = _U('weapon_fireextinguisher') }, - { name = 'WEAPON_PETROLCAN', label = _U('weapon_petrolcan') }, - { name = 'WEAPON_DIGISCANNER', label = _U('weapon_digiscanner') }, - { name = 'WEAPON_BALL', label = _U('weapon_ball') }, - { name = 'WEAPON_SNSPISTOL', label = _U('weapon_snspistol') }, - { name = 'WEAPON_BOTTLE', label = _U('weapon_bottle') }, - { name = 'WEAPON_GUSENBERG', label = _U('weapon_gusenberg') }, - { name = 'WEAPON_SPECIALCARBINE', label = _U('weapon_specialcarbine') }, - { name = 'WEAPON_HEAVYPISTOL', label = _U('weapon_heavypistol') }, - { name = 'WEAPON_BULLPUPRIFLE', label = _U('weapon_bullpuprifle') }, - { name = 'WEAPON_DAGGER', label = _U('weapon_dagger') }, - { name = 'WEAPON_VINTAGEPISTOL', label = _U('weapon_vintagepistol') }, - { name = 'WEAPON_FIREWORK', label = _U('weapon_firework') }, - { name = 'WEAPON_MUSKET', label = _U('weapon_musket') }, - { name = 'WEAPON_HEAVYSHOTGUN', label = _U('weapon_heavyshotgun') }, - { name = 'WEAPON_MARKSMANRIFLE', label = _U('weapon_marksmanrifle') }, - { name = 'WEAPON_HOMINGLAUNCHER', label = _U('weapon_hominglauncher') }, - { name = 'WEAPON_PROXMINE', label = _U('weapon_proxmine') }, - { name = 'WEAPON_SNOWBALL', label = _U('weapon_snowball') }, - { name = 'WEAPON_FLAREGUN', label = _U('weapon_flaregun') }, - { name = 'WEAPON_GARBAGEBAG', label = _U('weapon_garbagebag') }, - { name = 'WEAPON_HANDCUFFS', label = _U('weapon_handcuffs') }, - { name = 'WEAPON_COMBATPDW', label = _U('weapon_combatpdw') }, - { name = 'WEAPON_MARKSMANPISTOL', label = _U('weapon_marksmanpistol') }, - { name = 'WEAPON_KNUCKLE', label = _U('weapon_knuckle') }, - { name = 'WEAPON_HATCHET', label = _U('weapon_hatchet') }, - { name = 'WEAPON_RAILGUN', label = _U('weapon_railgun') }, - { name = 'WEAPON_MACHETE', label = _U('weapon_machete') }, - { name = 'WEAPON_MACHINEPISTOL', label = _U('weapon_machinepistol') }, - { name = 'WEAPON_SWITCHBLADE', label = _U('weapon_switchblade') }, - { name = 'WEAPON_REVOLVER', label = _U('weapon_revolver') }, - { name = 'WEAPON_DBSHOTGUN', label = _U('weapon_dbshotgun') }, - { name = 'WEAPON_COMPACTRIFLE', label = _U('weapon_compactrifle') }, - { name = 'WEAPON_AUTOSHOTGUN', label = _U('weapon_autoshotgun') }, - { name = 'WEAPON_BATTLEAXE', label = _U('weapon_battleaxe') }, - { name = 'WEAPON_COMPACTLAUNCHER', label = _U('weapon_compactlauncher') }, - { name = 'WEAPON_MINISMG', label = _U('weapon_minismg') }, - { name = 'WEAPON_PIPEBOMB', label = _U('weapon_pipebomb') }, - { name = 'WEAPON_POOLCUE', label = _U('weapon_poolcue') }, - { name = 'WEAPON_WRENCH', label = _U('weapon_wrench') }, - { name = 'WEAPON_FLASHLIGHT', label = _U('weapon_flashlight') }, - { name = 'GADGET_NIGHTVISION', label = _U('gadget_nightvision') }, - { name = 'GADGET_PARACHUTE', label = _U('gadget_parachute') }, - { name = 'WEAPON_FLARE', label = _U('weapon_flare') }, - { name = 'WEAPON_SNSPISTOL_MK2', label = _U('weapon_snspistol_mk2') }, - { name = 'WEAPON_REVOLVER_MK2', label = _U('weapon_revolver_mk2') }, - { name = 'WEAPON_DOUBLEACTION', label = _U('weapon_doubleaction') }, - { name = 'WEAPON_SPECIALCARBINE_MK2', label = _U('weapon_specialcarabine_mk2') }, - { name = 'WEAPON_BULLPUPRIFLE_MK2', label = _U('weapon_bullpruprifle_mk2') }, - { name = 'WEAPON_PUMPSHOTGUN_MK2', label = _U('weapon_pumpshotgun_mk2') }, - { name = 'WEAPON_MARKSMANRIFLE_MK2', label = _U('weapon_marksmanrifle_mk2') }, - { name = 'WEAPON_ASSAULTRIFLE_MK2', label = _U('weapon_assaultrifle_mk2') }, - { name = 'WEAPON_CARBINERIFLE_MK2', label = _U('weapon_carbinerifle_mk2') }, - { name = 'WEAPON_COMBATMG_MK2', label = _U('weapon_combatmg_mk2') }, - { name = 'WEAPON_HEAVYSNIPER_MK2', label = _U('weapon_heavysniper_mk2') }, - { name = 'WEAPON_PISTOL_MK2', label = _U('weapon_pistol_mk2') }, - { name = 'WEAPON_SMG_MK2', label = _U('weapon_smg_mk2') }, + { name = 'WEAPON_KNIFE', label = _U('weapon_knife') }, + { name = 'WEAPON_NIGHTSTICK', label = _U('weapon_nightstick') }, + { name = 'WEAPON_HAMMER', label = _U('weapon_hammer') }, + { name = 'WEAPON_BAT', label = _U('weapon_bat') }, + { name = 'WEAPON_GOLFCLUB', label = _U('weapon_golfclub') }, + { name = 'WEAPON_CROWBAR', label = _U('weapon_crowbar') }, + { name = 'WEAPON_PISTOL', label = _U('weapon_pistol') }, + { name = 'WEAPON_COMBATPISTOL', label = _U('weapon_combatpistol') }, + { name = 'WEAPON_APPISTOL', label = _U('weapon_appistol') }, + { name = 'WEAPON_PISTOL50', label = _U('weapon_pistol50') }, + { name = 'WEAPON_MICROSMG', label = _U('weapon_microsmg') }, + { name = 'WEAPON_SMG', label = _U('weapon_smg') }, + { name = 'WEAPON_ASSAULTSMG', label = _U('weapon_assaultsmg') }, + { name = 'WEAPON_ASSAULTRIFLE', label = _U('weapon_assaultrifle') }, + { name = 'WEAPON_CARBINERIFLE', label = _U('weapon_carbinerifle') }, + { name = 'WEAPON_ADVANCEDRIFLE', label = _U('weapon_advancedrifle') }, + { name = 'WEAPON_MG', label = _U('weapon_mg') }, + { name = 'WEAPON_COMBATMG', label = _U('weapon_combatmg') }, + { name = 'WEAPON_PUMPSHOTGUN', label = _U('weapon_pumpshotgun') }, + { name = 'WEAPON_SAWNOFFSHOTGUN', label = _U('weapon_sawnoffshotgun') }, + { name = 'WEAPON_ASSAULTSHOTGUN', label = _U('weapon_assaultshotgun') }, + { name = 'WEAPON_BULLPUPSHOTGUN', label = _U('weapon_bullpupshotgun') }, + { name = 'WEAPON_STUNGUN', label = _U('weapon_stungun') }, + { name = 'WEAPON_SNIPERRIFLE', label = _U('weapon_sniperrifle') }, + { name = 'WEAPON_HEAVYSNIPER', label = _U('weapon_heavysniper') }, + { name = 'WEAPON_REMOTESNIPER', label = _U('weapon_remotesniper') }, + { name = 'WEAPON_GRENADELAUNCHER', label = _U('weapon_grenadelauncher') }, + { name = 'WEAPON_RPG', label = _U('weapon_rpg') }, + { name = 'WEAPON_STINGER', label = _U('weapon_stinger') }, + { name = 'WEAPON_MINIGUN', label = _U('weapon_minigun') }, + { name = 'WEAPON_GRENADE', label = _U('weapon_grenade') }, + { name = 'WEAPON_STICKYBOMB', label = _U('weapon_stickybomb') }, + { name = 'WEAPON_SMOKEGRENADE', label = _U('weapon_smokegrenade') }, + { name = 'WEAPON_BZGAS', label = _U('weapon_bzgas') }, + { name = 'WEAPON_MOLOTOV', label = _U('weapon_molotov') }, + { name = 'WEAPON_FIREEXTINGUISHER', label = _U('weapon_fireextinguisher') }, + { name = 'WEAPON_PETROLCAN', label = _U('weapon_petrolcan') }, + { name = 'WEAPON_DIGISCANNER', label = _U('weapon_digiscanner') }, + { name = 'WEAPON_BALL', label = _U('weapon_ball') }, + { name = 'WEAPON_SNSPISTOL', label = _U('weapon_snspistol') }, + { name = 'WEAPON_BOTTLE', label = _U('weapon_bottle') }, + { name = 'WEAPON_GUSENBERG', label = _U('weapon_gusenberg') }, + { name = 'WEAPON_SPECIALCARBINE', label = _U('weapon_specialcarbine') }, + { name = 'WEAPON_HEAVYPISTOL', label = _U('weapon_heavypistol') }, + { name = 'WEAPON_BULLPUPRIFLE', label = _U('weapon_bullpuprifle') }, + { name = 'WEAPON_DAGGER', label = _U('weapon_dagger') }, + { name = 'WEAPON_VINTAGEPISTOL', label = _U('weapon_vintagepistol') }, + { name = 'WEAPON_FIREWORK', label = _U('weapon_firework') }, + { name = 'WEAPON_MUSKET', label = _U('weapon_musket') }, + { name = 'WEAPON_HEAVYSHOTGUN', label = _U('weapon_heavyshotgun') }, + { name = 'WEAPON_MARKSMANRIFLE', label = _U('weapon_marksmanrifle') }, + { name = 'WEAPON_HOMINGLAUNCHER', label = _U('weapon_hominglauncher') }, + { name = 'WEAPON_PROXMINE', label = _U('weapon_proxmine') }, + { name = 'WEAPON_SNOWBALL', label = _U('weapon_snowball') }, + { name = 'WEAPON_FLAREGUN', label = _U('weapon_flaregun') }, + { name = 'WEAPON_GARBAGEBAG', label = _U('weapon_garbagebag') }, + { name = 'WEAPON_HANDCUFFS', label = _U('weapon_handcuffs') }, + { name = 'WEAPON_COMBATPDW', label = _U('weapon_combatpdw') }, + { name = 'WEAPON_MARKSMANPISTOL', label = _U('weapon_marksmanpistol') }, + { name = 'WEAPON_KNUCKLE', label = _U('weapon_knuckle') }, + { name = 'WEAPON_HATCHET', label = _U('weapon_hatchet') }, + { name = 'WEAPON_RAILGUN', label = _U('weapon_railgun') }, + { name = 'WEAPON_MACHETE', label = _U('weapon_machete') }, + { name = 'WEAPON_MACHINEPISTOL', label = _U('weapon_machinepistol') }, + { name = 'WEAPON_SWITCHBLADE', label = _U('weapon_switchblade') }, + { name = 'WEAPON_REVOLVER', label = _U('weapon_revolver') }, + { name = 'WEAPON_DBSHOTGUN', label = _U('weapon_dbshotgun') }, + { name = 'WEAPON_COMPACTRIFLE', label = _U('weapon_compactrifle') }, + { name = 'WEAPON_AUTOSHOTGUN', label = _U('weapon_autoshotgun') }, + { name = 'WEAPON_BATTLEAXE', label = _U('weapon_battleaxe') }, + { name = 'WEAPON_COMPACTLAUNCHER', label = _U('weapon_compactlauncher') }, + { name = 'WEAPON_MINISMG', label = _U('weapon_minismg') }, + { name = 'WEAPON_PIPEBOMB', label = _U('weapon_pipebomb') }, + { name = 'WEAPON_POOLCUE', label = _U('weapon_poolcue') }, + { name = 'WEAPON_WRENCH', label = _U('weapon_wrench') }, + { name = 'WEAPON_FLASHLIGHT', label = _U('weapon_flashlight') }, + { name = 'GADGET_NIGHTVISION', label = _U('gadget_nightvision') }, + { name = 'GADGET_PARACHUTE', label = _U('gadget_parachute') }, + { name = 'WEAPON_FLARE', label = _U('weapon_flare') }, + { name = 'WEAPON_SNSPISTOL_MK2', label = _U('weapon_snspistol_mk2') }, + { name = 'WEAPON_REVOLVER_MK2', label = _U('weapon_revolver_mk2') }, + { name = 'WEAPON_DOUBLEACTION', label = _U('weapon_doubleaction') }, + { name = 'WEAPON_SPECIALCARBINE_MK2', label = _U('weapon_specialcarabine_mk2') }, + { name = 'WEAPON_BULLPUPRIFLE_MK2', label = _U('weapon_bullpruprifle_mk2') }, + { name = 'WEAPON_PUMPSHOTGUN_MK2', label = _U('weapon_pumpshotgun_mk2') }, + { name = 'WEAPON_MARKSMANRIFLE_MK2', label = _U('weapon_marksmanrifle_mk2') }, + { name = 'WEAPON_ASSAULTRIFLE_MK2', label = _U('weapon_assaultrifle_mk2') }, + { name = 'WEAPON_CARBINERIFLE_MK2', label = _U('weapon_carbinerifle_mk2') }, + { name = 'WEAPON_COMBATMG_MK2', label = _U('weapon_combatmg_mk2') }, + { name = 'WEAPON_HEAVYSNIPER_MK2', label = _U('weapon_heavysniper_mk2') }, + { name = 'WEAPON_PISTOL_MK2', label = _U('weapon_pistol_mk2') }, + { name = 'WEAPON_SMG_MK2', label = _U('weapon_smg_mk2') } } diff --git a/locales/br.lua b/locales/br.lua index f8b1c12c..07dde39b 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -68,6 +68,8 @@ Locales['br'] = { ['disconnect'] = 'disconnect from the server', ['chat_clear'] = 'clear the chat', ['chat_clear_all'] = 'clear the chat for everyone', + -- Locale settings + ['locale_digit_grouping_symbol'] = ' ', -- Weapons ['weapon_knife'] = 'faca', ['weapon_nightstick'] = 'cacetete', diff --git a/locales/cs.lua b/locales/cs.lua index 111dc8ee..4193b2af 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -72,6 +72,8 @@ Locales['cs'] = { ['disconnect'] = 'odpojit od serveru', ['chat_clear'] = 'vyčistit chat', ['chat_clear_all'] = 'vyčistit chat pro všechny', + -- Locale settings + ['locale_digit_grouping_symbol'] = ' ', -- Weapons ['weapon_knife'] = 'knife', ['weapon_nightstick'] = 'nightstick', diff --git a/locales/de.lua b/locales/de.lua index 8f4654c8..2ea6b598 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -62,6 +62,8 @@ Locales['de'] = { ['disconnect'] = 'disconnect from the server', ['chat_clear'] = 'clear the chat', ['chat_clear_all'] = 'clear the chat for everyone', + -- Locale settings + ['locale_digit_grouping_symbol'] = ' ', -- Weapons ['weapon_knife'] = 'Messer', ['weapon_nightstick'] = 'Schlagstock', diff --git a/locales/en.lua b/locales/en.lua index ec0ab2f5..82317285 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -72,6 +72,8 @@ Locales['en'] = { ['disconnect'] = 'disconnect from the server', ['chat_clear'] = 'clear the chat', ['chat_clear_all'] = 'clear the chat for everyone', + -- Locale settings + ['locale_digit_grouping_symbol'] = ',', -- Weapons ['weapon_knife'] = 'knife', ['weapon_nightstick'] = 'nightstick', @@ -95,7 +97,7 @@ Locales['en'] = { ['weapon_sawnoffshotgun'] = 'sawed off shotgun', ['weapon_assaultshotgun'] = 'assault shotgun', ['weapon_bullpupshotgun'] = 'bullpup shotgun', - ['weapon_stungun'] = 'tazer', + ['weapon_stungun'] = 'taser', ['weapon_sniperrifle'] = 'sniper rifle', ['weapon_heavysniper'] = 'heavy sniper', ['weapon_remotesniper'] = 'remote sniper', diff --git a/locales/fi.lua b/locales/fi.lua index f9334de4..4c248515 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -72,6 +72,8 @@ Locales['fi'] = { ['disconnect'] = 'poistu serveriltä', ['chat_clear'] = 'tyhjennä chatti', ['chat_clear_all'] = 'tyhjennä chatti kaikilta', + -- Locale settings + ['locale_digit_grouping_symbol'] = ' ', -- Weapons ['weapon_knife'] = 'veitsi', ['weapon_nightstick'] = 'pamppu', diff --git a/locales/fr.lua b/locales/fr.lua index 41c34d5e..818e1892 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -69,6 +69,8 @@ Locales['fr'] = { ['disconnect'] = 'disconnect from the server', ['chat_clear'] = 'clear the chat', ['chat_clear_all'] = 'clear the chat for everyone', + -- Locale settings + ['locale_digit_grouping_symbol'] = ' ', -- Weapons ['weapon_knife'] = 'couteau', ['weapon_nightstick'] = 'matraque', diff --git a/locales/pl.lua b/locales/pl.lua index f9e369f9..ef580470 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -69,6 +69,8 @@ Locales['pl'] = { ['weapon'] = 'broń', ['giveweapon'] = 'daj broń', ['disconnect'] = 'odłącz się od serwera', + -- Locale settings + ['locale_digit_grouping_symbol'] = ' ', -- Weapons ['weapon_knife'] = 'nóż', ['weapon_nightstick'] = 'pałka', diff --git a/locales/sv.lua b/locales/sv.lua index f9b3c19a..f71c0096 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -55,7 +55,7 @@ Locales['sv'] = { ['delete_veh_param'] = 'tryck enter', ['spawn_object'] = 'spawna föremål', ['spawn_ped'] = 'spawna NPC', - ['spawn_ped_param'] = 'exempel a_m_m_hillbilly_01', + ['spawn_ped_param'] = 'exempelvis a_m_m_hillbilly_01', ['givemoney'] = 'ge pengar', ['setmoney'] = 'bestäm mängd pengar till en valfri person', ['money_type'] = 'giltiga typer: cash, bank, black', @@ -72,13 +72,15 @@ Locales['sv'] = { ['disconnect'] = 'koppla från servern', ['chat_clear'] = 'töm chatten', ['chat_clear_all'] = 'töm chatten för alla', + -- Locale settings + ['locale_digit_grouping_symbol'] = ' ', -- Weapons - ['weapon_knife'] = 'knife', - ['weapon_nightstick'] = 'nightstick', - ['weapon_hammer'] = 'hammer', - ['weapon_bat'] = 'bat', + ['weapon_knife'] = 'kniv', + ['weapon_nightstick'] = 'batong', + ['weapon_hammer'] = 'hammare', + ['weapon_bat'] = 'slagträ', ['weapon_golfclub'] = 'golf club', - ['weapon_crowbar'] = 'crow bar', + ['weapon_crowbar'] = 'kofot', ['weapon_pistol'] = 'pistol', ['weapon_combatpistol'] = 'combat pistol', ['weapon_appistol'] = 'ap pistol', @@ -95,45 +97,45 @@ Locales['sv'] = { ['weapon_sawnoffshotgun'] = 'sawed off shotgun', ['weapon_assaultshotgun'] = 'assault shotgun', ['weapon_bullpupshotgun'] = 'bullpup shotgun', - ['weapon_stungun'] = 'tazer', - ['weapon_sniperrifle'] = 'sniper rifle', - ['weapon_heavysniper'] = 'heavy sniper', + ['weapon_stungun'] = 'elchockpistol', + ['weapon_sniperrifle'] = 'prickskyttegevär', + ['weapon_heavysniper'] = 'tung prickskytt', ['weapon_remotesniper'] = 'remote sniper', - ['weapon_grenadelauncher'] = 'grenade launcher', - ['weapon_rpg'] = 'rocket launcher', + ['weapon_grenadelauncher'] = 'granatkastare', + ['weapon_rpg'] = 'raketgevär', ['weapon_stinger'] = 'stinger', ['weapon_minigun'] = 'minigun', - ['weapon_grenade'] = 'grenade', - ['weapon_stickybomb'] = 'sticky bomb', - ['weapon_smokegrenade'] = 'smoke grenade', + ['weapon_grenade'] = 'granat', + ['weapon_stickybomb'] = 'klibbig bomb', + ['weapon_smokegrenade'] = 'rökgranat', ['weapon_bzgas'] = 'bz gas', ['weapon_molotov'] = 'molotov cocktail', - ['weapon_fireextinguisher'] = 'fire extinguisher', - ['weapon_petrolcan'] = 'jerrycan', + ['weapon_fireextinguisher'] = 'brandsläckare', + ['weapon_petrolcan'] = 'bensindunk', ['weapon_digiscanner'] = 'digiscanner', - ['weapon_ball'] = 'ball', + ['weapon_ball'] = 'boll', ['weapon_snspistol'] = 'sns pistol', - ['weapon_bottle'] = 'bottle', + ['weapon_bottle'] = 'flaska', ['weapon_gusenberg'] = 'gusenberg sweeper', ['weapon_specialcarbine'] = 'special carbine', ['weapon_heavypistol'] = 'heavy pistol', ['weapon_bullpuprifle'] = 'bullpup rifle', - ['weapon_dagger'] = 'dagger', + ['weapon_dagger'] = 'dolk', ['weapon_vintagepistol'] = 'vintage pistol', - ['weapon_firework'] = 'firework', - ['weapon_musket'] = 'musket', + ['weapon_firework'] = 'fyrverkeri', + ['weapon_musket'] = 'musköt', ['weapon_heavyshotgun'] = 'heavy shotgun', ['weapon_marksmanrifle'] = 'marksman rifle', ['weapon_hominglauncher'] = 'homing launcher', ['weapon_proxmine'] = 'proximity mine', - ['weapon_snowball'] = 'snow ball', - ['weapon_flaregun'] = 'flaregun', - ['weapon_garbagebag'] = 'garbage bag', - ['weapon_handcuffs'] = 'handcuffs', + ['weapon_snowball'] = 'snöboll', + ['weapon_flaregun'] = 'signalpistol', + ['weapon_garbagebag'] = 'soppåse', + ['weapon_handcuffs'] = 'handklovar', ['weapon_combatpdw'] = 'combat pdw', ['weapon_marksmanpistol'] = 'marksman pistol', - ['weapon_knuckle'] = 'knuckledusters', - ['weapon_hatchet'] = 'hatchet', + ['weapon_knuckle'] = 'knogjärn', + ['weapon_hatchet'] = 'yxa', ['weapon_railgun'] = 'railgun', ['weapon_machete'] = 'machete', ['weapon_machinepistol'] = 'machine pistol', @@ -142,16 +144,16 @@ Locales['sv'] = { ['weapon_dbshotgun'] = 'double barrel shotgun', ['weapon_compactrifle'] = 'compact rifle', ['weapon_autoshotgun'] = 'auto shotgun', - ['weapon_battleaxe'] = 'battle axe', + ['weapon_battleaxe'] = 'stridsyxa', ['weapon_compactlauncher'] = 'compact launcher', ['weapon_minismg'] = 'mini smg', ['weapon_pipebomb'] = 'pipe bomb', - ['weapon_poolcue'] = 'pool cue', - ['weapon_wrench'] = 'pipe wrench', - ['weapon_flashlight'] = 'flashlight', - ['gadget_nightvision'] = 'night vision', - ['gadget_parachute'] = 'parachute', - ['weapon_flare'] = 'flare gun', + ['weapon_poolcue'] = 'biljardkö', + ['weapon_wrench'] = 'rörtång', + ['weapon_flashlight'] = 'ficklampa', + ['gadget_nightvision'] = 'mörkerseende', + ['gadget_parachute'] = 'fallskärm', + ['weapon_flare'] = 'signalpistol', ['weapon_snspistol_mk2'] = 'SNS Pistol Mk II', ['weapon_revolver_mk2'] = 'Heavy Revolver Mk II', ['weapon_doubleaction'] = 'Double-Action Revolver', diff --git a/shared/functions.lua b/shared/functions.lua index d55ec2b0..84f3ec3b 100644 --- a/shared/functions.lua +++ b/shared/functions.lua @@ -59,7 +59,6 @@ ESX.DumpTable = function(table, nb) end -ESX.Round = function(value) - return value >= 0 and math.floor(value + 0.5) or math.ceil(value - 0.5) +ESX.Round = function(value, numDecimalPlaces) + return ESX.Math.Round(value, numDecimalPlaces) end - diff --git a/shared/modules/math.lua b/shared/modules/math.lua new file mode 100644 index 00000000..23273627 --- /dev/null +++ b/shared/modules/math.lua @@ -0,0 +1,12 @@ +ESX.Math = {} + +ESX.Math.Round = function(value, numDecimalPlaces) + return tonumber(string.format("%." .. (numDecimalPlaces or 0) .. "f", value)) +end + +-- credit http://richard.warburton.it +ESX.Math.GroupDigits = function(value) + local left,num,right = string.match(value,'^([^%d]*%d)(%d*)(.-)$') + + return left..(num:reverse():gsub('(%d%d%d)','%1' .. _U('locale_digit_grouping_symbol')):reverse())..right +end