refactor(client): move nationalities

Qbox-project · Oct 4, 2024 · 70d6877 · 70d6877
1 parent 696fdc9
commit 70d6877
Show file tree

Hide file tree

Showing 4 changed files with 202 additions and 198 deletions.
diff --git a/client/character.lua b/client/character.lua
@@ -105,9 +105,11 @@ local randomPeds = {
 local nationalities = {}
 
 if config.characters.limitNationalities then
+    local nationalityList = lib.load('data.nationalities')
+
     CreateThread(function()
-        for i = 1, #config.characters.nationalities do
-            nationalities[#nationalities + 1] = {value = config.characters.nationalities[i]}
+        for i = 1, #nationalityList do
+            nationalities[#nationalities + 1] = { value = nationalityList[i] }
         end
     end)
 end

diff --git a/config/client.lua b/config/client.lua
@@ -13,202 +13,7 @@ return {
         dateMin = '1900-01-01', -- Has to be in the same format as the dateFormat config
         dateMax = '2006-12-31', -- Has to be in the same format as the dateFormat config
 
-        limitNationalities = true, -- Setting this to false will allow people to enter whatever they want in the nationality field
-        nationalities = {
-            'Afghan',
-            'Albanian',
-            'Algerian',
-            'American',
-            'Andorran',
-            'Angolan',
-            'Antiguans',
-            'Argentinean',
-            'Armenian',
-            'Australian',
-            'Austrian',
-            'Azerbaijani',
-            'Bahamian',
-            'Bahraini',
-            'Bangladeshi',
-            'Barbadian',
-            'Barbudans',
-            'Belarusian',
-            'Belgian',
-            'Belizean',
-            'Beninese',
-            'Bhutanese',
-            'Bolivian',
-            'Bosnian',
-            'Brazilian',
-            'British',
-            'Bruneian',
-            'Bulgarian',
-            'Burkinabe',
-            'Burmese',
-            'Burundian',
-            'Cambodian',
-            'Cameroonian',
-            'Canadian',
-            'Cape Verdean',
-            'Central African',
-            'Chadian',
-            'Chilean',
-            'Chinese',
-            'Colombian',
-            'Comoran',
-            'Congolese',
-            'Costa Rican',
-            'Croatian',
-            'Cuban',
-            'Cypriot',
-            'Czech',
-            'Danish',
-            'Djibouti',
-            'Dominican',
-            'Dutch',
-            'East Timorese',
-            'Ecuadorean',
-            'Egyptian',
-            'Emirian',
-            'Equatorial Guinean',
-            'Eritrean',
-            'Estonian',
-            'Ethiopian',
-            'Fijian',
-            'Filipino',
-            'Finnish',
-            'French',
-            'Gabonese',
-            'Gambian',
-            'Georgian',
-            'German',
-            'Ghanaian',
-            'Greek',
-            'Grenadian',
-            'Guatemalan',
-            'Guinea-Bissauan',
-            'Guinean',
-            'Guyanese',
-            'Haitian',
-            'Herzegovinian',
-            'Honduran',
-            'Hungarian',
-            'I-Kiribati',
-            'Icelander',
-            'Indian',
-            'Indonesian',
-            'Iranian',
-            'Iraqi',
-            'Irish',
-            'Israeli',
-            'Italian',
-            'Ivorian',
-            'Jamaican',
-            'Japanese',
-            'Jordanian',
-            'Kazakhstani',
-            'Kenyan',
-            'Kittian and Nevisian',
-            'Kuwaiti',
-            'Kyrgyz',
-            'Laotian',
-            'Latvian',
-            'Lebanese',
-            'Liberian',
-            'Libyan',
-            'Liechtensteiner',
-            'Lithuanian',
-            'Luxembourger',
-            'Macedonian',
-            'Malagasy',
-            'Malawian',
-            'Malaysian',
-            'Maldivan',
-            'Malian',
-            'Maltese',
-            'Marshallese',
-            'Mauritanian',
-            'Mauritian',
-            'Mexican',
-            'Micronesian',
-            'Moldovan',
-            'Monacan',
-            'Mongolian',
-            'Moroccan',
-            'Mosotho',
-            'Motswana',
-            'Mozambican',
-            'Namibian',
-            'Nauruan',
-            'Nepalese',
-            'New Zealander',
-            'Nicaraguan',
-            'Nigerian',
-            'Nigerien',
-            'North Korean',
-            'Northern Irish',
-            'Norwegian',
-            'Omani',
-            'Pakistani',
-            'Palauan',
-            'Panamanian',
-            'Papua New Guinean',
-            'Paraguayan',
-            'Peruvian',
-            'Polish',
-            'Portuguese',
-            'Qatari',
-            'Romanian',
-            'Russian',
-            'Rwandan',
-            'Saint Lucian',
-            'Salvadoran',
-            'Samoan',
-            'San Marinese',
-            'Sao Tomean',
-            'Saudi',
-            'Scottish',
-            'Senegalese',
-            'Serbian',
-            'Seychellois',
-            'Sierra Leonean',
-            'Singaporean',
-            'Slovakian',
-            'Slovenian',
-            'Solomon Islander',
-            'Somali',
-            'South African',
-            'South Korean',
-            'Spanish',
-            'Sri Lankan',
-            'Sudanese',
-            'Surinamer',
-            'Swazi',
-            'Swedish',
-            'Swiss',
-            'Syrian',
-            'Taiwanese',
-            'Tajik',
-            'Tanzanian',
-            'Thai',
-            'Togolese',
-            'Tongan',
-            'Trinbagonian',
-            'Tunisian',
-            'Turkish',
-            'Tuvaluan',
-            'Ugandan',
-            'Ukrainian',
-            'Uruguayan',
-            'Uzbekistani',
-            'Venezuelan',
-            'Vietnamese',
-            'Wallisian',
-            'Welsh',
-            'Yemenite',
-            'Zambian',
-            'Zimbabwean'
-        },
+        limitNationalities = true, -- Setting this to false will allow people to enter whatever they want in the nationality field (To edit the list of nationalities, head to data/nationalities.lua)
 
         profanityWords = {
             ['bad word'] = true