Skip to content

Commit

Permalink
Merge pull request #62 from Swellington-Soares/main
Browse files Browse the repository at this point in the history 
Update Language and removed the GetHashKey
  • Loading branch information
@GhzGarage
GhzGarage authored Sep 25, 2023
2 parents c860448 + 6bc5fa2 commit 1c96836
Show file tree
Hide file tree
Showing 16 changed files with 172 additions and 159 deletions.
6 changes: 3 additions & 3 deletions client/main.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ local function whitelistedVehicle()
local retval = false

for i = 1, #Config.AllowedVehicles, 1 do
if veh == GetHashKey(Config.AllowedVehicles[i].model) then
if veh == Config.AllowedVehicles[i].model then
retval = true
end
end

if veh == GetHashKey("dynasty") then
if veh == `dynasty` then
retval = true
end

Expand Down Expand Up @@ -219,7 +219,7 @@ RegisterNetEvent('qb-busjob:client:DoBusNpc', function()
if not NpcData.Active then
local Gender = math.random(1, #Config.NpcSkins)
local PedSkin = math.random(1, #Config.NpcSkins[Gender])
local model = GetHashKey(Config.NpcSkins[Gender][PedSkin])
local model = Config.NpcSkins[Gender][PedSkin]
RequestModel(model)
while not HasModelLoaded(model) do
Wait(0)
Expand Down
282 changes: 141 additions & 141 deletions config.lua
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Config = Config or {}

Config.AllowedVehicles = {
[1] = {model = "bus", label = Lang:t('info.bus')},
[1] = {model = `bus`, label = Lang:t('info.bus')},
}

Config.Location = vector4(462.22, -641.15, 28.45, 175.0)
Expand All @@ -18,147 +18,147 @@ Config.NPCLocations = {

Config.NpcSkins = {
[1] = {
'a_f_m_skidrow_01',
'a_f_m_soucentmc_01',
'a_f_m_soucent_01',
'a_f_m_soucent_02',
'a_f_m_tourist_01',
'a_f_m_trampbeac_01',
'a_f_m_tramp_01',
'a_f_o_genstreet_01',
'a_f_o_indian_01',
'a_f_o_ktown_01',
'a_f_o_salton_01',
'a_f_o_soucent_01',
'a_f_o_soucent_02',
'a_f_y_beach_01',
'a_f_y_bevhills_01',
'a_f_y_bevhills_02',
'a_f_y_bevhills_03',
'a_f_y_bevhills_04',
'a_f_y_business_01',
'a_f_y_business_02',
'a_f_y_business_03',
'a_f_y_business_04',
'a_f_y_eastsa_01',
'a_f_y_eastsa_02',
'a_f_y_eastsa_03',
'a_f_y_epsilon_01',
'a_f_y_fitness_01',
'a_f_y_fitness_02',
'a_f_y_genhot_01',
'a_f_y_golfer_01',
'a_f_y_hiker_01',
'a_f_y_hipster_01',
'a_f_y_hipster_02',
'a_f_y_hipster_03',
'a_f_y_hipster_04',
'a_f_y_indian_01',
'a_f_y_juggalo_01',
'a_f_y_runner_01',
'a_f_y_rurmeth_01',
'a_f_y_scdressy_01',
'a_f_y_skater_01',
'a_f_y_soucent_01',
'a_f_y_soucent_02',
'a_f_y_soucent_03',
'a_f_y_tennis_01',
'a_f_y_tourist_01',
'a_f_y_tourist_02',
'a_f_y_vinewood_01',
'a_f_y_vinewood_02',
'a_f_y_vinewood_03',
'a_f_y_vinewood_04',
'a_f_y_yoga_01',
'g_f_y_ballas_01',
`a_f_m_skidrow_01`,
`a_f_m_soucentmc_01`,
`a_f_m_soucent_01`,
`a_f_m_soucent_02`,
`a_f_m_tourist_01`,
`a_f_m_trampbeac_01`,
`a_f_m_tramp_01`,
`a_f_o_genstreet_01`,
`a_f_o_indian_01`,
`a_f_o_ktown_01`,
`a_f_o_salton_01`,
`a_f_o_soucent_01`,
`a_f_o_soucent_02`,
`a_f_y_beach_01`,
`a_f_y_bevhills_01`,
`a_f_y_bevhills_02`,
`a_f_y_bevhills_03`,
`a_f_y_bevhills_04`,
`a_f_y_business_01`,
`a_f_y_business_02`,
`a_f_y_business_03`,
`a_f_y_business_04`,
`a_f_y_eastsa_01`,
`a_f_y_eastsa_02`,
`a_f_y_eastsa_03`,
`a_f_y_epsilon_01`,
`a_f_y_fitness_01`,
`a_f_y_fitness_02`,
`a_f_y_genhot_01`,
`a_f_y_golfer_01`,
`a_f_y_hiker_01`,
`a_f_y_hipster_01`,
`a_f_y_hipster_02`,
`a_f_y_hipster_03`,
`a_f_y_hipster_04`,
`a_f_y_indian_01`,
`a_f_y_juggalo_01`,
`a_f_y_runner_01`,
`a_f_y_rurmeth_01`,
`a_f_y_scdressy_01`,
`a_f_y_skater_01`,
`a_f_y_soucent_01`,
`a_f_y_soucent_02`,
`a_f_y_soucent_03`,
`a_f_y_tennis_01`,
`a_f_y_tourist_01`,
`a_f_y_tourist_02`,
`a_f_y_vinewood_01`,
`a_f_y_vinewood_02`,
`a_f_y_vinewood_03`,
`a_f_y_vinewood_04`,
`a_f_y_yoga_01`,
`g_f_y_ballas_01`,
},
[2] = {
'ig_barry',
'ig_bestmen',
'ig_beverly',
'ig_car3guy1',
'ig_car3guy2',
'ig_casey',
'ig_chef',
'ig_chengsr',
'ig_chrisformage',
'ig_clay',
'ig_claypain',
'ig_cletus',
'ig_dale',
'ig_dreyfuss',
'ig_fbisuit_01',
'ig_floyd',
'ig_groom',
'ig_hao',
'ig_hunter',
'csb_prolsec',
'ig_joeminuteman',
'ig_josef',
'ig_josh',
'ig_lamardavis',
'ig_lazlow',
'ig_lestercrest',
'ig_lifeinvad_01',
'ig_lifeinvad_02',
'ig_manuel',
'ig_milton',
'ig_mrk',
'ig_nervousron',
'ig_nigel',
'ig_old_man1a',
'ig_old_man2',
'ig_oneil',
'ig_orleans',
'ig_ortega',
'ig_paper',
'ig_priest',
'ig_prolsec_02',
'ig_ramp_gang',
'ig_ramp_hic',
'ig_ramp_hipster',
'ig_ramp_mex',
'ig_roccopelosi',
'ig_russiandrunk',
'ig_siemonyetarian',
'ig_solomon',
'ig_stevehains',
'ig_stretch',
'ig_talina',
'ig_taocheng',
'ig_taostranslator',
'ig_tenniscoach',
'ig_terry',
'ig_tomepsilon',
'ig_tylerdix',
'ig_wade',
'ig_zimbor',
's_m_m_paramedic_01',
'a_m_m_afriamer_01',
'a_m_m_beach_01',
'a_m_m_beach_02',
'a_m_m_bevhills_01',
'a_m_m_bevhills_02',
'a_m_m_business_01',
'a_m_m_eastsa_01',
'a_m_m_eastsa_02',
'a_m_m_farmer_01',
'a_m_m_fatlatin_01',
'a_m_m_genfat_01',
'a_m_m_genfat_02',
'a_m_m_golfer_01',
'a_m_m_hasjew_01',
'a_m_m_hillbilly_01',
'a_m_m_hillbilly_02',
'a_m_m_indian_01',
'a_m_m_ktown_01',
'a_m_m_malibu_01',
'a_m_m_mexcntry_01',
'a_m_m_mexlabor_01',
'a_m_m_og_boss_01',
'a_m_m_paparazzi_01',
'a_m_m_polynesian_01',
'a_m_m_prolhost_01',
'a_m_m_rurmeth_01',
`ig_barry`,
`ig_bestmen`,
`ig_beverly`,
`ig_car3guy1`,
`ig_car3guy2`,
`ig_casey`,
`ig_chef`,
`ig_chengsr`,
`ig_chrisformage`,
`ig_clay`,
`ig_claypain`,
`ig_cletus`,
`ig_dale`,
`ig_dreyfuss`,
`ig_fbisuit_01`,
`ig_floyd`,
`ig_groom`,
`ig_hao`,
`ig_hunter`,
`csb_prolsec`,
`ig_joeminuteman`,
`ig_josef`,
`ig_josh`,
`ig_lamardavis`,
`ig_lazlow`,
`ig_lestercrest`,
`ig_lifeinvad_01`,
`ig_lifeinvad_02`,
`ig_manuel`,
`ig_milton`,
`ig_mrk`,
`ig_nervousron`,
`ig_nigel`,
`ig_old_man1a`,
`ig_old_man2`,
`ig_oneil`,
`ig_orleans`,
`ig_ortega`,
`ig_paper`,
`ig_priest`,
`ig_prolsec_02`,
`ig_ramp_gang`,
`ig_ramp_hic`,
`ig_ramp_hipster`,
`ig_ramp_mex`,
`ig_roccopelosi`,
`ig_russiandrunk`,
`ig_siemonyetarian`,
`ig_solomon`,
`ig_stevehains`,
`ig_stretch`,
`ig_talina`,
`ig_taocheng`,
`ig_taostranslator`,
`ig_tenniscoach`,
`ig_terry`,
`ig_tomepsilon`,
`ig_tylerdix`,
`ig_wade`,
`ig_zimbor`,
`s_m_m_paramedic_01`,
`a_m_m_afriamer_01`,
`a_m_m_beach_01`,
`a_m_m_beach_02`,
`a_m_m_bevhills_01`,
`a_m_m_bevhills_02`,
`a_m_m_business_01`,
`a_m_m_eastsa_01`,
`a_m_m_eastsa_02`,
`a_m_m_farmer_01`,
`a_m_m_fatlatin_01`,
`a_m_m_genfat_01`,
`a_m_m_genfat_02`,
`a_m_m_golfer_01`,
`a_m_m_hasjew_01`,
`a_m_m_hillbilly_01`,
`a_m_m_hillbilly_02`,
`a_m_m_indian_01`,
`a_m_m_ktown_01`,
`a_m_m_malibu_01`,
`a_m_m_mexcntry_01`,
`a_m_m_mexlabor_01`,
`a_m_m_og_boss_01`,
`a_m_m_paparazzi_01`,
`a_m_m_polynesian_01`,
`a_m_m_prolhost_01`,
`a_m_m_rurmeth_01`,
}
}
3 changes: 2 additions & 1 deletion locales/ar.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ local Translations = {
already_driving_bus = 'أنت تقود حافلة بالفعل',
not_in_bus = 'أنت لست في حافلة',
one_bus_active = 'يمكنك امتلاك حافلة نشطة واحدة فقط في كل مرة',
drop_off_passengers = 'أنزل الركاب قبل أن تتوقف عن العمل'
drop_off_passengers = 'أنزل الركاب قبل أن تتوقف عن العمل',
exploit = "Attempting To Exploit"
},
success = {
dropped_off = 'تم إنزال الشخص',
Expand Down
3 changes: 2 additions & 1 deletion locales/cs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ local Translations = {
already_driving_bus = 'Již řídíš autobus',
not_in_bus = 'Nejsi v autobuse',
one_bus_active = 'V jednu chvíli můžete mít pouze jeden aktivní autobus',
drop_off_passengers = 'Než přestanete pracovat, vysaďte všechny cestující'
drop_off_passengers = 'Než přestanete pracovat, vysaďte všechny cestující',
exploit = "Attempting To Exploit"
},
success = {
dropped_off = 'Osoba byla vysazena',
Expand Down
3 changes: 2 additions & 1 deletion locales/da.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ local Translations = {
already_driving_bus = 'Du kører allerede en bus',
not_in_bus = 'Du er ikke i en bus',
one_bus_active = 'Du kan kun have én aktiv bus ad gangen',
drop_off_passengers = 'Smid passagererne af, før du holder op med at arbejde'
drop_off_passengers = 'Smid passagererne af, før du holder op med at arbejde',
exploit = "Attempting To Exploit"
},
success = {
dropped_off = 'Person blev sat af',
Expand Down
3 changes: 2 additions & 1 deletion locales/de.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ local Translations = {
already_driving_bus = 'Du fährst bereits einen Bus',
not_in_bus = 'Du bist in keinem Bus',
one_bus_active = 'Du kannst nur ein Bus nutzen',
drop_off_passengers = 'Setz die Passagiere ab, bevor du mit der Arbeit aufhörst'
drop_off_passengers = 'Setz die Passagiere ab, bevor du mit der Arbeit aufhörst',
exploit = "Attempting To Exploit"
},
success = {
dropped_off = 'Peson(en) wurde(n) abgesetzt',
Expand Down
3 changes: 2 additions & 1 deletion locales/en.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ local Translations = {
already_driving_bus = 'You are already driving a bus',
not_in_bus = 'You are not in a bus',
one_bus_active = 'You can only have one active bus at a time',
drop_off_passengers = 'Drop off the passengers before you stop working'
drop_off_passengers = 'Drop off the passengers before you stop working',
exploit = "Attempting To Exploit"
},
success = {
dropped_off = 'Person was dropped off',
Expand Down
3 changes: 2 additions & 1 deletion locales/es.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ local Translations = {
already_driving_bus = 'Ya estás manejando un autobús',
not_in_bus = 'No estás en un autobús',
one_bus_active = 'Solo puedes tener un autobús activo a la vez',
drop_off_passengers = 'Lleva a tus pasajeros antes de salir del trabajo'
drop_off_passengers = 'Lleva a tus pasajeros antes de salir del trabajo',
exploit = "Attempting To Exploit"
},
success = {
dropped_off = 'Una persona se bajó'
Expand Down
3 changes: 2 additions & 1 deletion locales/fi.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ local Translations = {
already_driving_bus = 'Ajat jo bussia!',
not_in_bus = 'Et ole bussissa!',
one_bus_active = 'Sinulla voi olla vain yksi aktiivinen bussi kerrallaan',
drop_off_passengers = 'Jätä matkustajat pysäkille ennen kun lopetat työskentelyn'
drop_off_passengers = 'Jätä matkustajat pysäkille ennen kun lopetat työskentelyn',
exploit = "Attempting To Exploit"
},
success = {
dropped_off = 'Matkustaja jätetty pysäkille!',
Expand Down
Loading

0 comments on commit 1c96836

Please sign in to comment.