From 2be32ee6c25f7c07723cd68f22ba6f0cda1a6eb8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 19 Apr 2018 20:24:55 +0200 Subject: [PATCH] Fixes #12, removed whitelist from sql, draw distance --- config.lua | 2 +- esx_jobs.sql | 2 -- localization/br_config.lua | 2 +- localization/br_esx_jobs.sql | 4 +--- localization/de_config.lua | 2 +- localization/de_esx_jobs.sql | 8 +++----- localization/en_config.lua | 2 +- localization/en_esx_jobs.sql | 2 -- localization/sv_config.lua | 2 +- localization/sv_esx_jobs.sql | 4 +--- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/config.lua b/config.lua index dedeabca..c77115f2 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,5 @@ Config = {} -Config.DrawDistance = 1000.0 +Config.DrawDistance = 100.0 Config.Locale = 'fr' Config.Plates = { diff --git a/esx_jobs.sql b/esx_jobs.sql index 93fa7951..7ba4286c 100644 --- a/esx_jobs.sql +++ b/esx_jobs.sql @@ -14,8 +14,6 @@ INSERT INTO `jobs` (name, label) VALUES ('textil', 'Couturier') ; -ALTER TABLE jobs ADD whitelisted BOOLEAN NOT NULL DEFAULT FALSE; - INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES ('lumberjack', 0, 'interim', 'Intérimaire', 0, '{}', '{}'), ('fisherman', 0, 'interim', 'Intérimaire', 0, '{}', '{}'), diff --git a/localization/br_config.lua b/localization/br_config.lua index ba5432d5..36bcd36f 100644 --- a/localization/br_config.lua +++ b/localization/br_config.lua @@ -1,5 +1,5 @@ Config = {} -Config.DrawDistance = 1000.0 +Config.DrawDistance = 100.0 Config.Locale = 'br' Config.Plates = { diff --git a/localization/br_esx_jobs.sql b/localization/br_esx_jobs.sql index 111cd73e..d7648bc0 100644 --- a/localization/br_esx_jobs.sql +++ b/localization/br_esx_jobs.sql @@ -14,14 +14,12 @@ INSERT INTO `jobs` (name, label) VALUES ('textil', 'Costureiro') ; -ALTER TABLE jobs ADD whitelisted BOOLEAN NOT NULL DEFAULT FALSE; - INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES ('lumberjack', 0, 'interim', 'Temporario', 0, '{}', '{}'), ('fisherman', 0, 'interim', 'Temporario', 0, '{}', '{}'), ('fueler', 0, 'interim', 'Temporario', 0, '{}', '{}'), ('reporter', 0, 'employee', 'Temporario', 0, '{}', '{}'), - ('textil',0,'interim','Temporario',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), + ('textil', 0,'interim','Temporario',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), ('miner', 0, 'interim', 'Temporario', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'), ('slaughterer',0,'interim','Temporario',0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; diff --git a/localization/de_config.lua b/localization/de_config.lua index 18bae48b..6bb1f89d 100644 --- a/localization/de_config.lua +++ b/localization/de_config.lua @@ -1,5 +1,5 @@ Config = {} -Config.DrawDistance = 1000.0 +Config.DrawDistance = 100.0 Config.Locale = 'de' Config.Plates = { diff --git a/localization/de_esx_jobs.sql b/localization/de_esx_jobs.sql index 358660bc..7ed311a1 100644 --- a/localization/de_esx_jobs.sql +++ b/localization/de_esx_jobs.sql @@ -14,16 +14,14 @@ INSERT INTO `jobs` (name, label) VALUES ('textil', 'Schneiderei') ; -ALTER TABLE jobs ADD whitelisted BOOLEAN NOT NULL DEFAULT FALSE; - INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES ('lumberjack', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'), ('fisherman', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'), ('fueler', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'), ('reporter', 0, 'employee', 'Mitarbeiter', 0, '{}', '{}'), - ('textil', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'), - ('miner', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}'), - ('slaughterer', 0, 'interim', 'Mitarbeiter', 0, '{}', '{}') + ('textil', 0, 'interim', 'Mitarbeiter', 0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), + ('miner', 0, 'interim', 'Mitarbeiter', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'), + ('slaughterer', 0, 'interim', 'Mitarbeiter', 0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; INSERT INTO `items` (`name`, `label`) VALUES diff --git a/localization/en_config.lua b/localization/en_config.lua index d75e9e69..4c1443f5 100644 --- a/localization/en_config.lua +++ b/localization/en_config.lua @@ -1,5 +1,5 @@ Config = {} -Config.DrawDistance = 1000.0 +Config.DrawDistance = 100.0 Config.Locale = 'en' Config.Plates = { diff --git a/localization/en_esx_jobs.sql b/localization/en_esx_jobs.sql index 8b64f3a5..13a17760 100644 --- a/localization/en_esx_jobs.sql +++ b/localization/en_esx_jobs.sql @@ -14,8 +14,6 @@ INSERT INTO `jobs` (name, label) VALUES ('tailor', 'Tailor') ; -ALTER TABLE jobs ADD whitelisted BOOLEAN NOT NULL DEFAULT FALSE; - INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES ('lumberjack', 0, 'interim', 'Employee', 0, '{}', '{}'), ('fisherman', 0, 'interim', 'Employee', 0, '{}', '{}'), diff --git a/localization/sv_config.lua b/localization/sv_config.lua index 55178e7b..498ab95c 100644 --- a/localization/sv_config.lua +++ b/localization/sv_config.lua @@ -1,5 +1,5 @@ Config = {} -Config.DrawDistance = 1000.0 +Config.DrawDistance = 100.0 Config.Locale = 'sv' Config.Plates = { diff --git a/localization/sv_esx_jobs.sql b/localization/sv_esx_jobs.sql index def9e722..b12892f3 100644 --- a/localization/sv_esx_jobs.sql +++ b/localization/sv_esx_jobs.sql @@ -9,13 +9,11 @@ INSERT INTO `jobs` (name, label) VALUES ('fisherman', 'Fiskare'), ('miner', 'Gruvarbetare'), ('lumberjack', 'Skogshuggare'), - ('fuel', 'Bensintankare'), + ('fueler', 'Bensintankare'), ('reporter', 'Reporter'), ('tailor', 'Skräddare') ; -ALTER TABLE jobs ADD whitelisted BOOLEAN NOT NULL DEFAULT FALSE; - INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES ('lumberjack', 0, 'interim', 'Anställd', 0, '{}', '{}'), ('fisherman', 0, 'interim', 'Anställd', 0, '{}', '{}'),