From 4f6a40199d8c59d8d401826e739ed43de11d8947 Mon Sep 17 00:00:00 2001 From: Delduwaht <33182571+LuaDeldu@users.noreply.github.com> Date: Mon, 24 Sep 2018 17:50:00 +0200 Subject: [PATCH] Added more ped components (#23) - 4 tabs indent - add Polish translation (from deviljin112) - add more components (eyes color / arms 2 / watches / bracelets / blemishes / ageing / blush / complexion / sun damages / freckles / chest hair / body blemishes) - increment version --- __resource.lua | 3 +- client/main.lua | 602 +++++++++++++++++++++++++++--------------------- locale.lua | 20 +- locales/br.lua | 26 ++- locales/de.lua | 124 ++++++---- locales/en.lua | 24 ++ locales/fi.lua | 24 ++ locales/fr.lua | 24 ++ locales/pl.lua | 76 ++++++ locales/sv.lua | 24 ++ 10 files changed, 627 insertions(+), 320 deletions(-) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index eff522fd..c11c3fec 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'Skin Changer' -version '1.0.2' +version '1.0.3' client_scripts { 'locale.lua', @@ -11,6 +11,7 @@ client_scripts { 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/pl.lua', 'locales/sv.lua', 'config.lua', 'client/main.lua' diff --git a/client/main.lua b/client/main.lua index df3b3ef9..8fbd1c69 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,352 +1,438 @@ local Components = { - {label = _U('sex'), name = 'sex', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('face'), name = 'face', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('skin'), name = 'skin', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('hair_1'), name = 'hair_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('hair_2'), name = 'hair_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('hair_color_1'), name = 'hair_color_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('hair_color_2'), name = 'hair_color_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('tshirt_1'), name = 'tshirt_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, - {label = _U('tshirt_2'), name = 'tshirt_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'tshirt_1'}, - {label = _U('torso_1'), name = 'torso_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, - {label = _U('torso_2'), name = 'torso_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'torso_1'}, - {label = _U('decals_1'), name = 'decals_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, - {label = _U('decals_2'), name = 'decals_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'decals_1'}, - {label = _U('arms'), name = 'arms', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, - {label = _U('pants_1'), name = 'pants_1', value = 0, min = 0, zoomOffset = 0.8, camOffset = -0.5}, - {label = _U('pants_2'), name = 'pants_2', value = 0, min = 0, zoomOffset = 0.8, camOffset = -0.5, textureof = 'pants_1'}, - {label = _U('shoes_1'), name = 'shoes_1', value = 0, min = 0, zoomOffset = 0.8, camOffset = -0.8}, - {label = _U('shoes_2'), name = 'shoes_2', value = 0, min = 0, zoomOffset = 0.8, camOffset = -0.8, textureof = 'shoes_1'}, - {label = _U('mask_1'), name = 'mask_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('mask_2'), name = 'mask_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65, textureof = 'mask_1'}, - {label = _U('bproof_1'), name = 'bproof_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, - {label = _U('bproof_2'), name = 'bproof_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'bproof_1'}, - {label = _U('chain_1'), name = 'chain_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('chain_2'), name = 'chain_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65, textureof = 'chain_1'}, - {label = _U('helmet_1'), name = 'helmet_1', value = -1, min = -1, zoomOffset = 0.6, camOffset = 0.65, componentId = 0 }, - {label = _U('helmet_2'), name = 'helmet_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65, textureof = 'helmet_1'}, - {label = _U('glasses_1'), name = 'glasses_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, - {label = _U('glasses_2'), name = 'glasses_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65, textureof = 'glasses_1'}, - {label = _U('bag'), name = 'bags_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, - {label = _U('bag_color'), name = 'bags_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'bags_1'}, - {label = _U('eyebrow_size'), name = 'eyebrows_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('eyebrow_type'), name = 'eyebrows_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('eyebrow_color_1'), name = 'eyebrows_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('eyebrow_color_2'), name = 'eyebrows_4', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('makeup_type'), name = 'makeup_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('makeup_thickness'), name = 'makeup_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('makeup_color_1'), name = 'makeup_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('makeup_color_2'), name = 'makeup_4', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('lipstick_type'), name = 'lipstick_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('lipstick_thickness'), name = 'lipstick_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('lipstick_color_1'), name = 'lipstick_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('lipstick_color_2'), name = 'lipstick_4', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('ear_accessories'), name = 'ears_1', value = -1, min = -1, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('ear_accessories_color'), name = 'ears_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65, textureof = 'ears_1'}, - {label = _U('wrinkles'), name = 'age_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('wrinkle_thickness'), name = 'age_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('beard_type'), name = 'beard_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('beard_size'), name = 'beard_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('beard_color_1'), name = 'beard_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, - {label = _U('beard_color_2'), name = 'beard_4', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65} + {label = _U('sex'), name = 'sex', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('face'), name = 'face', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('skin'), name = 'skin', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('hair_1'), name = 'hair_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('hair_2'), name = 'hair_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('hair_color_1'), name = 'hair_color_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('hair_color_2'), name = 'hair_color_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('tshirt_1'), name = 'tshirt_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('tshirt_2'), name = 'tshirt_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'tshirt_1'}, + {label = _U('torso_1'), name = 'torso_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('torso_2'), name = 'torso_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'torso_1'}, + {label = _U('decals_1'), name = 'decals_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('decals_2'), name = 'decals_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'decals_1'}, + {label = _U('arms'), name = 'arms', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('arms_2'), name = 'arms_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('pants_1'), name = 'pants_1', value = 0, min = 0, zoomOffset = 0.8, camOffset = -0.5}, + {label = _U('pants_2'), name = 'pants_2', value = 0, min = 0, zoomOffset = 0.8, camOffset = -0.5, textureof = 'pants_1'}, + {label = _U('shoes_1'), name = 'shoes_1', value = 0, min = 0, zoomOffset = 0.8, camOffset = -0.8}, + {label = _U('shoes_2'), name = 'shoes_2', value = 0, min = 0, zoomOffset = 0.8, camOffset = -0.8, textureof = 'shoes_1'}, + {label = _U('mask_1'), name = 'mask_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('mask_2'), name = 'mask_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65, textureof = 'mask_1'}, + {label = _U('bproof_1'), name = 'bproof_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('bproof_2'), name = 'bproof_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'bproof_1'}, + {label = _U('chain_1'), name = 'chain_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('chain_2'), name = 'chain_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65, textureof = 'chain_1'}, + {label = _U('helmet_1'), name = 'helmet_1', value = -1, min = -1, zoomOffset = 0.6, camOffset = 0.65, componentId = 0 }, + {label = _U('helmet_2'), name = 'helmet_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65, textureof = 'helmet_1'}, + {label = _U('glasses_1'), name = 'glasses_1', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65}, + {label = _U('glasses_2'), name = 'glasses_2', value = 0, min = 0, zoomOffset = 0.6, camOffset = 0.65, textureof = 'glasses_1'}, + {label = _U('watches_1'), name = 'watches_1', value = -1, min = -1, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('watches_2'), name = 'watches_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'watches_1'}, + {label = _U('bracelets_1'), name = 'bracelets_1', value = -1, min = -1, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('bracelets_2'), name = 'bracelets_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'bracelets_1'}, + {label = _U('bag'), name = 'bags_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('bag_color'), name = 'bags_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15, textureof = 'bags_1'}, + {label = _U('eye_color'), name = 'eye_color', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('eyebrow_size'), name = 'eyebrows_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('eyebrow_type'), name = 'eyebrows_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('eyebrow_color_1'), name = 'eyebrows_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('eyebrow_color_2'), name = 'eyebrows_4', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('makeup_type'), name = 'makeup_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('makeup_thickness'), name = 'makeup_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('makeup_color_1'), name = 'makeup_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('makeup_color_2'), name = 'makeup_4', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('lipstick_type'), name = 'lipstick_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('lipstick_thickness'), name = 'lipstick_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('lipstick_color_1'), name = 'lipstick_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('lipstick_color_2'), name = 'lipstick_4', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('ear_accessories'), name = 'ears_1', value = -1, min = -1, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('ear_accessories_color'), name = 'ears_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65, textureof = 'ears_1'}, + {label = _U('chest_hair'), name = 'chest_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('chest_hair_1'), name = 'chest_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('chest_color'), name = 'chest_3', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('bodyb'), name = 'bodyb_1', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('bodyb_size'), name = 'bodyb_2', value = 0, min = 0, zoomOffset = 0.75, camOffset = 0.15}, + {label = _U('wrinkles'), name = 'age_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('wrinkle_thickness'), name = 'age_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('blemishes'), name = 'blemishes_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('blemishes_size'), name = 'blemishes_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('blush'), name = 'blush_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('blush_1'), name = 'blush_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('blush_color'), name = 'blush_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('complexion'), name = 'complexion_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('complexion_1'), name = 'complexion_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('sun'), name = 'sun_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('sun_1'), name = 'sun_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('freckles'), name = 'moles_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('freckles_1'), name = 'moles_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('beard_type'), name = 'beard_1', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('beard_size'), name = 'beard_2', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('beard_color_1'), name = 'beard_3', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65}, + {label = _U('beard_color_2'), name = 'beard_4', value = 0, min = 0, zoomOffset = 0.4, camOffset = 0.65} } -local LastSex = -1 -local LoadSkin = nil -local LoadClothes = nil -local Character = {} +local LastSex = -1 +local LoadSkin = nil +local LoadClothes = nil +local Character = {} for i=1, #Components, 1 do - Character[Components[i].name] = Components[i].value + Character[Components[i].name] = Components[i].value end function LoadDefaultModel(malePed, cb) - local playerPed = GetPlayerPed(-1) - local characterModel + local playerPed = PlayerPedId() + local characterModel - if malePed then - characterModel = GetHashKey('mp_m_freemode_01') - else - characterModel = GetHashKey('mp_f_freemode_01') - end + if malePed then + characterModel = GetHashKey('mp_m_freemode_01') + else + characterModel = GetHashKey('mp_f_freemode_01') + end - RequestModel(characterModel) + RequestModel(characterModel) - Citizen.CreateThread(function() + Citizen.CreateThread(function() - while not HasModelLoaded(characterModel) do - RequestModel(characterModel) - Citizen.Wait(0) - end + while not HasModelLoaded(characterModel) do + RequestModel(characterModel) + Citizen.Wait(0) + end - if IsModelInCdimage(characterModel) and IsModelValid(characterModel) then - SetPlayerModel(PlayerId(), characterModel) - SetPedDefaultComponentVariation(playerPed) - end + if IsModelInCdimage(characterModel) and IsModelValid(characterModel) then + SetPlayerModel(PlayerId(), characterModel) + SetPedDefaultComponentVariation(playerPed) + end - SetModelAsNoLongerNeeded(characterModel) + SetModelAsNoLongerNeeded(characterModel) - if cb ~= nil then - cb() - end + if cb ~= nil then + cb() + end - TriggerEvent('skinchanger:modelLoaded') + TriggerEvent('skinchanger:modelLoaded') - end) + end) end function GetMaxVals() - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() - local data = { - sex = 1, - face = 45, - skin = 45, - age_1 = GetNumHeadOverlayValues(3)-1, - age_2 = 10, - beard_1 = GetNumHeadOverlayValues(1)-1, - beard_2 = 10, - beard_3 = GetNumHairColors()-1, - beard_4 = GetNumHairColors()-1, - hair_1 = GetNumberOfPedDrawableVariations(playerPed, 2) - 1, - hair_2 = GetNumberOfPedTextureVariations(playerPed, 2, Character['hair_1']) - 1, - hair_color_1 = GetNumHairColors()-1, - hair_color_2 = GetNumHairColors()-1, - eyebrows_1 = GetNumHeadOverlayValues(2)-1, - eyebrows_2 = 10, - eyebrows_3 = GetNumHairColors()-1, - eyebrows_4 = GetNumHairColors()-1, - makeup_1 = GetNumHeadOverlayValues(4)-1, - makeup_2 = 10, - makeup_3 = GetNumHairColors()-1, - makeup_4 = GetNumHairColors()-1, - lipstick_1 = GetNumHeadOverlayValues(8)-1, - lipstick_2 = 10, - lipstick_3 = GetNumHairColors()-1, - lipstick_4 = GetNumHairColors()-1, - ears_1 = GetNumberOfPedPropDrawableVariations (playerPed, 1) - 1, - ears_2 = GetNumberOfPedPropTextureVariations (playerPed, 1, Character['ears_1'] - 1), - tshirt_1 = GetNumberOfPedDrawableVariations (playerPed, 8) - 1, - tshirt_2 = GetNumberOfPedTextureVariations (playerPed, 8, Character['tshirt_1']) - 1, - torso_1 = GetNumberOfPedDrawableVariations (playerPed, 11) - 1, - torso_2 = GetNumberOfPedTextureVariations (playerPed, 11, Character['torso_1']) - 1, - decals_1 = GetNumberOfPedDrawableVariations (playerPed, 10) - 1, - decals_2 = GetNumberOfPedTextureVariations (playerPed, 10, Character['decals_1']) - 1, - arms = GetNumberOfPedDrawableVariations (playerPed, 3) - 1, - pants_1 = GetNumberOfPedDrawableVariations (playerPed, 4) - 1, - pants_2 = GetNumberOfPedTextureVariations (playerPed, 4, Character['pants_1']) - 1, - shoes_1 = GetNumberOfPedDrawableVariations (playerPed, 6) - 1, - shoes_2 = GetNumberOfPedTextureVariations (playerPed, 6, Character['shoes_1']) - 1, - mask_1 = GetNumberOfPedDrawableVariations (playerPed, 1) - 1, - mask_2 = GetNumberOfPedTextureVariations (playerPed, 1, Character['mask_1']) - 1, - bproof_1 = GetNumberOfPedDrawableVariations (playerPed, 9) - 1, - bproof_2 = GetNumberOfPedTextureVariations (playerPed, 9, Character['bproof_1']) - 1, - chain_1 = GetNumberOfPedDrawableVariations (playerPed, 7) - 1, - chain_2 = GetNumberOfPedTextureVariations (playerPed, 7, Character['chain_1']) - 1, - bags_1 = GetNumberOfPedDrawableVariations (playerPed, 5) - 1, - bags_2 = GetNumberOfPedTextureVariations (playerPed, 5, Character['bags_1']) - 1, - helmet_1 = GetNumberOfPedPropDrawableVariations (playerPed, 0) - 1, - helmet_2 = GetNumberOfPedPropTextureVariations (playerPed, 0, Character['helmet_1']) - 1, - glasses_1 = GetNumberOfPedPropDrawableVariations (playerPed, 1) - 1, - glasses_2 = GetNumberOfPedPropTextureVariations (playerPed, 1, Character['glasses_1'] - 1), - } + local data = { + sex = 1, + face = 45, + skin = 45, + age_1 = GetNumHeadOverlayValues(3)-1, + age_2 = 10, + beard_1 = GetNumHeadOverlayValues(1)-1, + beard_2 = 10, + beard_3 = GetNumHairColors()-1, + beard_4 = GetNumHairColors()-1, + hair_1 = GetNumberOfPedDrawableVariations (playerPed, 2) - 1, + hair_2 = GetNumberOfPedTextureVariations (playerPed, 2, Character['hair_1']) - 1, + hair_color_1 = GetNumHairColors()-1, + hair_color_2 = GetNumHairColors()-1, + eye_color = 31, + eyebrows_1 = GetNumHeadOverlayValues(2)-1, + eyebrows_2 = 10, + eyebrows_3 = GetNumHairColors()-1, + eyebrows_4 = GetNumHairColors()-1, + makeup_1 = GetNumHeadOverlayValues(4)-1, + makeup_2 = 10, + makeup_3 = GetNumHairColors()-1, + makeup_4 = GetNumHairColors()-1, + lipstick_1 = GetNumHeadOverlayValues(8)-1, + lipstick_2 = 10, + lipstick_3 = GetNumHairColors()-1, + lipstick_4 = GetNumHairColors()-1, + blemishes_1 = GetNumHeadOverlayValues(0)-1, + blemishes_2 = 10, + blush_1 = GetNumHeadOverlayValues(5)-1, + blush_2 = 10, + blush_3 = GetNumHairColors()-1, + complexion_1 = GetNumHeadOverlayValues(6)-1, + complexion_2 = 10, + sun_1 = GetNumHeadOverlayValues(7)-1, + sun_2 = 10, + moles_1 = GetNumHeadOverlayValues(9)-1, + moles_2 = 10, + chest_1 = GetNumHeadOverlayValues(10)-1, + chest_2 = 10, + chest_3 = GetNumHairColors()-1, + bodyb_1 = GetNumHeadOverlayValues(11)-1, + bodyb_2 = 10, + ears_1 = GetNumberOfPedPropDrawableVariations (playerPed, 1) - 1, + ears_2 = GetNumberOfPedPropTextureVariations (playerPed, 1, Character['ears_1'] - 1), + tshirt_1 = GetNumberOfPedDrawableVariations (playerPed, 8) - 1, + tshirt_2 = GetNumberOfPedTextureVariations (playerPed, 8, Character['tshirt_1']) - 1, + torso_1 = GetNumberOfPedDrawableVariations (playerPed, 11) - 1, + torso_2 = GetNumberOfPedTextureVariations (playerPed, 11, Character['torso_1']) - 1, + decals_1 = GetNumberOfPedDrawableVariations (playerPed, 10) - 1, + decals_2 = GetNumberOfPedTextureVariations (playerPed, 10, Character['decals_1']) - 1, + arms = GetNumberOfPedDrawableVariations (playerPed, 3) - 1, + arms_2 = 10, + pants_1 = GetNumberOfPedDrawableVariations (playerPed, 4) - 1, + pants_2 = GetNumberOfPedTextureVariations (playerPed, 4, Character['pants_1']) - 1, + shoes_1 = GetNumberOfPedDrawableVariations (playerPed, 6) - 1, + shoes_2 = GetNumberOfPedTextureVariations (playerPed, 6, Character['shoes_1']) - 1, + mask_1 = GetNumberOfPedDrawableVariations (playerPed, 1) - 1, + mask_2 = GetNumberOfPedTextureVariations (playerPed, 1, Character['mask_1']) - 1, + bproof_1 = GetNumberOfPedDrawableVariations (playerPed, 9) - 1, + bproof_2 = GetNumberOfPedTextureVariations (playerPed, 9, Character['bproof_1']) - 1, + chain_1 = GetNumberOfPedDrawableVariations (playerPed, 7) - 1, + chain_2 = GetNumberOfPedTextureVariations (playerPed, 7, Character['chain_1']) - 1, + bags_1 = GetNumberOfPedDrawableVariations (playerPed, 5) - 1, + bags_2 = GetNumberOfPedTextureVariations (playerPed, 5, Character['bags_1']) - 1, + helmet_1 = GetNumberOfPedPropDrawableVariations (playerPed, 0) - 1, + helmet_2 = GetNumberOfPedPropTextureVariations (playerPed, 0, Character['helmet_1']) - 1, + glasses_1 = GetNumberOfPedPropDrawableVariations (playerPed, 1) - 1, + glasses_2 = GetNumberOfPedPropTextureVariations (playerPed, 1, Character['glasses_1'] - 1), + watches_1 = GetNumberOfPedPropDrawableVariations (playerPed, 6) - 1, + watches_2 = GetNumberOfPedPropTextureVariations (playerPed, 6, Character['watches_1']) - 1, + bracelets_1 = GetNumberOfPedPropDrawableVariations (playerPed, 7) - 1, + bracelets_2 = GetNumberOfPedPropTextureVariations (playerPed, 7, Character['bracelets_1'] - 1), +} - return data + return data end function ApplySkin(skin, clothes) - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() - for k,v in pairs(skin) do - Character[k] = v - end + for k,v in pairs(skin) do + Character[k] = v + end - if clothes ~= nil then + if clothes ~= nil then - for k,v in pairs(clothes) do - if - k ~= 'sex' and - k ~= 'face' and - k ~= 'skin' and - k ~= 'age_1' and - k ~= 'age_2' and - k ~= 'beard_1' and - k ~= 'beard_2' and - k ~= 'beard_3' and - k ~= 'beard_4' and - k ~= 'hair_1' and - k ~= 'hair_2' and - k ~= 'hair_color_1' and - k ~= 'hair_color_2' and - k ~= 'eyebrows_1' and - k ~= 'eyebrows_2' and - k ~= 'eyebrows_3' and - k ~= 'eyebrows_4' and - k ~= 'makeup_1' and - k ~= 'makeup_2' and - k ~= 'makeup_3' and - k ~= 'makeup_4' and - k ~= 'lipstick_1' and - k ~= 'lipstick_2' and - k ~= 'lipstick_3' and - k ~= 'lipstick_4' - then - Character[k] = v - end - end + for k,v in pairs(clothes) do + if + k ~= 'sex' and + k ~= 'face' and + k ~= 'skin' and + k ~= 'age_1' and + k ~= 'age_2' and + k ~= 'eye_color' and + k ~= 'beard_1' and + k ~= 'beard_2' and + k ~= 'beard_3' and + k ~= 'beard_4' and + k ~= 'hair_1' and + k ~= 'hair_2' and + k ~= 'hair_color_1' and + k ~= 'hair_color_2' and + k ~= 'eyebrows_1' and + k ~= 'eyebrows_2' and + k ~= 'eyebrows_3' and + k ~= 'eyebrows_4' and + k ~= 'makeup_1' and + k ~= 'makeup_2' and + k ~= 'makeup_3' and + k ~= 'makeup_4' and + k ~= 'lipstick_1' and + k ~= 'lipstick_2' and + k ~= 'lipstick_3' and + k ~= 'lipstick_4' and + k ~= 'blemishes_1' and + k ~= 'blemishes_2' and + k ~= 'blush_1' and + k ~= 'blush_2' and + k ~= 'blush_3' and + k ~= 'complexion_1' and + k ~= 'complexion_2' and + k ~= 'sun_1' and + k ~= 'sun_2' and + k ~= 'moles_1' and + k ~= 'moles_2' and + k ~= 'chest_1' and + k ~= 'chest_2' and + k ~= 'chest_3' and + k ~= 'bodyb_1' and + k ~= 'bodyb_2' + then + Character[k] = v + end + end - end + end - SetPedHeadBlendData (playerPed, Character['face'], Character['face'], Character['face'], Character['skin'], Character['skin'], Character['skin'], 1.0, 1.0, 1.0, true) + SetPedHeadBlendData (playerPed, Character['face'], Character['face'], Character['face'], Character['skin'], Character['skin'], Character['skin'], 1.0, 1.0, 1.0, true) - SetPedHairColor (playerPed, Character['hair_color_1'], Character['hair_color_2']) -- Hair Color - SetPedHeadOverlay (playerPed, 3, Character['age_1'], (Character['age_2'] / 10) + 0.0) -- Age + opacity - SetPedHeadOverlay (playerPed, 1, Character['beard_1'], (Character['beard_2'] / 10) + 0.0) -- Beard + opacity - SetPedHeadOverlay (playerPed, 2, Character['eyebrows_1'], (Character['eyebrows_2'] / 10) + 0.0) -- Eyebrows + opacity - SetPedHeadOverlay (playerPed, 4, Character['makeup_1'], (Character['makeup_2'] / 10) + 0.0) -- Makeup + opacity - SetPedHeadOverlay (playerPed, 8, Character['lipstick_1'], (Character['lipstick_2'] / 10) + 0.0) -- Lipstick + opacity - SetPedComponentVariation(playerPed, 2, Character['hair_1'], Character['hair_2'], 2) -- Hair - SetPedHeadOverlayColor (playerPed, 1, 1, Character['beard_3'], Character['beard_4']) -- Beard Color - SetPedHeadOverlayColor (playerPed, 2, 1, Character['eyebrows_3'], Character['eyebrows_4']) -- Eyebrows Color - SetPedHeadOverlayColor (playerPed, 4, 1, Character['makeup_3'], Character['makeup_4']) -- Makeup Color - SetPedHeadOverlayColor (playerPed, 8, 1, Character['lipstick_3'], Character['lipstick_4']) -- Lipstick Color + SetPedHairColor (playerPed, Character['hair_color_1'], Character['hair_color_2']) -- Hair Color + SetPedHeadOverlay (playerPed, 3, Character['age_1'], (Character['age_2'] / 10) + 0.0) -- Age + opacity + SetPedHeadOverlay (playerPed, 1, Character['beard_1'], (Character['beard_2'] / 10) + 0.0) -- Beard + opacity + SetPedEyeColor (playerPed, Character['eye_color'], 0, 1) -- Eyes color + SetPedHeadOverlay (playerPed, 2, Character['eyebrows_1'], (Character['eyebrows_2'] / 10) + 0.0) -- Eyebrows + opacity + SetPedHeadOverlay (playerPed, 4, Character['makeup_1'], (Character['makeup_2'] / 10) + 0.0) -- Makeup + opacity + SetPedHeadOverlay (playerPed, 8, Character['lipstick_1'], (Character['lipstick_2'] / 10) + 0.0) -- Lipstick + opacity + SetPedComponentVariation (playerPed, 2, Character['hair_1'], Character['hair_2'], 2) -- Hair + SetPedHeadOverlayColor (playerPed, 1, 1, Character['beard_3'], Character['beard_4']) -- Beard Color + SetPedHeadOverlayColor (playerPed, 2, 1, Character['eyebrows_3'], Character['eyebrows_4']) -- Eyebrows Color + SetPedHeadOverlayColor (playerPed, 4, 1, Character['makeup_3'], Character['makeup_4']) -- Makeup Color + SetPedHeadOverlayColor (playerPed, 8, 1, Character['lipstick_3'], Character['lipstick_4']) -- Lipstick Color + SetPedHeadOverlay (playerPed, 5, Character['blush_1'], (Character['blush_2'] / 10) + 0.0) -- Blush + opacity + SetPedHeadOverlayColor (playerPed, 5, 2, Character['blush_3']) -- Blush Color + SetPedHeadOverlay (playerPed, 6, Character['complexion_1'], (Character['complexion_2'] / 10) + 0.0) -- Complexion + opacity + SetPedHeadOverlay (playerPed, 7, Character['sun_1'], (Character['sun_2'] / 10) + 0.0) -- Sun Damage + opacity + SetPedHeadOverlay (playerPed, 9, Character['moles_1'], (Character['moles_2'] / 10) + 0.0) -- Moles/Freckles + opacity + SetPedHeadOverlay (playerPed, 10, Character['chest_1'], (Character['chest_2'] / 10) + 0.0) -- Chest Hair + opacity + SetPedHeadOverlayColor (playerPed, 10, 1, Character['chest_3']) -- Torso Color + SetPedHeadOverlay (playerPed, 11, Character['bodyb_1'], (Character['bodyb_2'] / 10) + 0.0) -- Body Blemishes + opacity - if Character['ears_1'] == -1 then - ClearPedProp(playerPed, 2) - else - SetPedPropIndex(playerPed, 2, Character['ears_1'], Character['ears_2'], 2) -- Ears Accessories - end + if Character['ears_1'] == -1 then + ClearPedProp(playerPed, 2) + else + SetPedPropIndex (playerPed, 2, Character['ears_1'], Character['ears_2'], 2) -- Ears Accessories + end - SetPedComponentVariation(playerPed, 8, Character['tshirt_1'], Character['tshirt_2'], 2) -- Tshirt - SetPedComponentVariation(playerPed, 11, Character['torso_1'], Character['torso_2'], 2) -- torso parts - SetPedComponentVariation(playerPed, 3, Character['arms'], 0, 2) -- torso - SetPedComponentVariation(playerPed, 10, Character['decals_1'], Character['decals_2'], 2) -- decals - SetPedComponentVariation(playerPed, 4, Character['pants_1'], Character['pants_2'], 2) -- pants - SetPedComponentVariation(playerPed, 6, Character['shoes_1'], Character['shoes_2'], 2) -- shoes - SetPedComponentVariation(playerPed, 1, Character['mask_1'], Character['mask_2'], 2) -- mask - SetPedComponentVariation(playerPed, 9, Character['bproof_1'], Character['bproof_2'], 2) -- bulletproof - SetPedComponentVariation(playerPed, 7, Character['chain_1'], Character['chain_2'], 2) -- chain - SetPedComponentVariation(playerPed, 5, Character['bags_1'], Character['bags_2'], 2) -- Bag + SetPedComponentVariation (playerPed, 8, Character['tshirt_1'], Character['tshirt_2'], 2) -- Tshirt + SetPedComponentVariation (playerPed, 11, Character['torso_1'], Character['torso_2'], 2) -- torso parts + SetPedComponentVariation (playerPed, 3, Character['arms'], Character['arms_2'], 2) -- Amrs + SetPedComponentVariation (playerPed, 10, Character['decals_1'], Character['decals_2'], 2) -- decals + SetPedComponentVariation (playerPed, 4, Character['pants_1'], Character['pants_2'], 2) -- pants + SetPedComponentVariation (playerPed, 6, Character['shoes_1'], Character['shoes_2'], 2) -- shoes + SetPedComponentVariation (playerPed, 1, Character['mask_1'], Character['mask_2'], 2) -- mask + SetPedComponentVariation (playerPed, 9, Character['bproof_1'], Character['bproof_2'], 2) -- bulletproof + SetPedComponentVariation (playerPed, 7, Character['chain_1'], Character['chain_2'], 2) -- chain + SetPedComponentVariation (playerPed, 5, Character['bags_1'], Character['bags_2'], 2) -- Bag - if Character['helmet_1'] == -1 then - ClearPedProp(playerPed, 0) - else - SetPedPropIndex(playerPed, 0, Character['helmet_1'], Character['helmet_2'], 2) -- Helmet - end + if Character['helmet_1'] == -1 then + ClearPedProp(playerPed, 0) + else + SetPedPropIndex (playerPed, 0, Character['helmet_1'], Character['helmet_2'], 2) -- Helmet + end - SetPedPropIndex(playerPed, 1, Character['glasses_1'], Character['glasses_2'], 2) -- Glasses + if Character['glasses_1'] == -1 then + ClearPedProp(playerPed, 1) + else + SetPedPropIndex (playerPed, 1, Character['glasses_1'], Character['glasses_2'], 2) -- Glasses + end + + if Character['watches_1'] == -1 then + ClearPedProp(playerPed, 6) + else + SetPedPropIndex (playerPed, 6, Character['watches_1'], Character['watches_2'], 2) -- Watches + end + + if Character['bracelets_1'] == -1 then + ClearPedProp(playerPed, 7) + else + SetPedPropIndex (playerPed, 7, Character['bracelets_1'], Character['bracelets_2'], 2) -- Bracelets + end end AddEventHandler('skinchanger:loadDefaultModel', function(loadMale, cb) - LoadDefaultModel(loadMale, cb) + LoadDefaultModel(loadMale, cb) end) AddEventHandler('skinchanger:getData', function(cb) - local components = json.decode(json.encode(Components)) + local components = json.decode(json.encode(Components)) - for k,v in pairs(Character) do - for i=1, #components, 1 do - if k == components[i].name then - components[i].value = v - --components[i].zoomOffset = Components[i].zoomOffset - --components[i].camOffset = Components[i].camOffset - end - end - end + for k,v in pairs(Character) do + for i=1, #components, 1 do + if k == components[i].name then + components[i].value = v + --components[i].zoomOffset = Components[i].zoomOffset + --components[i].camOffset = Components[i].camOffset + end + end + end - cb(components, GetMaxVals()) + cb(components, GetMaxVals()) end) AddEventHandler('skinchanger:change', function(key, val) - Character[key] = val + Character[key] = val - if key == 'sex' then - TriggerEvent('skinchanger:loadSkin', Character) - else - ApplySkin(Character) - end + if key == 'sex' then + TriggerEvent('skinchanger:loadSkin', Character) + else + ApplySkin(Character) + end end) AddEventHandler('skinchanger:getSkin', function(cb) - cb(Character) + cb(Character) end) AddEventHandler('skinchanger:modelLoaded', function() - ClearPedProp(GetPlayerPed(-1), 0) + ClearPedProp(PlayerPedId(), 0) - if LoadSkin ~= nil then + if LoadSkin ~= nil then - ApplySkin(LoadSkin) - LoadSkin = nil + ApplySkin(LoadSkin) + LoadSkin = nil - end + end - if LoadClothes ~= nil then + if LoadClothes ~= nil then - ApplySkin(LoadClothes.playerSkin, LoadClothes.clothesSkin) - LoadClothes = nil + ApplySkin(LoadClothes.playerSkin, LoadClothes.clothesSkin) + LoadClothes = nil - end + end end) RegisterNetEvent('skinchanger:loadSkin') AddEventHandler('skinchanger:loadSkin', function(skin, cb) - if skin['sex'] ~= LastSex then + if skin['sex'] ~= LastSex then - LoadSkin = skin + LoadSkin = skin - if skin['sex'] == 0 then - TriggerEvent('skinchanger:loadDefaultModel', true, cb) - else - TriggerEvent('skinchanger:loadDefaultModel', false, cb) - end + if skin['sex'] == 0 then + TriggerEvent('skinchanger:loadDefaultModel', true, cb) + else + TriggerEvent('skinchanger:loadDefaultModel', false, cb) + end - else + else - ApplySkin(skin) + ApplySkin(skin) - if cb ~= nil then - cb() - end + if cb ~= nil then + cb() + end - end + end - LastSex = skin['sex'] + LastSex = skin['sex'] end) RegisterNetEvent('skinchanger:loadClothes') AddEventHandler('skinchanger:loadClothes', function(playerSkin, clothesSkin) - if playerSkin['sex'] ~= LastSex then + if playerSkin['sex'] ~= LastSex then - LoadClothes = { - playerSkin = playerSkin, - clothesSkin = clothesSkin - } + LoadClothes = { + playerSkin = playerSkin, + clothesSkin = clothesSkin + } - if playerSkin['sex'] == 0 then - TriggerEvent('skinchanger:loadDefaultModel', true) - else - TriggerEvent('skinchanger:loadDefaultModel', false) - end + if playerSkin['sex'] == 0 then + TriggerEvent('skinchanger:loadDefaultModel', true) + else + TriggerEvent('skinchanger:loadDefaultModel', false) + end - else - ApplySkin(playerSkin, clothesSkin) - end + else + ApplySkin(playerSkin, clothesSkin) + end - LastSex = playerSkin['sex'] + LastSex = playerSkin['sex'] end) diff --git a/locale.lua b/locale.lua index d98f2015..0cd71743 100644 --- a/locale.lua +++ b/locale.lua @@ -2,20 +2,20 @@ Locales = {} function _(str, ...) -- Translate string - if Locales[Config.Locale] ~= nil then + if Locales[Config.Locale] ~= nil then - if Locales[Config.Locale][str] ~= nil then - return string.format(Locales[Config.Locale][str], ...) - else - return 'Translation [' .. Config.Locale .. '][' .. str .. '] does not exist' - end + if Locales[Config.Locale][str] ~= nil then + return string.format(Locales[Config.Locale][str], ...) + else + return 'Translation [' .. Config.Locale .. '][' .. str .. '] does not exist' + end - else - return 'Locale [' .. Config.Locale .. '] does not exist' - end + else + return 'Locale [' .. Config.Locale .. '] does not exist' + end end function _U(str, ...) -- Translate string first char uppercase - return tostring(_(str, ...):gsub("^%l", string.upper)) + return tostring(_(str, ...):gsub("^%l", string.upper)) end diff --git a/locales/br.lua b/locales/br.lua index 350a5cbd..3aa61263 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -13,6 +13,7 @@ Locales['br'] = { ['hair_color_1'] = 'cor do cabelo 1', ['hair_color_2'] = 'cor do cabelo 2', ['eyebrow_type'] = 'tipo de sobrancelha', + ['eye_color'] = 'eye color', ['eyebrow_size'] = 'tamanho da sobrancelha', ['eyebrow_color_1'] = 'cor da sobrancelha 1', ['eyebrow_color_2'] = 'cor da sobrancelha 2', @@ -33,6 +34,7 @@ Locales['br'] = { ['decals_1'] = 'adesivos 1', ['decals_2'] = 'adesivos 2', ['arms'] = 'braços', + ['arms_2'] = 'braços 2', ['pants_1'] = 'calça 1', ['pants_2'] = 'calça 2', ['shoes_1'] = 'calçados 1', @@ -45,8 +47,30 @@ Locales['br'] = { ['chain_2'] = 'acessórios pescoço 2', ['helmet_1'] = 'capacete 1', ['helmet_2'] = 'capacete 2', + ['watches_1'] = 'watches 1', + ['watches_2'] = 'watches 2', + ['bracelets_1'] = 'bracelets 1', + ['bracelets_2'] = 'bracelets 2', ['glasses_1'] = 'óculos 1', ['glasses_2'] = 'óculos 2', ['bag'] = 'mochilas', ['bag_color'] = 'cor das mochilas', -} \ No newline at end of file + ['blemishes'] = 'blemishes', + ['blemishes_size']= 'blemishes thickness', + ['ageing'] = 'ageing', + ['ageing_1'] = 'ageing thickness', + ['blush'] = 'blush', + ['blush_1'] = 'blush thickness', + ['blush_color'] = 'blush color', + ['complexion'] = 'complexion', + ['complexion_1'] = 'complexion thickness', + ['sun'] = 'sun', + ['sun_1'] = 'sun thickness', + ['freckles'] = 'freckles', + ['freckles_1'] = 'freckles thickness', + ['chest_hair'] = 'chest hair', + ['chest_hair_1'] = 'chest hair thickness', + ['chest_color'] = 'chest hair color', + ['bodyb'] = 'body blemishes', + ['bodyb_size'] = 'body blemishes thickness' +} diff --git a/locales/de.lua b/locales/de.lua index ed70e862..73712d23 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,52 +1,76 @@ Locales['de'] = { - ['sex'] = 'Geschlecht', - ['face'] = 'Gesicht', - ['skin'] = 'Skin', - ['wrinkles'] = 'Falten', - ['wrinkle_thickness'] = 'Faltendicke', - ['beard_type'] = 'Bart Typ', - ['beard_size'] = 'Bartdichte', - ['beard_color_1'] = 'Bartfarbe 1', - ['beard_color_2'] = 'Bartfarbe 2', - ['hair_1'] = 'Haare 1', - ['hair_2'] = 'Haare 2', - ['hair_color_1'] = 'Haarfarbe 1', - ['hair_color_2'] = 'Haarfarbe 2', - ['eyebrow_type'] = 'Augenbrauen Typ', - ['eyebrow_size'] = 'Augenbrauen Größe', - ['eyebrow_color_1'] = 'Augenbrauenfarbe 1', - ['eyebrow_color_2'] = 'Augenbrauenfarbe 2', - ['makeup_type'] = 'Makeup Typ', - ['makeup_thickness'] = 'Makeup dicke', - ['makeup_color_1'] = 'Makeupfarbe 1', - ['makeup_color_2'] = 'Makeupfarbe 2', - ['lipstick_type'] = 'Lippenstift Typ', - ['lipstick_thickness'] = 'Lippenstift dicke', - ['lipstick_color_1'] = 'Lippenstiffarbe 1', - ['lipstick_color_2'] = 'Lippenstiftfarbe 2', - ['ear_accessories'] = 'Ohr Accessories', - ['ear_accessories_color'] = 'Ohr Accessories Farbe', - ['tshirt_1'] = 'T-Shirt 1', - ['tshirt_2'] = 'T-Shirt 2', - ['torso_1'] = 'Torso 1', - ['torso_2'] = 'Torso 2', - ['decals_1'] = 'Tattoos 1', - ['decals_2'] = 'Tattoos 2', - ['arms'] = 'Arme', - ['pants_1'] = 'Hosen 1', - ['pants_2'] = 'Hosen 2', - ['shoes_1'] = 'Schuhe 1', - ['shoes_2'] = 'Schuhe 2', - ['mask_1'] = 'Maske 1', - ['mask_2'] = 'Maske 2', - ['bproof_1'] = 'Schusssichere Weste 1', - ['bproof_2'] = 'Schusssichere Weste 2', - ['chain_1'] = 'Kette 1', - ['chain_2'] = 'Kette 2', - ['helmet_1'] = 'Helm 1', - ['helmet_2'] = 'Helm 2', - ['glasses_1'] = 'Brille 1', - ['glasses_2'] = 'Brille 2', - ['bag'] = 'Rucksack', - ['bag_color'] = 'Rucksackfarbe', + ['sex'] = 'geschlecht', + ['face'] = 'gesicht', + ['skin'] = 'skin', + ['wrinkles'] = 'falten', + ['wrinkle_thickness'] = 'faltendicke', + ['beard_type'] = 'bart Typ', + ['beard_size'] = 'bartdichte', + ['beard_color_1'] = 'bartfarbe 1', + ['beard_color_2'] = 'bartfarbe 2', + ['hair_1'] = 'haare 1', + ['hair_2'] = 'haare 2', + ['hair_color_1'] = 'haarfarbe 1', + ['hair_color_2'] = 'haarfarbe 2', + ['eye_color'] = 'eye color', + ['eyebrow_type'] = 'augenbrauen Typ', + ['eyebrow_size'] = 'augenbrauen Größe', + ['eyebrow_color_1'] = 'augenbrauenfarbe 1', + ['eyebrow_color_2'] = 'augenbrauenfarbe 2', + ['makeup_type'] = 'makeup Typ', + ['makeup_thickness'] = 'makeup dicke', + ['makeup_color_1'] = 'makeupfarbe 1', + ['makeup_color_2'] = 'makeupfarbe 2', + ['lipstick_type'] = 'lippenstift Typ', + ['lipstick_thickness'] = 'lippenstift dicke', + ['lipstick_color_1'] = 'lippenstiffarbe 1', + ['lipstick_color_2'] = 'lippenstiftfarbe 2', + ['ear_accessories'] = 'ohr Accessories', + ['ear_accessories_color'] = 'ohr Accessories Farbe', + ['tshirt_1'] = 't-Shirt 1', + ['tshirt_2'] = 't-Shirt 2', + ['torso_1'] = 'torso 1', + ['torso_2'] = 'torso 2', + ['decals_1'] = 'tattoos 1', + ['decals_2'] = 'tattoos 2', + ['arms'] = 'arme', + ['arms_2'] = 'arme 2', + ['pants_1'] = 'hosen 1', + ['pants_2'] = 'hosen 2', + ['shoes_1'] = 'schuhe 1', + ['shoes_2'] = 'schuhe 2', + ['mask_1'] = 'maske 1', + ['mask_2'] = 'maske 2', + ['bproof_1'] = 'schusssichere Weste 1', + ['bproof_2'] = 'schusssichere Weste 2', + ['chain_1'] = 'kette 1', + ['chain_2'] = 'kette 2', + ['helmet_1'] = 'helm 1', + ['helmet_2'] = 'helm 2', + ['watches_1'] = 'watches 1', + ['watches_2'] = 'watches 2', + ['bracelets_1'] = 'bracelets 1', + ['bracelets_2'] = 'bracelets 2', + ['glasses_1'] = 'brille 1', + ['glasses_2'] = 'brille 2', + ['bag'] = 'rucksack', + ['bag_color'] = 'rucksackfarbe', + ['blemishes'] = 'blemishes', + ['blemishes_size']= 'blemishes thickness', + ['ageing'] = 'ageing', + ['ageing_1'] = 'ageing thickness', + ['blush'] = 'blush', + ['blush_1'] = 'blush thickness', + ['blush_color'] = 'blush color', + ['complexion'] = 'complexion', + ['complexion_1'] = 'complexion thickness', + ['sun'] = 'sun', + ['sun_1'] = 'sun thickness', + ['freckles'] = 'freckles', + ['freckles_1'] = 'freckles thickness', + ['chest_hair'] = 'chest hair', + ['chest_hair_1'] = 'chest hair thickness', + ['chest_color'] = 'chest hair color', + ['bodyb'] = 'body blemishes', + ['bodyb_size'] = 'body blemishes thickness' } diff --git a/locales/en.lua b/locales/en.lua index 902d0990..d808137c 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -12,6 +12,7 @@ Locales['en'] = { ['hair_2'] = 'hair 2', ['hair_color_1'] = 'hair color 1', ['hair_color_2'] = 'hair color 2', + ['eye_color'] = 'eye color', ['eyebrow_type'] = 'eyebrow type', ['eyebrow_size'] = 'eyebrow size', ['eyebrow_color_1'] = 'eyebrow color 1', @@ -33,6 +34,7 @@ Locales['en'] = { ['decals_1'] = 'decals 1', ['decals_2'] = 'decals 2', ['arms'] = 'arms', + ['arms_2'] = 'arms 2', ['pants_1'] = 'pants 1', ['pants_2'] = 'pants 2', ['shoes_1'] = 'shoes 1', @@ -45,8 +47,30 @@ Locales['en'] = { ['chain_2'] = 'chain 2', ['helmet_1'] = 'helmet 1', ['helmet_2'] = 'helmet 2', + ['watches_1'] = 'watches 1', + ['watches_2'] = 'watches 2', + ['bracelets_1'] = 'bracelets 1', + ['bracelets_2'] = 'bracelets 2', ['glasses_1'] = 'glasses 1', ['glasses_2'] = 'glasses 2', ['bag'] = 'bag', ['bag_color'] = 'bag color', + ['blemishes'] = 'blemishes', + ['blemishes_size']= 'blemishes thickness', + ['ageing'] = 'ageing', + ['ageing_1'] = 'ageing thickness', + ['blush'] = 'blush', + ['blush_1'] = 'blush thickness', + ['blush_color'] = 'blush color', + ['complexion'] = 'complexion', + ['complexion_1'] = 'complexion thickness', + ['sun'] = 'sun', + ['sun_1'] = 'sun thickness', + ['freckles'] = 'freckles', + ['freckles_1'] = 'freckles thickness', + ['chest_hair'] = 'chest hair', + ['chest_hair_1'] = 'chest hair thickness', + ['chest_color'] = 'chest hair color', + ['bodyb'] = 'body blemishes', + ['bodyb_size'] = 'body blemishes thickness' } diff --git a/locales/fi.lua b/locales/fi.lua index 825c9590..d1a0d6e4 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -12,6 +12,7 @@ Locales['fi'] = { ['hair_2'] = 'hiukset 2', ['hair_color_1'] = 'hiuksien väri 1', ['hair_color_2'] = 'hiuksien väri 2', + ['eye_color'] = 'eye color', ['eyebrow_type'] = 'kulmakarva tyyli', ['eyebrow_size'] = 'kulmakarvojen tiheys', ['eyebrow_color_1'] = 'kulmakarvojen väri 1', @@ -33,6 +34,7 @@ Locales['fi'] = { ['decals_1'] = 'kerros 1', ['decals_2'] = 'kerros 2', ['arms'] = 'kädet', + ['arms_2'] = 'kädet 2', ['pants_1'] = 'housut 1', ['pants_2'] = 'housut 2', ['shoes_1'] = 'kengät 1', @@ -45,8 +47,30 @@ Locales['fi'] = { ['chain_2'] = 'korut 2', ['helmet_1'] = 'kypärät 1', ['helmet_2'] = 'kypärät 2', + ['watches_1'] = 'watches 1', + ['watches_2'] = 'watches 2', + ['bracelets_1'] = 'bracelets 1', + ['bracelets_2'] = 'bracelets 2', ['glasses_1'] = 'lasit 1', ['glasses_2'] = 'lasit 2', ['bag'] = 'reput', ['bag_color'] = 'repun väri', + ['blemishes'] = 'blemishes', + ['blemishes_size']= 'blemishes thickness', + ['ageing'] = 'ageing', + ['ageing_1'] = 'ageing thickness', + ['blush'] = 'blush', + ['blush_1'] = 'blush thickness', + ['blush_color'] = 'blush color', + ['complexion'] = 'complexion', + ['complexion_1'] = 'complexion thickness', + ['sun'] = 'sun', + ['sun_1'] = 'sun thickness', + ['freckles'] = 'freckles', + ['freckles_1'] = 'freckles thickness', + ['chest_hair'] = 'chest hair', + ['chest_hair_1'] = 'chest hair thickness', + ['chest_color'] = 'chest hair color', + ['bodyb'] = 'body blemishes', + ['bodyb_size'] = 'body blemishes thickness' } diff --git a/locales/fr.lua b/locales/fr.lua index bc931a4e..6ecc2f8b 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -12,6 +12,7 @@ Locales['fr'] = { ['hair_2'] = 'cheveux 2', ['hair_color_1'] = 'couleur cheveux 1', ['hair_color_2'] = 'couleur cheveux 2', + ['eye_color'] = 'lentilles colorées', ['eyebrow_type'] = 'type sourcils', ['eyebrow_size'] = 'taille sourcils', ['eyebrow_color_1'] = 'couleur sourcils 1', @@ -33,6 +34,7 @@ Locales['fr'] = { ['decals_1'] = 'calques 1', ['decals_2'] = 'calques 2', ['arms'] = 'bras', + ['arms_2'] = 'bras 2', ['pants_1'] = 'jambes 1', ['pants_2'] = 'jambes 2', ['shoes_1'] = 'chaussures 1', @@ -45,8 +47,30 @@ Locales['fr'] = { ['chain_2'] = 'chaine 2', ['helmet_1'] = 'casque 1', ['helmet_2'] = 'casque 2', + ['watches_1'] = 'montre 1', + ['watches_2'] = 'montre 2', + ['bracelets_1'] = 'bracelet 1', + ['bracelets_2'] = 'bracelet 2', ['glasses_1'] = 'lunettes 1', ['glasses_2'] = 'lunettes 2', ['bag'] = 'sac', ['bag_color'] = 'couleur sac', + ['blemishes'] = 'Boutons', + ['blemishes_size']= 'opacité des boutons', + ['ageing'] = 'vieillissement', + ['ageing_1'] = 'opacité du vieillissement', + ['blush'] = 'rougeur', + ['blush_1'] = 'opacité rougeur', + ['blush_color'] = 'couleur rougeur', + ['complexion'] = 'teint', + ['complexion_1'] = 'opacité teint', + ['sun'] = 'dommages UV', + ['sun_1'] = 'opacité dommages UV', + ['freckles'] = 'taches de rousseur', + ['freckles_1'] = 'opacité rousseur', + ['chest_hair'] = 'pillositée torse', + ['chest_hair_1'] = 'opacité pillositée', + ['chest_color'] = 'couleur pillositée', + ['bodyb'] = 'imperfections du corps', + ['bodyb_size'] = 'opacité imperfections' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..468b891e --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,76 @@ +Locales['pl'] = { + ['sex'] = 'płec', + ['face'] = 'twarz', + ['skin'] = 'skóra', + ['wrinkles'] = 'zmarszczki', + ['wrinkle_thickness'] = 'wielkość zmarszczek', + ['beard_type'] = 'styl brody', + ['beard_size'] = 'wielkość brody', + ['beard_color_1'] = 'kolor brody 1', + ['beard_color_2'] = 'kolor brody 2', + ['hair_1'] = 'włosy 1', + ['hair_2'] = 'włosy 2', + ['hair_color_1'] = 'wolor włosów 1', + ['hair_color_2'] = 'wolor włosów 2', + ['eye_color'] = 'eye color', + ['eyebrow_type'] = 'styl brwi', + ['eyebrow_size'] = 'wielkość brwi', + ['eyebrow_color_1'] = 'wolor brwi 1', + ['eyebrow_color_2'] = 'wolor brwi 2', + ['makeup_type'] = 'styl makijażu', + ['makeup_thickness'] = 'grubość makijażu', + ['makeup_color_1'] = 'kolor makijażu 1', + ['makeup_color_2'] = 'kolor makijażu 2', + ['lipstick_type'] = 'styl szminki', + ['lipstick_thickness'] = 'grubość szminki', + ['lipstick_color_1'] = 'kolor szminki 1', + ['lipstick_color_2'] = 'kolor szminki 2', + ['ear_accessories'] = 'akcesoria do usz', + ['ear_accessories_color'] = 'kolor akcesorii do usz', + ['tshirt_1'] = 'koszulka 1', + ['tshirt_2'] = 'koszulka 2', + ['torso_1'] = 'tułów 1', + ['torso_2'] = 'tułów 2', + ['decals_1'] = 'detale 1', + ['decals_2'] = 'detale 2', + ['arms'] = 'ramiona', + ['arms_2'] = 'ramiona 2', + ['pants_1'] = 'spodnie 1', + ['pants_2'] = 'spodnie 2', + ['shoes_1'] = 'buty 1', + ['shoes_2'] = 'buty 2', + ['mask_1'] = 'maska 1', + ['mask_2'] = 'maska 2', + ['bproof_1'] = 'kamizelka kuloodporna 1', + ['bproof_2'] = 'kamizelka kuloodporna 2', + ['chain_1'] = 'łańcuch 1', + ['chain_2'] = 'łańcuch 2', + ['helmet_1'] = 'hełm 1', + ['helmet_2'] = 'hełm 2', + ['watches_1'] = 'watches 1', + ['watches_2'] = 'watches 2', + ['bracelets_1'] = 'bracelets 1', + ['bracelets_2'] = 'bracelets 2', + ['glasses_1'] = 'okulary 1', + ['glasses_2'] = 'okulary 2', + ['bag'] = 'torba', + ['bag_color'] = 'kolor torby', + ['blemishes'] = 'blemishes', + ['blemishes_size']= 'blemishes thickness', + ['ageing'] = 'ageing', + ['ageing_1'] = 'ageing thickness', + ['blush'] = 'blush', + ['blush_1'] = 'blush thickness', + ['blush_color'] = 'blush color', + ['complexion'] = 'complexion', + ['complexion_1'] = 'complexion thickness', + ['sun'] = 'sun', + ['sun_1'] = 'sun thickness', + ['freckles'] = 'freckles', + ['freckles_1'] = 'freckles thickness', + ['chest_hair'] = 'chest hair', + ['chest_hair_1'] = 'chest hair thickness', + ['chest_color'] = 'chest hair color', + ['bodyb'] = 'body blemishes', + ['bodyb_size'] = 'body blemishes thickness' +} diff --git a/locales/sv.lua b/locales/sv.lua index 673f455f..ff65a74e 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -12,6 +12,7 @@ Locales['sv'] = { ['hair_2'] = 'hår 2', ['hair_color_1'] = 'hårfärg 1', ['hair_color_2'] = 'hårfärg 2', + ['eye_color'] = 'eye color', ['eyebrow_type'] = 'ögonbryn typ', ['eyebrow_size'] = 'ögonbryn storlek', ['eyebrow_color_1'] = 'ögonbryn färg 1', @@ -33,6 +34,7 @@ Locales['sv'] = { ['decals_1'] = 'dekaler 1', ['decals_2'] = 'dekaler 2', ['arms'] = 'armar', + ['arms_2'] = 'armar 2', ['pants_1'] = 'byxor 1', ['pants_2'] = 'byxor 2', ['shoes_1'] = 'skor 1', @@ -45,8 +47,30 @@ Locales['sv'] = { ['chain_2'] = 'kedja 2', ['helmet_1'] = 'hjälm 1', ['helmet_2'] = 'hjälm 2', + ['watches_1'] = 'watches 1', + ['watches_2'] = 'watches 2', + ['bracelets_1'] = 'bracelets 1', + ['bracelets_2'] = 'bracelets 2', ['glasses_1'] = 'glasögon 1', ['glasses_2'] = 'glasögon 2', ['bag'] = 'väska', ['bag_color'] = 'väska färg', + ['blemishes'] = 'blemishes', + ['blemishes_size']= 'blemishes thickness', + ['ageing'] = 'ageing', + ['ageing_1'] = 'ageing thickness', + ['blush'] = 'blush', + ['blush_1'] = 'blush thickness', + ['blush_color'] = 'blush color', + ['complexion'] = 'complexion', + ['complexion_1'] = 'complexion thickness', + ['sun'] = 'sun', + ['sun_1'] = 'sun thickness', + ['freckles'] = 'freckles', + ['freckles_1'] = 'freckles thickness', + ['chest_hair'] = 'chest hair', + ['chest_hair_1'] = 'chest hair thickness', + ['chest_color'] = 'chest hair color', + ['bodyb'] = 'body blemishes', + ['bodyb_size'] = 'body blemishes thickness' }