Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: reconstruction of esx_mechanicjob for adaptation to the framework #755

Merged
merged 9 commits into from
Jul 25, 2024
Merged

refactor: reconstruction of esx_mechanicjob for adaptation to the framework #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
251af1f
refactor: reconstruction of esx_mechanicjob for adaptation to the fra…
bitpredator Jul 24, 2024
bd67500
fix: variable isDead is never accessed + correction of translations
bitpredator Jul 24, 2024
bbb7eff
fix: shadowing upvalue argument menu on line 71
bitpredator Jul 24, 2024
ea68122
chore: removed esx_phone support
bitpredator Jul 24, 2024
8279246
chore: removed the part of code relating to objs
bitpredator Jul 25, 2024
8b76994
chore: remove blowpipe + carokit
bitpredator Jul 25, 2024
e703020
fix: variable source was previously defined as an argument on line 24
bitpredator Jul 25, 2024
ed156a3
fix: fixed an issue that prevented repair kits from being used
bitpredator Jul 25, 2024
5c953fe
chore: removed irrelevant translation strings
bitpredator Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
239 changes: 25 additions & 214 deletions server-data/resources/[esx_addons]/esx_mechanicjob/client/main.lua
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions server-data/resources/[esx_addons]/esx_mechanicjob/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ Config.Zones = {
Type = 21,
},

Craft = {
Pos = vector3(-323.140, -129.882, 38.999),
Size = { x = 1.0, y = 1.0, z = 1.0 },
Color = { r = 50, g = 200, b = 50 },
Type = 21,
},

