Merge branch 'main' of gitlab.com:new-era-team/N3OW

This commit is contained in:
Damimani 2024-11-09 18:45:22 +01:00
commit 9f1f48ffcc
5 changed files with 122 additions and 46 deletions

View file

@ -171,3 +171,90 @@ picard = {
35 = caucasian_dark_hair 35 = caucasian_dark_hair
} }
} }
galo = {
color = { 0.2 0.6 0.7 }
ethos = ethos_courtly
heritage = heritage_french
language = language_french
martial_custom = martial_custom_equal
traditions = {
tradition_chanson_de_geste
tradition_hereditary_hierarchy
tradition_chivalry
tradition_brewery
}
name_list = name_list_french
coa_gfx = { french_coa_gfx frankish_group_coa_gfx western_coa_gfx }
building_gfx = { western_building_gfx }
clothing_gfx = { french_clothing_gfx western_clothing_gfx }
unit_gfx = { western_unit_gfx }
ethnicities = {
10 = caucasian_blond
5 = caucasian_ginger
45 = caucasian_brown_hair
35 = caucasian_dark_hair
}
}
poitevin = {
color = { 0.5 0.7 0.8 }
ethos = ethos_courtly
heritage = heritage_french
language = language_french
martial_custom = martial_custom_equal
traditions = {
tradition_chanson_de_geste
tradition_hereditary_hierarchy
tradition_chivalry
tradition_brewery
}
name_list = name_list_french
coa_gfx = { french_coa_gfx frankish_group_coa_gfx western_coa_gfx }
building_gfx = { western_building_gfx }
clothing_gfx = { french_clothing_gfx western_clothing_gfx }
unit_gfx = { western_unit_gfx }
ethnicities = {
10 = caucasian_blond
5 = caucasian_ginger
45 = caucasian_brown_hair
35 = caucasian_dark_hair
}
}
gascon = {
color = { 0.4 0.8 0.9 }
ethos = ethos_courtly
heritage = heritage_french
language = language_french
martial_custom = martial_custom_equal
traditions = {
tradition_chanson_de_geste
tradition_hereditary_hierarchy
tradition_chivalry
tradition_brewery
}
name_list = name_list_french
coa_gfx = { french_coa_gfx frankish_group_coa_gfx western_coa_gfx }
building_gfx = { western_building_gfx }
clothing_gfx = { french_clothing_gfx western_clothing_gfx }
unit_gfx = { western_unit_gfx }
ethnicities = {
10 = caucasian_blond
5 = caucasian_ginger
45 = caucasian_brown_hair
35 = caucasian_dark_hair
}
}

View file

