1dot13/gamedir
1
0
Fork 0
mirror of https://github.com/1dot13/gamedir.git synced 2026-07-22 13:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted MercProfiles to expanded and sorted nationalities (#168)

Browse Source 
associated source change

https://github.com/1dot13/source/commit/11202d7e7e595012233a4c93874c4e42b355f6c0
This commit is contained in:
Kitty
2025-08-14 13:20:20 +02:00
committed by GitHub
parent b8fabbc1e5
commit 3d1e9fc34c
4 changed files with 864 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Data-1.13/TableData/MercProfiles.xml
+100 -58
View File
@@ -147,16 +147,17 @@
<!-- Nationality & HatedNationality -->
<!-- (-1) No Nation (only used for HatedNationality) -->
<!-- AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
<!-- // old Sirtech values
AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
ARAB = 1,
AUSTRALIAN = 2,
BRITISH = 3,
CANADIAN = 4,
CUBAN = 5,
CUBAN 5,
DANISH = 6,
FRENCH = 7,
RUSSIAN = 8,
NIGERIAN = 9, // this was simply not defined in original data (I did not find any country), but we can't have any holes in here, so just invented soemthing
TRACONIAN = 9, changed 9 from nigerian (moved down) to traconian (UB takes place in Tracona)
SWISS = 10,
JAMAICAN = 11,
POLISH = 12,
@@ -174,57 +175,98 @@
METAVIRAN = 24,
// new values, because why not
GREEK, // 25
ESTONIAN,
VENEZUELAN ,
JAPANESE,
TURKISH,
INDIAN, // 30
MEXICAN,
NORWEGIAN,
SPANISH,
BRASILIAN,
FINNISH, // 35
IRANIAN,
ISRAELI,
BULGARIAN,
SWEDISH,
IRAQI, // 40
SYRIAN,
// more:
// added a few more and removed some, hoping to achieve a decent amount from every inhabited continent (plus one, in the 90's, relatively well-known fictional one)
// 0-24 original ja2 nationalities (except 9, see there)
// sorted non-original ones in (english) alphabetic order for some more ease of use during IMP creation
AFGHAN, // 25
ALBANIAN,
ARGENTINIAN,
ARMENIAN,
AZERBAIJANI,
BANGLADESHI, // 30
BELARUSIAN,
BELGIAN,
BENINESE,
BOLIVIAN,
BOSNIAN, // 35
BRASILIAN,
BULGARIAN,
CAMBODIAN,
CHADIAN,
CHILEAN, // 40
COLUMBIAN,
CONGOLESE,
CROATIAN,
ECUADORIAN,
EGYPTIAN, // 45
ENGLISH,
ERITREAN,
ESTONIAN,
ETHIOPIAN,
FILIPINO, // 50
FINNISH,
GEORGIAN,
GREEK,
GUATEMALAN,
HAITIAN, // 55
HONDURAN,
INDIAN,
INDONESIAN,
IRANIAN,
IRAQI, // 60
ISLANDIC,
ISRAELI,
JAPANESE,
JORDANIAN,
KAZAKHSTANI, // 65
KOREAN,
KYRGYZSTANI,
LAOTIAN,
LATVIAN,
LEBANESE, // 70
LITHUANIAN,
LYBIAN,
MACEDONIAN,
MALAYSIAN,
MEXICAN, // 75
MONGOLIAN,
MOROCCAN,
MOZAMBICAN,
MYANMA,
NAMIBIAN, // 80
NICARAGUAN,
NIGERIAN,
NIGERIEN,
NORWEGIAN,
PAKISTANI, // 85
PANAMANIAN,
PORTOGUESE,
BELARUSIAN_NAT,
SERBIAN_NAT, // 45
PAISTANI_NAT,
ALBANIAN_NAT,
ARGENTINIAN_NAT,
ARMENIAN_NAT,
AZERBAIJANI_NAT, // 50
BOLIVIAN_NAT,
CHILEAN_NAT,
CIRCASSIAN_NAT,
COLUMBIAN_NAT,
EGYPTIAN_NAT, // 55
ETHIOPIAN_NAT,
GEORGIAN_NAT,
JORDANIAN_NAT,
KAZAKHSTANI_NAT,
KENYAN_NAT, // 60
KOREAN_NAT,
KYRGYZSTANI_NAT,
MONGOLIAN_NAT,
PALESTINIAN_NAT,
PANAMANIAN_NAT, // 65
RHODESIAN_NAT,
SALVADORAN_NAT,
SAUDI_NAT,
SOMALI_NAT,
THAI_NAT, // 70
UKRAINIAN_NAT,
UZBEKISTANI_NAT,
WELSH_NAT,
YAZIDI_NAT,
ZIMBABWEAN_NAT, // 75 -->
RWANDANESE,
SALVADORAN,
SAUDI, // 90
SERBIAN,
SLOVAKIAN,
SLOVENIAN,
SOMALI,
SPANISH, // 95
SUDANESE,
SWEDISH,
SYRIAN,
THAI,
TOGOLESE, // 100
TUNISIAN,
TURKISH,
UGANDAN,
UKRAINIAN,
URUGUAYAN, // 105
UZBEKISTANI,
VENEZUELAN,
VIETNAMESE,
WELSH,
YEMENI, // 110
ZAMUNDAN, // Zamunda
ZIMBABWEAN, -->
<MERCPROFILES>
<PROFILE>
@@ -8276,7 +8318,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>25</bNationality>
<bNationality>53</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -18320,7 +18362,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>2</bRace>
<bNationality>28</bNationality>
<bNationality>63</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -18752,7 +18794,7 @@
<bLearnToHate>12</bLearnToHate>
<bLearnToHateTime>20</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>26</bNationality>
<bNationality>48</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -18860,7 +18902,7 @@
<bLearnToHate>2</bLearnToHate>
<bLearnToHateTime>6</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>26</bNationality>
<bNationality>48</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -19076,7 +19118,7 @@
<bLearnToHate>44</bLearnToHate>
<bLearnToHateTime>70</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>42</bNationality>
<bNationality>32</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -26829,7 +26871,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>4</bRace>
<bNationality>27</bNationality>
<bNationality>107</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
Data-UB/AddOns/Data-UB-1.13/TableData/MercProfiles25.xml
+100 -58
View File
@@ -147,16 +147,17 @@
<!-- Nationality & HatedNationality -->
<!-- (-1) No Nation (only used for HatedNationality) -->
<!-- AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
<!-- // old Sirtech values
AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
ARAB = 1,
AUSTRALIAN = 2,
BRITISH = 3,
CANADIAN = 4,
CUBAN = 5,
CUBAN 5,
DANISH = 6,
FRENCH = 7,
RUSSIAN = 8,
NIGERIAN = 9, // this was simply not defined in original data (I did not find any country), but we can't have any holes in here, so just invented soemthing
TRACONIAN = 9, changed 9 from nigerian (moved down) to traconian (UB takes place in Tracona)
SWISS = 10,
JAMAICAN = 11,
POLISH = 12,
@@ -174,57 +175,98 @@
METAVIRAN = 24,
// new values, because why not
GREEK, // 25
ESTONIAN,
VENEZUELAN ,
JAPANESE,
TURKISH,
INDIAN, // 30
MEXICAN,
NORWEGIAN,
SPANISH,
BRASILIAN,
FINNISH, // 35
IRANIAN,
ISRAELI,
BULGARIAN,
SWEDISH,
IRAQI, // 40
SYRIAN,
// more:
// added a few more and removed some, hoping to achieve a decent amount from every inhabited continent (plus one, in the 90's, relatively well-known fictional one)
// 0-24 original ja2 nationalities (except 9, see there)
// sorted non-original ones in (english) alphabetic order for some more ease of use during IMP creation
AFGHAN, // 25
ALBANIAN,
ARGENTINIAN,
ARMENIAN,
AZERBAIJANI,
BANGLADESHI, // 30
BELARUSIAN,
BELGIAN,
BENINESE,
BOLIVIAN,
BOSNIAN, // 35
BRASILIAN,
BULGARIAN,
CAMBODIAN,
CHADIAN,
CHILEAN, // 40
COLUMBIAN,
CONGOLESE,
CROATIAN,
ECUADORIAN,
EGYPTIAN, // 45
ENGLISH,
ERITREAN,
ESTONIAN,
ETHIOPIAN,
FILIPINO, // 50
FINNISH,
GEORGIAN,
GREEK,
GUATEMALAN,
HAITIAN, // 55
HONDURAN,
INDIAN,
INDONESIAN,
IRANIAN,
IRAQI, // 60
ISLANDIC,
ISRAELI,
JAPANESE,
JORDANIAN,
KAZAKHSTANI, // 65
KOREAN,
KYRGYZSTANI,
LAOTIAN,
LATVIAN,
LEBANESE, // 70
LITHUANIAN,
LYBIAN,
MACEDONIAN,
MALAYSIAN,
MEXICAN, // 75
MONGOLIAN,
MOROCCAN,
MOZAMBICAN,
MYANMA,
NAMIBIAN, // 80
NICARAGUAN,
NIGERIAN,
NIGERIEN,
NORWEGIAN,
PAKISTANI, // 85
PANAMANIAN,
PORTOGUESE,
BELARUSIAN_NAT,
SERBIAN_NAT, // 45
PAISTANI_NAT,
ALBANIAN_NAT,
ARGENTINIAN_NAT,
ARMENIAN_NAT,
AZERBAIJANI_NAT, // 50
BOLIVIAN_NAT,
CHILEAN_NAT,
CIRCASSIAN_NAT,
COLUMBIAN_NAT,
EGYPTIAN_NAT, // 55
ETHIOPIAN_NAT,
GEORGIAN_NAT,
JORDANIAN_NAT,
KAZAKHSTANI_NAT,
KENYAN_NAT, // 60
KOREAN_NAT,
KYRGYZSTANI_NAT,
MONGOLIAN_NAT,
PALESTINIAN_NAT,
PANAMANIAN_NAT, // 65
RHODESIAN_NAT,
SALVADORAN_NAT,
SAUDI_NAT,
SOMALI_NAT,
THAI_NAT, // 70
UKRAINIAN_NAT,
UZBEKISTANI_NAT,
WELSH_NAT,
YAZIDI_NAT,
ZIMBABWEAN_NAT, // 75 -->
RWANDANESE,
SALVADORAN,
SAUDI, // 90
SERBIAN,
SLOVAKIAN,
SLOVENIAN,
SOMALI,
SPANISH, // 95
SUDANESE,
SWEDISH,
SYRIAN,
THAI,
TOGOLESE, // 100
TUNISIAN,
TURKISH,
UGANDAN,
UKRAINIAN,
URUGUAYAN, // 105
UZBEKISTANI,
VENEZUELAN,
VIETNAMESE,
WELSH,
YEMENI, // 110
ZAMUNDAN, // Zamunda
ZIMBABWEAN, -->
<MERCPROFILES>
<PROFILE>
@@ -7204,7 +7246,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>0</bNationality>
<bNationality>63</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -18328,7 +18370,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>2</bRace>
<bNationality>28</bNationality>
<bNationality>62</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -18760,7 +18802,7 @@
<bLearnToHate>12</bLearnToHate>
<bLearnToHateTime>20</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>26</bNationality>
<bNationality>48</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -18868,7 +18910,7 @@
<bLearnToHate>2</bLearnToHate>
<bLearnToHateTime>6</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>26</bNationality>
<bNationality>48</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -19084,7 +19126,7 @@
<bLearnToHate>44</bLearnToHate>
<bLearnToHateTime>70</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>42</bNationality>
<bNationality>174</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -26837,7 +26879,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>4</bRace>
<bNationality>27</bNationality>
<bNationality>107</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
Data-UB/AddOns/Data-UB-Vanilla/TableData/MercProfiles25.xml
+97 -23
View File
@@ -147,16 +147,17 @@
<!-- Nationality & HatedNationality -->
<!-- (-1) No Nation (only used for HatedNationality) -->
<!-- AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
<!-- // old Sirtech values
AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
ARAB = 1,
AUSTRALIAN = 2,
BRITISH = 3,
CANADIAN = 4,
CUBAN = 5,
CUBAN 5,
DANISH = 6,
FRENCH = 7,
RUSSIAN = 8,
NIGERIAN = 9, // this was simply not defined in original data (I did not find any country), but we can't have any holes in here, so just invented soemthing
TRACONIAN = 9, changed 9 from nigerian (moved down) to traconian (UB takes place in Tracona)
SWISS = 10,
JAMAICAN = 11,
POLISH = 12,
@@ -174,25 +175,98 @@
METAVIRAN = 24,
// new values, because why not
GREEK, // 25
ESTONIAN,
VENEZUELAN ,
JAPANESE,
TURKISH,
INDIAN, // 30
MEXICAN,
NORWEGIAN,
SPANISH,
BRASILIAN,
FINNISH, // 35
IRANIAN,
ISRAELI,
BULGARIAN,
SWEDISH,
IRAQI, // 40
SYRIAN,
// more:
// added a few more and removed some, hoping to achieve a decent amount from every inhabited continent (plus one, in the 90's, relatively well-known fictional one)
// 0-24 original ja2 nationalities (except 9, see there)
// sorted non-original ones in (english) alphabetic order for some more ease of use during IMP creation
AFGHAN, // 25
ALBANIAN,
ARGENTINIAN,
ARMENIAN,
AZERBAIJANI,
BANGLADESHI, // 30
BELARUSIAN,
BELGIAN,
PORTOGUESE, -->
BENINESE,
BOLIVIAN,
BOSNIAN, // 35
BRASILIAN,
BULGARIAN,
CAMBODIAN,
CHADIAN,
CHILEAN, // 40
COLUMBIAN,
CONGOLESE,
CROATIAN,
ECUADORIAN,
EGYPTIAN, // 45
ENGLISH,
ERITREAN,
ESTONIAN,
ETHIOPIAN,
FILIPINO, // 50
FINNISH,
GEORGIAN,
GREEK,
GUATEMALAN,
HAITIAN, // 55
HONDURAN,
INDIAN,
INDONESIAN,
IRANIAN,
IRAQI, // 60
ISLANDIC,
ISRAELI,
JAPANESE,
JORDANIAN,
KAZAKHSTANI, // 65
KOREAN,
KYRGYZSTANI,
LAOTIAN,
LATVIAN,
LEBANESE, // 70
LITHUANIAN,
LYBIAN,
MACEDONIAN,
MALAYSIAN,
MEXICAN, // 75
MONGOLIAN,
MOROCCAN,
MOZAMBICAN,
MYANMA,
NAMIBIAN, // 80
NICARAGUAN,
NIGERIAN,
NIGERIEN,
NORWEGIAN,
PAKISTANI, // 85
PANAMANIAN,
PORTOGUESE,
RWANDANESE,
SALVADORAN,
SAUDI, // 90
SERBIAN,
SLOVAKIAN,
SLOVENIAN,
SOMALI,
SPANISH, // 95
SUDANESE,
SWEDISH,
SYRIAN,
THAI,
TOGOLESE, // 100
TUNISIAN,
TURKISH,
UGANDAN,
UKRAINIAN,
URUGUAYAN, // 105
UZBEKISTANI,
VENEZUELAN,
VIETNAMESE,
WELSH,
YEMENI, // 110
ZAMUNDAN, // Zamunda
ZIMBABWEAN, -->
<MERCPROFILES>
<PROFILE>
@@ -7356,7 +7430,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>25</bNationality>
<bNationality>0</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -16284,7 +16358,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>2</bRace>
<bNationality>28</bNationality>
<bNationality>63</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
Data/TableData/MercProfiles.xml
+97 -23
View File
@@ -147,16 +147,17 @@
<!-- Nationality & HatedNationality -->
<!-- (-1) No Nation (only used for HatedNationality) -->
<!-- AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
<!-- // old Sirtech values
AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
ARAB = 1,
AUSTRALIAN = 2,
BRITISH = 3,
CANADIAN = 4,
CUBAN = 5,
CUBAN 5,
DANISH = 6,
FRENCH = 7,
RUSSIAN = 8,
NIGERIAN = 9, // this was simply not defined in original data (I did not find any country), but we can't have any holes in here, so just invented soemthing
TRACONIAN = 9, changed 9 from nigerian (moved down) to traconian (UB takes place in Tracona)
SWISS = 10,
JAMAICAN = 11,
POLISH = 12,
@@ -174,25 +175,98 @@
METAVIRAN = 24,
// new values, because why not
GREEK, // 25
ESTONIAN,
VENEZUELAN ,
JAPANESE,
TURKISH,
INDIAN, // 30
MEXICAN,
NORWEGIAN,
SPANISH,
BRASILIAN,
FINNISH, // 35
IRANIAN,
ISRAELI,
BULGARIAN,
SWEDISH,
IRAQI, // 40
SYRIAN,
// more:
// added a few more and removed some, hoping to achieve a decent amount from every inhabited continent (plus one, in the 90's, relatively well-known fictional one)
// 0-24 original ja2 nationalities (except 9, see there)
// sorted non-original ones in (english) alphabetic order for some more ease of use during IMP creation
AFGHAN, // 25
ALBANIAN,
ARGENTINIAN,
ARMENIAN,
AZERBAIJANI,
BANGLADESHI, // 30
BELARUSIAN,
BELGIAN,
PORTOGUESE, -->
BENINESE,
BOLIVIAN,
BOSNIAN, // 35
BRASILIAN,
BULGARIAN,
CAMBODIAN,
CHADIAN,
CHILEAN, // 40
COLUMBIAN,
CONGOLESE,
CROATIAN,
ECUADORIAN,
EGYPTIAN, // 45
ENGLISH,
ERITREAN,
ESTONIAN,
ETHIOPIAN,
FILIPINO, // 50
FINNISH,
GEORGIAN,
GREEK,
GUATEMALAN,
HAITIAN, // 55
HONDURAN,
INDIAN,
INDONESIAN,
IRANIAN,
IRAQI, // 60
ISLANDIC,
ISRAELI,
JAPANESE,
JORDANIAN,
KAZAKHSTANI, // 65
KOREAN,
KYRGYZSTANI,
LAOTIAN,
LATVIAN,
LEBANESE, // 70
LITHUANIAN,
LYBIAN,
MACEDONIAN,
MALAYSIAN,
MEXICAN, // 75
MONGOLIAN,
MOROCCAN,
MOZAMBICAN,
MYANMA,
NAMIBIAN, // 80
NICARAGUAN,
NIGERIAN,
NIGERIEN,
NORWEGIAN,
PAKISTANI, // 85
PANAMANIAN,
PORTOGUESE,
RWANDANESE,
SALVADORAN,
SAUDI, // 90
SERBIAN,
SLOVAKIAN,
SLOVENIAN,
SOMALI,
SPANISH, // 95
SUDANESE,
SWEDISH,
SYRIAN,
THAI,
TOGOLESE, // 100
TUNISIAN,
TURKISH,
UGANDAN,
UKRAINIAN,
URUGUAYAN, // 105
UZBEKISTANI,
VENEZUELAN,
VIETNAMESE,
WELSH,
YEMENI, // 110
ZAMUNDAN, // Zamunda
ZIMBABWEAN, -->
<MERCPROFILES>
<PROFILE>
@@ -7368,7 +7442,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>25</bNationality>
<bNationality>53</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
@@ -16296,7 +16370,7 @@
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bRace>2</bRace>
<bNationality>28</bNationality>
<bNationality>63</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>