1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +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 036d52c7fe
commit d2bfa6c4b7
4 changed files with 864 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/MercProfiles.xml
+125 -83
View File
@@ -147,84 +147,126 @@
<!-- Nationality & HatedNationality --> <!-- Nationality & HatedNationality -->
<!-- (-1) No Nation (only used for HatedNationality) --> <!-- (-1) No Nation (only used for HatedNationality) -->
<!-- AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-) <!-- // old Sirtech values
ARAB = 1, AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
AUSTRALIAN = 2, ARAB = 1,
BRITISH = 3, AUSTRALIAN = 2,
CANADIAN = 4, BRITISH = 3,
CUBAN = 5, CANADIAN = 4,
DANISH = 6, CUBAN 5,
FRENCH = 7, DANISH = 6,
RUSSIAN = 8, FRENCH = 7,
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 RUSSIAN = 8,
SWISS = 10, TRACONIAN = 9, changed 9 from nigerian (moved down) to traconian (UB takes place in Tracona)
JAMAICAN = 11, SWISS = 10,
POLISH = 12, JAMAICAN = 11,
CHINESE = 13, POLISH = 12,
IRISH = 14, CHINESE = 13,
SOUTH_AFRICAN = 15, IRISH = 14,
HUNGARIAN = 16, SOUTH_AFRICAN = 15,
SCOTTISH = 17, HUNGARIAN = 16,
ARULCAN = 18, SCOTTISH = 17,
GERMAN = 19, ARULCAN = 18,
AFRICAN = 20, GERMAN = 19,
ITALIAN = 21, AFRICAN = 20,
DUTCH = 22, ITALIAN = 21,
ROMANIAN = 23, DUTCH = 22,
METAVIRAN = 24, ROMANIAN = 23,
METAVIRAN = 24,
// new values, because why not // new values, because why not
GREEK, // 25 // more:
ESTONIAN, // 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)
VENEZUELAN , // 0-24 original ja2 nationalities (except 9, see there)
JAPANESE, // sorted non-original ones in (english) alphabetic order for some more ease of use during IMP creation
TURKISH, AFGHAN, // 25
INDIAN, // 30 ALBANIAN,
MEXICAN, ARGENTINIAN,
NORWEGIAN, ARMENIAN,
SPANISH, AZERBAIJANI,
BRASILIAN, BANGLADESHI, // 30
FINNISH, // 35 BELARUSIAN,
IRANIAN, BELGIAN,
ISRAELI, BENINESE,
BULGARIAN, BOLIVIAN,
SWEDISH, BOSNIAN, // 35
IRAQI, // 40 BRASILIAN,
SYRIAN, BULGARIAN,
BELGIAN, CAMBODIAN,
PORTOGUESE, CHADIAN,
BELARUSIAN_NAT, CHILEAN, // 40
SERBIAN_NAT, // 45 COLUMBIAN,
PAISTANI_NAT, CONGOLESE,
ALBANIAN_NAT, CROATIAN,
ARGENTINIAN_NAT, ECUADORIAN,
ARMENIAN_NAT, EGYPTIAN, // 45
AZERBAIJANI_NAT, // 50 ENGLISH,
BOLIVIAN_NAT, ERITREAN,
CHILEAN_NAT, ESTONIAN,
CIRCASSIAN_NAT, ETHIOPIAN,
COLUMBIAN_NAT, FILIPINO, // 50
EGYPTIAN_NAT, // 55 FINNISH,
ETHIOPIAN_NAT, GEORGIAN,
GEORGIAN_NAT, GREEK,
JORDANIAN_NAT, GUATEMALAN,
KAZAKHSTANI_NAT, HAITIAN, // 55
KENYAN_NAT, // 60 HONDURAN,
KOREAN_NAT, INDIAN,
KYRGYZSTANI_NAT, INDONESIAN,
MONGOLIAN_NAT, IRANIAN,
PALESTINIAN_NAT, IRAQI, // 60
PANAMANIAN_NAT, // 65 ISLANDIC,
RHODESIAN_NAT, ISRAELI,
SALVADORAN_NAT, JAPANESE,
SAUDI_NAT, JORDANIAN,
SOMALI_NAT, KAZAKHSTANI, // 65
THAI_NAT, // 70 KOREAN,
UKRAINIAN_NAT, KYRGYZSTANI,
UZBEKISTANI_NAT, LAOTIAN,
WELSH_NAT, LATVIAN,
YAZIDI_NAT, LEBANESE, // 70
ZIMBABWEAN_NAT, // 75 --> 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> <MERCPROFILES>
<PROFILE> <PROFILE>
@@ -8276,7 +8318,7 @@
<bLearnToHate>255</bLearnToHate> <bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime> <bLearnToHateTime>0</bLearnToHateTime>
<bRace>0</bRace> <bRace>0</bRace>
<bNationality>25</bNationality> <bNationality>53</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -18320,7 +18362,7 @@
<bLearnToHate>255</bLearnToHate> <bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime> <bLearnToHateTime>0</bLearnToHateTime>
<bRace>2</bRace> <bRace>2</bRace>
<bNationality>28</bNationality> <bNationality>63</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -18752,7 +18794,7 @@
<bLearnToHate>12</bLearnToHate> <bLearnToHate>12</bLearnToHate>
<bLearnToHateTime>20</bLearnToHateTime> <bLearnToHateTime>20</bLearnToHateTime>
<bRace>0</bRace> <bRace>0</bRace>
<bNationality>26</bNationality> <bNationality>48</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -18860,7 +18902,7 @@
<bLearnToHate>2</bLearnToHate> <bLearnToHate>2</bLearnToHate>
<bLearnToHateTime>6</bLearnToHateTime> <bLearnToHateTime>6</bLearnToHateTime>
<bRace>0</bRace> <bRace>0</bRace>
<bNationality>26</bNationality> <bNationality>48</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -19076,7 +19118,7 @@
<bLearnToHate>44</bLearnToHate> <bLearnToHate>44</bLearnToHate>
<bLearnToHateTime>70</bLearnToHateTime> <bLearnToHateTime>70</bLearnToHateTime>
<bRace>0</bRace> <bRace>0</bRace>
<bNationality>42</bNationality> <bNationality>32</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -26829,7 +26871,7 @@
<bLearnToHate>255</bLearnToHate> <bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime> <bLearnToHateTime>0</bLearnToHateTime>
<bRace>4</bRace> <bRace>4</bRace>
<bNationality>27</bNationality> <bNationality>107</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
gamedir/Data-UB/AddOns/Data-UB-1.13/TableData/MercProfiles25.xml
+125 -83
View File
@@ -147,84 +147,126 @@
<!-- Nationality & HatedNationality --> <!-- Nationality & HatedNationality -->
<!-- (-1) No Nation (only used for HatedNationality) --> <!-- (-1) No Nation (only used for HatedNationality) -->
<!-- AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-) <!-- // old Sirtech values
ARAB = 1, AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
AUSTRALIAN = 2, ARAB = 1,
BRITISH = 3, AUSTRALIAN = 2,
CANADIAN = 4, BRITISH = 3,
CUBAN = 5, CANADIAN = 4,
DANISH = 6, CUBAN 5,
FRENCH = 7, DANISH = 6,
RUSSIAN = 8, FRENCH = 7,
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 RUSSIAN = 8,
SWISS = 10, TRACONIAN = 9, changed 9 from nigerian (moved down) to traconian (UB takes place in Tracona)
JAMAICAN = 11, SWISS = 10,
POLISH = 12, JAMAICAN = 11,
CHINESE = 13, POLISH = 12,
IRISH = 14, CHINESE = 13,
SOUTH_AFRICAN = 15, IRISH = 14,
HUNGARIAN = 16, SOUTH_AFRICAN = 15,
SCOTTISH = 17, HUNGARIAN = 16,
ARULCAN = 18, SCOTTISH = 17,
GERMAN = 19, ARULCAN = 18,
AFRICAN = 20, GERMAN = 19,
ITALIAN = 21, AFRICAN = 20,
DUTCH = 22, ITALIAN = 21,
ROMANIAN = 23, DUTCH = 22,
METAVIRAN = 24, ROMANIAN = 23,
METAVIRAN = 24,
// new values, because why not // new values, because why not
GREEK, // 25 // more:
ESTONIAN, // 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)
VENEZUELAN , // 0-24 original ja2 nationalities (except 9, see there)
JAPANESE, // sorted non-original ones in (english) alphabetic order for some more ease of use during IMP creation
TURKISH, AFGHAN, // 25
INDIAN, // 30 ALBANIAN,
MEXICAN, ARGENTINIAN,
NORWEGIAN, ARMENIAN,
SPANISH, AZERBAIJANI,
BRASILIAN, BANGLADESHI, // 30
FINNISH, // 35 BELARUSIAN,
IRANIAN, BELGIAN,
ISRAELI, BENINESE,
BULGARIAN, BOLIVIAN,
SWEDISH, BOSNIAN, // 35
IRAQI, // 40 BRASILIAN,
SYRIAN, BULGARIAN,
BELGIAN, CAMBODIAN,
PORTOGUESE, CHADIAN,
BELARUSIAN_NAT, CHILEAN, // 40
SERBIAN_NAT, // 45 COLUMBIAN,
PAISTANI_NAT, CONGOLESE,
ALBANIAN_NAT, CROATIAN,
ARGENTINIAN_NAT, ECUADORIAN,
ARMENIAN_NAT, EGYPTIAN, // 45
AZERBAIJANI_NAT, // 50 ENGLISH,
BOLIVIAN_NAT, ERITREAN,
CHILEAN_NAT, ESTONIAN,
CIRCASSIAN_NAT, ETHIOPIAN,
COLUMBIAN_NAT, FILIPINO, // 50
EGYPTIAN_NAT, // 55 FINNISH,
ETHIOPIAN_NAT, GEORGIAN,
GEORGIAN_NAT, GREEK,
JORDANIAN_NAT, GUATEMALAN,
KAZAKHSTANI_NAT, HAITIAN, // 55
KENYAN_NAT, // 60 HONDURAN,
KOREAN_NAT, INDIAN,
KYRGYZSTANI_NAT, INDONESIAN,
MONGOLIAN_NAT, IRANIAN,
PALESTINIAN_NAT, IRAQI, // 60
PANAMANIAN_NAT, // 65 ISLANDIC,
RHODESIAN_NAT, ISRAELI,
SALVADORAN_NAT, JAPANESE,
SAUDI_NAT, JORDANIAN,
SOMALI_NAT, KAZAKHSTANI, // 65
THAI_NAT, // 70 KOREAN,
UKRAINIAN_NAT, KYRGYZSTANI,
UZBEKISTANI_NAT, LAOTIAN,
WELSH_NAT, LATVIAN,
YAZIDI_NAT, LEBANESE, // 70
ZIMBABWEAN_NAT, // 75 --> 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> <MERCPROFILES>
<PROFILE> <PROFILE>
@@ -7204,7 +7246,7 @@
<bLearnToHate>255</bLearnToHate> <bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime> <bLearnToHateTime>0</bLearnToHateTime>
<bRace>0</bRace> <bRace>0</bRace>
<bNationality>0</bNationality> <bNationality>63</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -18328,7 +18370,7 @@
<bLearnToHate>255</bLearnToHate> <bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime> <bLearnToHateTime>0</bLearnToHateTime>
<bRace>2</bRace> <bRace>2</bRace>
<bNationality>28</bNationality> <bNationality>62</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -18760,7 +18802,7 @@
<bLearnToHate>12</bLearnToHate> <bLearnToHate>12</bLearnToHate>
<bLearnToHateTime>20</bLearnToHateTime> <bLearnToHateTime>20</bLearnToHateTime>
<bRace>0</bRace> <bRace>0</bRace>
<bNationality>26</bNationality> <bNationality>48</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -18868,7 +18910,7 @@
<bLearnToHate>2</bLearnToHate> <bLearnToHate>2</bLearnToHate>
<bLearnToHateTime>6</bLearnToHateTime> <bLearnToHateTime>6</bLearnToHateTime>
<bRace>0</bRace> <bRace>0</bRace>
<bNationality>26</bNationality> <bNationality>48</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -19084,7 +19126,7 @@
<bLearnToHate>44</bLearnToHate> <bLearnToHate>44</bLearnToHate>
<bLearnToHateTime>70</bLearnToHateTime> <bLearnToHateTime>70</bLearnToHateTime>
<bRace>0</bRace> <bRace>0</bRace>
<bNationality>42</bNationality> <bNationality>174</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
@@ -26837,7 +26879,7 @@
<bLearnToHate>255</bLearnToHate> <bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime> <bLearnToHateTime>0</bLearnToHateTime>
<bRace>4</bRace> <bRace>4</bRace>
<bNationality>27</bNationality> <bNationality>107</bNationality>
<bAppearance>0</bAppearance> <bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel> <bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement> <bRefinement>0</bRefinement>
gamedir/Data-UB/AddOns/Data-UB-Vanilla/TableData/MercProfiles25.xml
+304 -230
View File
File diff suppressed because it is too large Load Diff
gamedir/Data/TableData/MercProfiles.xml
+310 -236
View File
File diff suppressed because it is too large Load Diff