@ -2,7 +2,7 @@
##d_gascogne ################################### ##d_gascogne ###################################
###c_bordeaux ###c_bordeaux
2142 = { #BORDEAUX 2142 = { #BORDEAUX
culture = axiton culture = gascon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
867.1.1 = { 867.1.1 = {
@ -50,12 +50,9 @@
###c_albret ###c_albret
2196 = { #ALBRET 2196 = { #ALBRET
culture = axiton culture = gascon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
977.1.1 = {
culture = axiton
}
} }
2195 = { #TARTAS 2195 = { #TARTAS
holding = city_holding holding = city_holding
@ -69,12 +66,9 @@
###c_marsan ###c_marsan
2199 = { #MARSAN 2199 = { #MARSAN
culture = axiton culture = gascon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
977.1.1 = {
culture = axiton
}
} }
2198 = { #BAZADAIS 2198 = { #BAZADAIS
holding = church_holding holding = church_holding
@ -85,7 +79,7 @@
###c_agenais ###c_agenais
2232 = { #AGEN 2232 = { #AGEN
culture = axiton culture = gascon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
1150.1.1 = { religion = cathar } 1150.1.1 = { religion = cathar }
@ -98,8 +92,8 @@
##d_aquitaine ################################### ##d_aquitaine ###################################
###c_angouleme ###c_angouleme
2244 = { #ANGOULEME 2244 = { #ANGOULEME
culture = axiton culture = poitevin
religion = catholic religion = carolingian
holding = castle_holding holding = castle_holding
} }
2245 = { #SAINT JUNIEN 2245 = { #SAINT JUNIEN
@ -143,7 +137,7 @@
###c_saintonge ###c_saintonge
2241 = { #SAINTONGE 2241 = { #SAINTONGE
culture = axiton culture = poitevin
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
} }
@ -159,8 +153,8 @@
###c_aunis ###c_aunis
2147 = { #LA ROCHELLE 2147 = { #LA ROCHELLE
culture = axiton culture = poitevin
religion = catholic religion = carolingian
holding = castle_holding holding = castle_holding
} }
2243 = { #TAILLEBOURG 2243 = { #TAILLEBOURG
@ -315,8 +309,6 @@
culture = NEOW_sephardi culture = NEOW_sephardi
religion = congregationist religion = congregationist
holding = castle_holding holding = castle_holding
1150.1.1 = { religion = cathar }
1244.3.16 = { religion = catholic}
} }
2447 = { #LIMOUX 2447 = { #LIMOUX
holding = church_holding holding = church_holding
@ -360,12 +352,9 @@
##d_armagnac ################################### ##d_armagnac ###################################
###c_armagnac ###c_armagnac
2201 = { #ARMAGNAC 2201 = { #ARMAGNAC
culture = axiton culture = gascon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
977.1.1 = {
culture = axiton
}
} }
2204 = { #LECTOURE 2204 = { #LECTOURE
holding = city_holding holding = city_holding
@ -379,7 +368,7 @@
###c_bigorre ###c_bigorre
2010 = { #TARBES 2010 = { #TARBES
culture = axiton culture = gascon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
} }
@ -402,7 +391,7 @@
###c_comminges ###c_comminges
2009 = { #BERTRAND DE COMMINGES 2009 = { #BERTRAND DE COMMINGES
culture = axiton culture = gascon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
977.1.1 = { 977.1.1 = {
@ -472,13 +461,10 @@
##d_bourbon ################################### ##d_bourbon ###################################
###c_bourbon ###c_bourbon
2310 = { #BOURBON-LARCHEMBAULT 2310 = { #BOURBON-LARCHEMBAULT
culture = axiton culture = bourguignon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
1178.1.1 = {
culture = metropolitain
}
} }
2311 = { #ORVAL 2311 = { #ORVAL
holding = none holding = none
@ -492,7 +478,7 @@
###c_bellac ###c_bellac
2284 = { #BELLAC 2284 = { #BELLAC
culture = axiton culture = poitevin
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
} }
@ -501,13 +487,10 @@
} }
###c_jaligny ###c_jaligny
2309 = { #SAINT POURCAIN 2309 = { #SAINT POURCAIN
culture = axiton culture = bourguignon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
1178.1.1 = {
culture = metropolitain
}
} }
2306 = { #JALIGNY 2306 = { #JALIGNY
holding = city_holding holding = city_holding
@ -515,7 +498,7 @@
###c_la_marche ###c_la_marche
2285 = { #GRANDMONT 2285 = { #GRANDMONT
culture = axiton culture = bourguignon
religion = catholic religion = catholic
holding = castle_holding holding = castle_holding
} }

View file

