chore(coding-style): correct indentation

This commit is contained in:
Romain Lanz
2017-09-14 17:55:37 +02:00
parent 446f7e5ce1
commit e66b7acb17
9 changed files with 460 additions and 459 deletions
+9
View File
@@ -0,0 +1,9 @@
root = true
[*]
indent_size = 2
indent_style = space
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
+16 -16
View File
@@ -3,22 +3,22 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
description 'ESX RealestateAgentJob'
server_scripts {
'@es_extended/locale.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fr.lua',
'@mysql-async/lib/MySQL.lua',
'config.lua',
'server/main.lua'
'@es_extended/locale.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fr.lua',
'@mysql-async/lib/MySQL.lua',
'config.lua',
'server/main.lua'
}
client_scripts {
'@es_extended/locale.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fr.lua',
'config.lua',
'client/main.lua'
}
'@es_extended/locale.lua',
'locales/de.lua',
'locales/br.lua',
'locales/en.lua',
'locales/fr.lua',
'config.lua',
'client/main.lua'
}
+289 -288
View File
File diff suppressed because one or more lines are too long
+27 -28
View File
@@ -1,37 +1,36 @@
Config = {}
Config.DrawDistance = 100.0
Config.MarkerColor = {r = 120, g = 120, b = 240}
Config.Locale = 'fr'
Config.MarkerColor = { r = 120, g = 120, b = 240 }
Config.Locale = 'fr'
Config.Zones = {
OfficeEnter = {
Pos = { x = -199.151, y = -575.000, z = 39.489 },
Size = { x = 1.5, y = 1.5, z = 1.0 },
Type = 1,
},
OfficeEnter = {
Pos = {x = -199.151, y = -575.000, z = 39.489},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = 1
},
OfficeExit = {
Pos = { x = -141.226, y = -614.166, z = 167.820 },
Size = { x = 1.5, y = 1.5, z = 1.0 },
Type = 1,
},
OfficeExit = {
Pos = {x = -141.226, y = -614.166, z = 167.820},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = 1
},
OfficeInside = {
Pos = { x = -140.969, y = -616.785, z = 167.820 },
Size = { x = 1.5, y = 1.5, z = 1.0 },
Type = -1,
},
OfficeInside = {
Pos = {x = -140.969, y = -616.785, z = 167.820},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = -1
},
OfficeOutside = {
Pos = { x = -202.238, y = -578.193, z = 39.500 },
Size = { x = 1.5, y = 1.5, z = 1.0 },
Type = -1,
},
OfficeOutside = {
Pos = {x = -202.238, y = -578.193, z = 39.500},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = -1
},
OfficeActions = {
Pos = {x = -124.786, y = -641.486, z = 167.820},
Size = {x = 1.5, y = 1.5, z = 1.0},
Type = -1
},
OfficeActions = {
Pos = { x = -124.786, y = -641.486, z = 167.820 },
Size = { x = 1.5, y = 1.5, z = 1.0 },
Type = -1,
},
}
+20 -22
View File
@@ -1,23 +1,21 @@
Locales['br'] = {
['properties'] = 'Propriedades',
['property'] = 'Propriedade',
['clients'] = 'Clientes',
['remove_comp_money'] = 'Remover dinheiro da empresa',
['dep_money'] = 'Depositar dinheiro',
['wash_money'] = 'Lavagem de dinheiro',
['realtor'] = 'Corretor de imóveis',
['amount_withdraw'] = 'Quantidade de retirada',
['invalid_amount'] = 'Quantidade inválida',
['amount_deposit'] = 'Valor do depósito',
['amount_wash'] = 'Quantidade para lavagem',
['press_to_access'] = 'Pressione ~INPUT_CONTEXT~ para abrir o menu',
['property_actions'] = '{{Assign [Sell]|sell}} {{Assign [Rent]|rent}} {{GPS|gps}}',
['amount'] = 'Quantidade',
['no_play_near'] = 'Nenhum jogador nas proximidades',
['contract'] = '{{Revoke contract|revoke}} {{GPS|gps}}',
['rent'] = 'Alugar',
['sell'] = 'Vender',
['realtors'] = 'Agente Imobiliário',
}
['properties'] = 'Propriedades',
['property'] = 'Propriedade',
['clients'] = 'Clientes',
['remove_comp_money'] = 'Remover dinheiro da empresa',
['dep_money'] = 'Depositar dinheiro',
['wash_money'] = 'Lavagem de dinheiro',
['realtor'] = 'Corretor de imóveis',
['amount_withdraw'] = 'Quantidade de retirada',
['invalid_amount'] = 'Quantidade inválida',
['amount_deposit'] = 'Valor do depósito',
['amount_wash'] = 'Quantidade para lavagem',
['press_to_access'] = 'Pressione ~INPUT_CONTEXT~ para abrir o menu',
['property_actions'] = '{{Assign [Sell]|sell}} {{Assign [Rent]|rent}} {{GPS|gps}}',
['amount'] = 'Quantidade',
['no_play_near'] = 'Nenhum jogador nas proximidades',
['contract'] = '{{Revoke contract|revoke}} {{GPS|gps}}',
['rent'] = 'Alugar',
['sell'] = 'Vender',
['realtors'] = 'Agente Imobiliário',
}
+20 -22
View File
@@ -1,23 +1,21 @@
Locales['en'] = {
['properties'] = 'Immobilien',
['property'] = 'Immobilie',
['clients'] = 'Kunden',
['remove_comp_money'] = 'Firmengeld abheben',
['dep_money'] = 'Geld einzahlen',
['wash_money'] = 'Geld waschen',
['realtor'] = 'Makler',
['amount_withdraw'] = 'Betrag zun abheben',
['invalid_amount'] = 'ungültiger Betrag',
['amount_deposit'] = 'Betrag zum einzahlen',
['amount_launder'] = 'Betrag zum waschen',
['press_to_access'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen',
['property_actions'] = '{{Zuweisen [Verkaufen]|sell}} {{Zuweisen [Vermieten]|rent}} {{GPS|gps}}',
['amount'] = 'Betrag',
['no_play_near'] = 'Kein Spieler in der Nähe',
['contract'] = '{{Revoke contract|revoke}} {{GPS|gps}}',
['rent'] = 'Mieten',
['sell'] = 'Verkaufen',
['realtors'] = 'Makler',
}
['properties'] = 'Immobilien',
['property'] = 'Immobilie',
['clients'] = 'Kunden',
['remove_comp_money'] = 'Firmengeld abheben',
['dep_money'] = 'Geld einzahlen',
['wash_money'] = 'Geld waschen',
['realtor'] = 'Makler',
['amount_withdraw'] = 'Betrag zun abheben',
['invalid_amount'] = 'ungültiger Betrag',
['amount_deposit'] = 'Betrag zum einzahlen',
['amount_launder'] = 'Betrag zum waschen',
['press_to_access'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen',
['property_actions'] = '{{Zuweisen [Verkaufen]|sell}} {{Zuweisen [Vermieten]|rent}} {{GPS|gps}}',
['amount'] = 'Betrag',
['no_play_near'] = 'Kein Spieler in der Nähe',
['contract'] = '{{Revoke contract|revoke}} {{GPS|gps}}',
['rent'] = 'Mieten',
['sell'] = 'Verkaufen',
['realtors'] = 'Makler',
}
+22 -24
View File
@@ -1,25 +1,23 @@
Locales['en'] = {
['properties'] = 'properties',
['property'] = 'property',
['clients'] = 'clients',
['remove_comp_money'] = 'remove company money',
['dep_money'] = 'deposit money',
['wash_money'] = 'wash money',
['realtor'] = 'real Estate Agent',
['amount_withdraw'] = 'amount of withdrawal',
['invalid_amount'] = 'invalid amount',
['amount_deposit'] = 'deposit amount',
['amount_launder'] = 'amount to launder',
['press_to_access'] = 'press ~INPUT_CONTEXT~ to access the menu',
['property_actions'] = '{{Assign [Sell]|sell}} {{Assign [Rent]|rent}} {{GPS|gps}}',
['amount'] = 'amount',
['no_play_near'] = 'no players nearby',
['contract'] = '{{Revoke contract|revoke}} {{GPS|gps}}',
['rent'] = 'rent',
['sell'] = 'sell',
['realtors'] = 'real Estate Agents',
['client'] = 'real Estate Client',
['boss_action'] = 'boss Actions',
}
['properties'] = 'properties',
['property'] = 'property',
['clients'] = 'clients',
['remove_comp_money'] = 'remove company money',
['dep_money'] = 'deposit money',
['wash_money'] = 'wash money',
['realtor'] = 'real Estate Agent',
['amount_withdraw'] = 'amount of withdrawal',
['invalid_amount'] = 'invalid amount',
['amount_deposit'] = 'deposit amount',
['amount_launder'] = 'amount to launder',
['press_to_access'] = 'press ~INPUT_CONTEXT~ to access the menu',
['property_actions'] = '{{Assign [Sell]|sell}} {{Assign [Rent]|rent}} {{GPS|gps}}',
['amount'] = 'amount',
['no_play_near'] = 'no players nearby',
['contract'] = '{{Revoke contract|revoke}} {{GPS|gps}}',
['rent'] = 'rent',
['sell'] = 'sell',
['realtors'] = 'real Estate Agents',
['client'] = 'real Estate Client',
['boss_action'] = 'boss Actions',
}
+22 -24
View File
@@ -1,25 +1,23 @@
Locales['fr'] = {
['properties'] = 'propriétés',
['property'] = 'propriété',
['clients'] = 'clients',
['remove_comp_money'] = 'retirer argent société',
['dep_money'] = 'déposer argent',
['wash_money'] = 'blanchir argent',
['realtor'] = 'agent Immobilier',
['amount_withdraw'] = 'montant du retrait',
['invalid_amount'] = 'montant invalide',
['amount_deposit'] = 'montant du dépôt',
['amount_launder'] = 'montant à blanchir',
['press_to_access'] = 'appuez sur ~INPUT_CONTEXT~ pour accéder au menu',
['property_actions'] = '{{Assigner [Vente]|sell}} {{Assigner [Location]|rent}} {{GPS|gps}}',
['amount'] = 'montant',
['no_play_near'] = 'aucun joueur à proximité',
['contract'] = '{{Révoquer contrat|revoke}} {{GPS|gps}}',
['rent'] = 'location',
['sell'] = 'vente',
['realtors'] = 'agents Immobilier',
['client'] = 'Client immo',
['boss_action'] = 'action Patron',
}
['properties'] = 'propriétés',
['property'] = 'propriété',
['clients'] = 'clients',
['remove_comp_money'] = 'retirer argent société',
['dep_money'] = 'déposer argent',
['wash_money'] = 'blanchir argent',
['realtor'] = 'agent Immobilier',
['amount_withdraw'] = 'montant du retrait',
['invalid_amount'] = 'montant invalide',
['amount_deposit'] = 'montant du dépôt',
['amount_launder'] = 'montant à blanchir',
['press_to_access'] = 'appuez sur ~INPUT_CONTEXT~ pour accéder au menu',
['property_actions'] = '{{Assigner [Vente]|sell}} {{Assigner [Location]|rent}} {{GPS|gps}}',
['amount'] = 'montant',
['no_play_near'] = 'aucun joueur à proximité',
['contract'] = '{{Révoquer contrat|revoke}} {{GPS|gps}}',
['rent'] = 'location',
['sell'] = 'vente',
['realtors'] = 'agents Immobilier',
['client'] = 'Client immo',
['boss_action'] = 'action Patron',
}
+35 -35
View File
@@ -1,7 +1,7 @@
ESX = nil
TriggerEvent('esx:getSharedObject', function(obj)
ESX = obj
ESX = obj
end)
TriggerEvent('esx_phone:registerNumber', 'realestateagent', _U('client'), false, false)
@@ -9,58 +9,58 @@ TriggerEvent('esx_society:registerSociety', 'realestateagent', 'Agent immobilier
RegisterServerEvent('esx_realestateagentjob:revoke')
AddEventHandler('esx_realestateagentjob:revoke', function(property, owner)
TriggerEvent('esx_property:removeOwnedPropertyIdentifier', property, owner)
TriggerEvent('esx_property:removeOwnedPropertyIdentifier', property, owner)
end)
RegisterServerEvent('esx_realestateagentjob:sell')
AddEventHandler('esx_realestateagentjob:sell', function(target, property, price)
local xPlayer = ESX.GetPlayerFromId(target)
xPlayer.removeMoney(price)
local xPlayer = ESX.GetPlayerFromId(target)
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_realestateagent', function(account)
account.addMoney(price)
end)
xPlayer.removeMoney(price)
TriggerEvent('esx_property:setPropertyOwned', property, price, false, xPlayer.identifier)
TriggerEvent('esx_addonaccount:getSharedAccount', 'society_realestateagent', function(account)
account.addMoney(price)
end)
TriggerEvent('esx_property:setPropertyOwned', property, price, false, xPlayer.identifier)
end)
RegisterServerEvent('esx_realestateagentjob:rent')
AddEventHandler('esx_realestateagentjob:rent', function(target, property, price)
local xPlayer = ESX.GetPlayerFromId(target)
TriggerEvent('esx_property:setPropertyOwned', property, price, true, xPlayer.identifier)
local xPlayer = ESX.GetPlayerFromId(target)
TriggerEvent('esx_property:setPropertyOwned', property, price, true, xPlayer.identifier)
end)
ESX.RegisterServerCallback('esx_realestateagentjob:getCustomers', function(source, cb)
TriggerEvent('esx_ownedproperty:getOwnedProperties', function(properties)
local xPlayers = ESX.GetPlayers()
local customers = {}
TriggerEvent('esx_ownedproperty:getOwnedProperties', function(properties)
for i=1, #properties, 1 do
for j=1, #xPlayers, 1 do
local xPlayers = ESX.GetPlayers()
local customers = {}
local xPlayer = ESX.GetPlayerFromId(xPlayers[j])
if xPlayer.identifier == properties[i].owner then
table.insert(customers, {
name = xPlayer.name,
propertyOwner = properties[i].owner,
propertyRented = properties[i].rented,
propertyId = properties[i].id,
propertyPrice = properties[i].price,
propertyName = properties[i].name
})
end
end
end
for i=1, #properties, 1 do
for j=1, #xPlayers, 1 do
cb(customers)
local xPlayer = ESX.GetPlayerFromId(xPlayers[j])
end)
if xPlayer.identifier == properties[i].owner then
table.insert(customers, {
name = xPlayer.name,
propertyOwner = properties[i].owner,
propertyRented = properties[i].rented,
propertyId = properties[i].id,
propertyPrice = properties[i].price,
propertyName = properties[i].name
})
end
end
end
end)
cb(customers)
end)
end)