VehicleSpawnPoint = {
Pos = vector3(-366.354, -110.766, 37.696),
Size = { x = 1.5, y = 1.5, z = 1.0 },
Expand Down
5 changes: 1 addition & 4 deletions server-data/resources/[esx_addons]/esx_mechanicjob/esx_mechanicjob.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_
;

INSERT INTO `items` (name, label, weight) VALUES
('gazbottle', 'bouteille de gaz', 2),
('fixtool', 'outils réparation', 2),
('carotool', 'outils carosserie', 2),
('blowpipe', 'Chalumeaux', 2),
('fixkit', 'Kit réparation', 3),
('carokit', 'Kit carosserie', 3)
('fixkit', 'Kit réparation', 3)
;
24 changes: 1 addition & 23 deletions server-data/resources/[esx_addons]/esx_mechanicjob/locales/en.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,13 @@ Locales["en"] = {
["boss_actions"] = "boss Actions",
["service_vehicle"] = "service Vehicle",
["flat_bed"] = "flatbed",
["tow"] = "tow",
["tow_truck"] = "tow Truck",
["service_full"] = "service full: ",
["open_actions"] = "Press [E] to access the menu.",
["harvest"] = "harvest",
["harvest_menu"] = "press [E] to access the harvest menu.",
["not_experienced_enough"] = "you are not experienced enough to perform this action.",
["gas_can"] = "gas Can",
["repair_tools"] = "repair Tools",
["body_work_tools"] = "bodywork Tools",
["blowtorch"] = "blowtorch",
["repair_kit"] = "repair Kit",
["body_kit"] = "body Kit",
["craft"] = "craft",
["craft_menu"] = "press [E] to access the crafting menu.",
["billing"] = "billing",
["hijack"] = "hijack",
["repair"] = "repair",
Expand Down Expand Up @@ -58,28 +51,13 @@ Locales["en"] = {
["inventory"] = "inventory",
["veh_unlocked"] = "Vehicle Unlocked",
["hijack_failed"] = "Hijack Failed",
["body_repaired"] = "Body repaired",
["veh_repaired"] = "Vehicle Repaired",
["veh_stored"] = "press [E] to store the vehicle.",
["press_remove_obj"] = "press [E] to remove the object",
["please_tow"] = "please tow the vehicle",
["wait_five"] = "you must wait 5 minutes",
["must_in_flatbed"] = "you must be in a flatbed to being the mission",
["mechanic_customer"] = "mechanic Customer",
["you_do_not_room"] = "You do not have more room",
["recovery_gas_can"] = "Gas Can Retrieval...",
["recovery_repair_tools"] = "Repair Tools Retrieval...",
["recovery_body_tools"] = "Body Tools Retrieval...",
["not_enough_gas_can"] = "You do not have enough gas cans.",
["assembling_blowtorch"] = "Assembling Blowtorch...",
["not_enough_repair_tools"] = "You do not have enough repair tools.",
["assembling_repair_kit"] = "Assembling Repair Kit...",
["not_enough_body_tools"] = "You do not have enough body tools.",
["assembling_body_kit"] = "Assembling Body Kit...",
["your_comp_earned"] = "your company has earned $",
["you_used_blowtorch"] = "you used a blowtorch",
["you_used_repair_kit"] = "you used a Repair Kit",
["you_used_body_kit"] = "you used a Body Kit",
["have_withdrawn"] = "you have withdrawn x%s %s",
["have_deposited"] = "you have deposited x%s %s",
["player_cannot_hold"] = "you do not have enough free space in your inventory!",
Expand Down
32 changes: 5 additions & 27 deletions server-data/resources/[esx_addons]/esx_mechanicjob/locales/it.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,16 @@ Locales["it"] = {
["withdraw_stock"] = "ritira",
["boss_actions"] = "azioni boss",
["service_vehicle"] = "veicoli di servizio",
["flat_bed"] = "flatbed",
["flat_bed"] = "pianale",
["tow"] = "carica/scarica",
["tow_truck"] = "carro attrezzi",
["service_full"] = "servizio completo: ",
["open_actions"] = "premi [E] per accedere al menu.",
["harvest"] = "raccolto",
["harvest_menu"] = "premi [E] per accedere al menu raccolto.",
["not_experienced_enough"] = "non hai abbastanza esperienza per eseguire questa azione.",
["gas_can"] = "bombola del gas",
["repair_tools"] = "riparazione strumenti",
["body_work_tools"] = "strumenti carrozzeria",
["blowtorch"] = "fiamma ossidrica",
["repair_kit"] = "kit di riparazione",
["body_kit"] = "body Kit",
["craft"] = "creazione",
["craft_menu"] = "premi [E] per accedere al menu di creazione.",
["billing"] = "fattura",
["hijack"] = "trasportare",
["hijack"] = "scassinare",
["repair"] = "riparazione",
["clean"] = "pulito",
["imp_veh"] = "sequestrato",
Expand Down Expand Up @@ -58,29 +51,14 @@ Locales["it"] = {
["inventory"] = "inventario",
["veh_unlocked"] = "veicolo sbloccato",
["hijack_failed"] = "traino fallito",
["body_repaired"] = "carrozzeria riparata",
["veh_repaired"] = "veicolo riparato",
["veh_stored"] = "press [E] per depositare il veicolo.",
["press_remove_obj"] = "premi [E] per rimuovere",
["please_tow"] = "perfavore traina il veicolo",
["wait_five"] = "devi attendere 5 minuti",
["must_in_flatbed"] = "devi essere in un flatbed per avviare la missione",
["mechanic_customer"] = "cliente meccanico",
["you_do_not_room"] = "non hai più spazio",
["recovery_gas_can"] = "recupero bomboletta di gas...",
["recovery_repair_tools"] = "recupero degli strumenti di riparazione...",
["recovery_body_tools"] = "recupero body tools...",
["not_enough_gas_can"] = "non hai abbastanza bomboletta di gas.",
["assembling_blowtorch"] = "montaggio fiamma ossidrica...",
["not_enough_repair_tools"] = "non hai abbastanza strumenti di riparazione.",
["assembling_repair_kit"] = "assemblaggio kit di riparazione...",
["not_enough_body_tools"] = "non hai abbastanza body tools.",
["assembling_body_kit"] = "Assemblaggio Body Kit...",
["must_in_flatbed"] = "devi essere nel pianale per avviare la missione",
["your_comp_earned"] = "la tua azienda ha guadagnato $",
["you_used_blowtorch"] = "hai usato una fiamma ossidrica",
["you_used_repair_kit"] = "hai usato un Kit di riparazione",
["you_used_body_kit"] = "hai usato un Body Kit",
["have_withdrawn"] = "hai prelevato x%s %s",
["have_deposited"] = "hai depositato x%s %s",
["player_cannot_hold"] = "non hai abbastanza spazio libero nel tuo inventario!",
["player_cannot_hold"] = "non hai abbastanza spazio nel tuo inventario!",
}
5 changes: 1 addition & 4 deletions server-data/resources/[esx_addons]/esx_mechanicjob/localization/en_esx_mecanojob.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_
;

INSERT INTO `items` (name, label, weight) VALUES
('gazbottle', 'Gas Bottle', 2),
('fixtool', 'Repair Tools', 2),
('carotool', 'Tools', 2),
('blowpipe', 'Blowtorch', 2),
('fixkit', 'Repair Kit', 3),
('carokit', 'Body Kit', 3)
('fixkit', 'Repair Kit', 3)
;
5 changes: 1 addition & 4 deletions server-data/resources/[esx_addons]/esx_mechanicjob/localization/it_esx_mecanojob.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_
;

INSERT INTO `items` (name, label, weight) VALUES
('gazbottle', 'Bottiglia di gas', 2),
('fixtool', 'Strumenti di riparazione', 2),
('carotool', 'Strumenti', 2),
('blowpipe', 'Fiamma ossidrica', 2),
('fixkit', 'Kit di riparazione', 3),
('carokit', 'Kit per carrozzeria', 3)
('fixkit', 'Kit di riparazione', 3)
;

Loading
Loading