@ -2,7 +2,7 @@
##d_brittany ################################### ##d_brittany ###################################
###c_vannes ###c_vannes
2154 = { #VANNES 2154 = { #VANNES
culture = breton culture = galo
religion = victorian religion = victorian
holding = castle_holding holding = castle_holding
} }
@ -18,7 +18,7 @@
###c_nantes ###c_nantes
2152 = { #NANTES 2152 = { #NANTES
culture = breton culture = galo
religion = victorian religion = victorian
holding = castle_holding holding = castle_holding
} }
@ -60,7 +60,7 @@
###c_penthievre ###c_penthievre
2162 = { #SAINT BRIEUC 2162 = { #SAINT BRIEUC
culture = breton culture = galo
religion = victorian religion = victorian
holding = castle_holding holding = castle_holding
} }
@ -73,7 +73,7 @@
###c_rennes ###c_rennes
2165 = { #RENNES 2165 = { #RENNES
culture = breton culture = galo
religion = victorian religion = victorian
holding = castle_holding holding = castle_holding
1066.1.1 = { 1066.1.1 = {

View file

@ -144,7 +144,7 @@
##d_berry ################################### ##d_berry ###################################
###c_berry ###c_berry
2280 = { #DEOLS 2280 = { #DEOLS
culture = metropolitain culture = bourguignon
religion = numenorian religion = numenorian
holding = castle_holding holding = castle_holding
} }
@ -190,7 +190,7 @@
###c_issoudun ###c_issoudun
2278 = { #ISSOUDUN 2278 = { #ISSOUDUN
culture = metropolitain culture = bourguignon
religion = numenorian religion = numenorian
holding = castle_holding holding = castle_holding
} }
@ -204,7 +204,7 @@
##d_anjou ################################### ##d_anjou ###################################
###c_anjou ###c_anjou
2267 = { #ANGERS 2267 = { #ANGERS
culture = metropolitain culture = galo
religion = orleaniste religion = orleaniste
holding = castle_holding holding = castle_holding
} }
@ -229,7 +229,7 @@
###c_saumur ###c_saumur
2261 = { #SAUMUR 2261 = { #SAUMUR
culture = metropolitain culture = poitevin
religion = victorian religion = victorian
holding = castle_holding holding = castle_holding
} }
@ -255,7 +255,7 @@
###c_sable ###c_sable
2264 = { #SABLE 2264 = { #SABLE
culture = metropolitain culture = galo
religion = victorian religion = victorian
holding = castle_holding holding = castle_holding
} }
@ -382,7 +382,7 @@
##d_poitou ################################### ##d_poitou ###################################
###c_poitiers ###c_poitiers
2252 = { #POITIERS 2252 = { #POITIERS
culture = metropolitain culture = poitevin
religion = carolingian religion = carolingian
holding = castle_holding holding = castle_holding
1066.1.1 = { 1066.1.1 = {
@ -408,7 +408,7 @@
###c_lusignan ###c_lusignan
2249 = { #LUSIGNAN 2249 = { #LUSIGNAN
culture = metropolitain culture = poitevin
religion = carolingian religion = carolingian
holding = castle_holding holding = castle_holding
} }
@ -424,7 +424,7 @@
###c_montaigu ###c_montaigu
2150 = { #MONTAIGU 2150 = { #MONTAIGU
culture = metropolitain culture = poitevin
religion = orleaniste religion = orleaniste
holding = castle_holding holding = castle_holding
} }
@ -439,7 +439,7 @@
} }
###c_thouars ###c_thouars
2257 = { #THOUARS 2257 = { #THOUARS
culture = metropolitain culture = poitevin
religion = carolingian religion = carolingian
holding = castle_holding holding = castle_holding
} }

View file

@ -12,6 +12,12 @@
provencal_collective_noun:0 "Provençal" provencal_collective_noun:0 "Provençal"
picard:0 "Picard" picard:0 "Picard"
picard_collective_noun:0 "Picard" picard_collective_noun:0 "Picard"
galo:0 "Galo"
galo_collective_noun:0 "Galo"
poitevin:0 "Poitevin"
poitevin_collective_noun:0 "Poitevin"
gascon:0 "Gascon"
gascon_collective_noun:0 "Gascon"
#hebraic #hebraic
NEOW_sephardi:0 "Sefardi" NEOW_sephardi:0 "Sefardi"
NEOW_sephardi_collective_noun:0 "Sefaradis" NEOW_sephardi_collective_noun:0 "Sefaradis"