From 9b8da738fffa517a7754f38c60327f061a489659 Mon Sep 17 00:00:00 2001 From: JonStryker Date: Mon, 29 Dec 2014 16:12:11 +0000 Subject: [PATCH] map fixes --- MOD/Witcher/common/bookmarks.txt | 2 +- .../common/landed_titles/01_landed_titles.txt | 2 + .../manual changes to 01_landed_titles.txt | 20 +---- .../history/characters/045000_koviri.txt | 6 +- .../history/characters/055000_verdenian.txt | 2 +- .../characters/100000_nilfgaardian.txt | 2 +- .../characters/105000_cintran_calanthe.txt | 1 - .../history/characters/120000_toussaint.txt | 4 +- .../history/characters/150000_metinnan.txt | 78 +----------------- .../history/provinces/487 - Grandrif.txt | 5 +- .../history/provinces/490 - Heizyde.txt | 2 +- .../history/provinces/491 - Eyravazet.txt | 2 +- .../history/provinces/492 - Eversael.txt | 2 +- .../history/provinces/493 - Igornay.txt | 2 +- MOD/Witcher/history/provinces/494 - Klye.txt | 2 +- .../history/provinces/495 - Orgibet.txt | 5 +- MOD/Witcher/history/titles/c_ard_kestrel.txt | 2 +- MOD/Witcher/history/titles/c_azyam.txt | 2 +- MOD/Witcher/history/titles/c_bois.txt | 2 +- MOD/Witcher/history/titles/c_kaer_morhen.txt | 2 +- MOD/Witcher/history/titles/c_kaer_trolde.txt | 2 +- MOD/Witcher/history/titles/c_kagen.txt | 2 +- MOD/Witcher/history/titles/c_kolooma.txt | 2 +- MOD/Witcher/history/titles/c_lana_san.txt | 9 +- MOD/Witcher/history/titles/c_malleore.txt | 2 +- MOD/Witcher/history/titles/c_marfink.txt | 2 +- MOD/Witcher/history/titles/c_midun.txt | 2 +- MOD/Witcher/history/titles/c_skardh.txt | 7 +- MOD/Witcher/history/titles/c_smalengs.txt | 2 +- MOD/Witcher/history/titles/c_terssac.txt | 2 +- MOD/Witcher/history/titles/c_tiga.txt | 2 +- MOD/Witcher/history/titles/c_turiac.txt | 2 +- MOD/Witcher/history/titles/c_zurbarran.txt | 2 +- MOD/Witcher/history/titles/d_ard_kestrel.txt | 17 +++- MOD/Witcher/history/titles/d_kaer_morhen.txt | 21 ----- MOD/Witcher/history/titles/d_kagen.txt | 16 +++- MOD/Witcher/history/titles/d_malleore.txt | 2 +- MOD/Witcher/history/titles/d_zurbarran.txt | 2 +- MOD/Witcher/interface/portrait_properties.txt | 47 +++++++---- MOD/Witcher/localisation/0_Barony_names.csv | 2 + .../localisation/W_artifact_events.csv | 2 +- MOD/Witcher/map/provinceDef.xls | Bin 289280 -> 289280 bytes 42 files changed, 124 insertions(+), 168 deletions(-) delete mode 100644 MOD/Witcher/history/titles/d_kaer_morhen.txt diff --git a/MOD/Witcher/common/bookmarks.txt b/MOD/Witcher/common/bookmarks.txt index 0b79d8d4c..e514aaa27 100644 --- a/MOD/Witcher/common/bookmarks.txt +++ b/MOD/Witcher/common/bookmarks.txt @@ -26,7 +26,7 @@ # character = 91012 #} - # Assasin of Kings + # Assassin's of Kings bookmark = { name = "BM_FATE_OF_ENGLAND" desc = "BM_WITCHER_2_DESC" diff --git a/MOD/Witcher/common/landed_titles/01_landed_titles.txt b/MOD/Witcher/common/landed_titles/01_landed_titles.txt index 02cf36e78..96033b46b 100644 --- a/MOD/Witcher/common/landed_titles/01_landed_titles.txt +++ b/MOD/Witcher/common/landed_titles/01_landed_titles.txt @@ -6769,6 +6769,8 @@ e_temeria = { } b_orgibet_3 = { } + b_orgibet_4 = { + } } } } diff --git a/MOD/Witcher/common/landed_titles/manual changes to 01_landed_titles.txt b/MOD/Witcher/common/landed_titles/manual changes to 01_landed_titles.txt index dcdb58cbc..2b34b0151 100644 --- a/MOD/Witcher/common/landed_titles/manual changes to 01_landed_titles.txt +++ b/MOD/Witcher/common/landed_titles/manual changes to 01_landed_titles.txt @@ -173,6 +173,10 @@ c_drakenborg = { title = "COMMANDER" title_female = "COMMANDER" } +d_drakenborg = { + title = "COMMANDER" + title_female = "COMMANDER" +} c_tor_corsydd = { title = "SORCERER" title_female = "SORCERESS" @@ -217,25 +221,9 @@ c_rissberg = { title = "SORCERER" title_female = "SORCERESS" } - -d_garramone = { - name_tier = count -} -d_maribor = { - name_tier = count -} -d_gors_velen = { - name_tier = count -} -#d_dorian = { -# name_tier = count -#} d_la_valette = { name_tier = baron } -c_mortara = { - name_tier = baron -} c_flotsam = { title = "COMMANDER" title_female = "COMMANDER" diff --git a/MOD/Witcher/history/characters/045000_koviri.txt b/MOD/Witcher/history/characters/045000_koviri.txt index 8801cb33b..0b830ce42 100644 --- a/MOD/Witcher/history/characters/045000_koviri.txt +++ b/MOD/Witcher/history/characters/045000_koviri.txt @@ -1891,7 +1891,7 @@ religion=lebioda culture=koviri mother=46716 1165.1.1={ birth=yes } - 1209.1.1={ death=yes } + 1232.1.1={ death=yes } } 97610={ name=Ryngold @@ -1900,7 +1900,7 @@ religion=lebioda culture=koviri mother=46716 1170.1.1={ birth=yes } - 1232.1.1={ death=yes } + 1224.1.1={ death=yes } } 97603={ # Blanka, wife of Baldwin Thyssen name=Blanka @@ -9029,7 +9029,7 @@ martial=5 diplomacy=4 stewardship=5 intrigue=7 learning=6 father=49900 #Ako 1227.12.1={ birth=yes } - 1276.2.1={ death=yes } + 1286.2.1={ death=yes } } 49903={ name=Gualter diff --git a/MOD/Witcher/history/characters/055000_verdenian.txt b/MOD/Witcher/history/characters/055000_verdenian.txt index 58497d6dc..b33cc3715 100644 --- a/MOD/Witcher/history/characters/055000_verdenian.txt +++ b/MOD/Witcher/history/characters/055000_verdenian.txt @@ -594,7 +594,7 @@ father=55215 #Klaufi mother=55626 1196.7.11={ birth=yes } - 1234.5.22={ death=yes } + 1234.9.23={ death=yes } } 55218={ name=Harald diff --git a/MOD/Witcher/history/characters/100000_nilfgaardian.txt b/MOD/Witcher/history/characters/100000_nilfgaardian.txt index 6b2caba8c..55e13fcfe 100644 --- a/MOD/Witcher/history/characters/100000_nilfgaardian.txt +++ b/MOD/Witcher/history/characters/100000_nilfgaardian.txt @@ -82,7 +82,7 @@ religion=solar culture=nilfgaardian father=100003 1162.1.1={ birth=yes } - 1183.1.1={ add_spouse=10022 } + 1183.1.1={ add_spouse=146018 } 1221.1.1={ death=yes } } 100005={ diff --git a/MOD/Witcher/history/characters/105000_cintran_calanthe.txt b/MOD/Witcher/history/characters/105000_cintran_calanthe.txt index 5e0b4a338..1713b9fd2 100644 --- a/MOD/Witcher/history/characters/105000_cintran_calanthe.txt +++ b/MOD/Witcher/history/characters/105000_cintran_calanthe.txt @@ -29,7 +29,6 @@ religion=melitele culture=cintran dna=bfhfhiaokgi add_trait=canon add_trait=human add_trait=ravens_blood - 10.1.1={ } 1050.1.1={ birth=yes } 1109.1.1={ death=yes } } diff --git a/MOD/Witcher/history/characters/120000_toussaint.txt b/MOD/Witcher/history/characters/120000_toussaint.txt index 6954c41ef..7e1ee8616 100644 --- a/MOD/Witcher/history/characters/120000_toussaint.txt +++ b/MOD/Witcher/history/characters/120000_toussaint.txt @@ -1728,7 +1728,7 @@ dna=bfjlecglcjd culture=toussaint religion=melitele 1000.1.26={ birth=yes } - 1027.9.30={ death=yes } + 1047.9.30={ death=yes } } 121101={ name=Centule @@ -2441,7 +2441,7 @@ dna=hojnjicfaoe culture=toussaint religion=melitele 999.1.15={ birth=yes } - 1027.3.6={ death=yes } + 1057.3.6={ death=yes } } 121501={ name=Tiburge diff --git a/MOD/Witcher/history/characters/150000_metinnan.txt b/MOD/Witcher/history/characters/150000_metinnan.txt index 1573db529..08952a106 100644 --- a/MOD/Witcher/history/characters/150000_metinnan.txt +++ b/MOD/Witcher/history/characters/150000_metinnan.txt @@ -5610,29 +5610,9 @@ dna=lngjilimcig culture=metinnan religion=melitele father=151958 #Waleran - 1102.5.24={ birth=yes } + 1104.5.24={ birth=yes } 1177.12.9={ death=yes } } -151962={ - name=Scáthach - female=yes - dynasty=26013 - dna=lkdhicfkcnj - culture=metinnan religion=melitele - father=151958 #Waleran - 1106.8.21={ birth=yes } - 1128.12.16={ death=yes } -} -151963={ - name=Ailbhe - female=yes - dynasty=26013 - dna=lobeipmmcnl - culture=metinnan religion=melitele - father=151958 #Waleran - 1110.6.20={ birth=yes } - 1166.11.13={ death=yes } -} 151964={ name=Ben-Muman female=yes @@ -5640,49 +5620,9 @@ dna=pnbpocdmdfc culture=metinnan religion=melitele father=151958 #Waleran - 1112.9.13={ birth=yes } + 1109.9.13={ birth=yes } 1168.12.22={ death=yes } } -151965={ - name=Joanna - female=yes - dynasty=26013 - dna=gebphchpink - culture=metinnan religion=melitele - father=151958 #Waleran - 1114.4.25={ birth=yes } - 1192.6.5={ death=yes } -} -151966={ - name=Catríona - female=yes - dynasty=26013 - dna=kelnhcimpnn - culture=metinnan religion=melitele - father=151958 #Waleran - 1118.4.9={ birth=yes } - 1143.1.21={ death=yes } -} -151967={ - name=Echrad - female=yes - dynasty=26013 - dna=lnkkdchnckg - culture=metinnan religion=melitele - father=151958 #Waleran - 1122.7.25={ birth=yes } - 1193.1.31={ death=yes } -} -151968={ - name=Catríona - female=yes - dynasty=26013 - dna=lnbgpbhmjpa - culture=metinnan religion=melitele - father=151958 #Waleran - 1125.2.14={ birth=yes } - 1153.9.30={ death=yes } -} 151969={ name=Sybilla female=yes @@ -5690,26 +5630,16 @@ dna=lnepigpmofg culture=metinnan religion=melitele father=151958 #Waleran - 1128.11.6={ birth=yes } + 1115.11.6={ birth=yes } 1203.11.18={ death=yes } } -151970={ - name=Anne - female=yes - dynasty=26013 - dna=khonbclcgnf - culture=metinnan religion=melitele - father=151958 #Waleran - 1131.5.27={ birth=yes } - 1199.2.28={ death=yes } -} 151971={ name=Énna dynasty=26013 dna=omciinhmdng culture=metinnan religion=melitele father=151958 #Waleran - 1133.7.1={ birth=yes } + 1120.7.1={ birth=yes } 1184.10.25={ death=yes } } 151972={ diff --git a/MOD/Witcher/history/provinces/487 - Grandrif.txt b/MOD/Witcher/history/provinces/487 - Grandrif.txt index ba499e544..f10a5ee48 100644 --- a/MOD/Witcher/history/provinces/487 - Grandrif.txt +++ b/MOD/Witcher/history/provinces/487 - Grandrif.txt @@ -4,11 +4,12 @@ title = c_grandrif # Settlements -max_settlements = 3 +max_settlements = 4 b_grandrif = castle -#b_hamfehr = city +b_hamfehr = city #b_nuret = temple +#b_cazalis = castle # Misc culture = temerian diff --git a/MOD/Witcher/history/provinces/490 - Heizyde.txt b/MOD/Witcher/history/provinces/490 - Heizyde.txt index a3c981678..fe091c4a1 100644 --- a/MOD/Witcher/history/provinces/490 - Heizyde.txt +++ b/MOD/Witcher/history/provinces/490 - Heizyde.txt @@ -7,7 +7,7 @@ title = c_heizyde max_settlements = 4 b_heizyde = castle -#b_itter = city +b_itter = city #b_corteinen = temple #b_katermeir = castle diff --git a/MOD/Witcher/history/provinces/491 - Eyravazet.txt b/MOD/Witcher/history/provinces/491 - Eyravazet.txt index 4dccc9744..f1ae4688e 100644 --- a/MOD/Witcher/history/provinces/491 - Eyravazet.txt +++ b/MOD/Witcher/history/provinces/491 - Eyravazet.txt @@ -7,7 +7,7 @@ title = c_eyravazet max_settlements = 4 b_eyravazet = castle -#b_eyravazet_2 = city +b_eyravazet_2 = city #b_eyravazet_3 = temple #b_eyravazet_4 = castle diff --git a/MOD/Witcher/history/provinces/492 - Eversael.txt b/MOD/Witcher/history/provinces/492 - Eversael.txt index 71bcc629d..9d32b0401 100644 --- a/MOD/Witcher/history/provinces/492 - Eversael.txt +++ b/MOD/Witcher/history/provinces/492 - Eversael.txt @@ -7,7 +7,7 @@ title = c_eversael max_settlements = 4 b_eversael = castle -#b_eversael_2 = city +b_eversael_2 = city #b_eversael_3 = temple #b_eversael_4 = castle diff --git a/MOD/Witcher/history/provinces/493 - Igornay.txt b/MOD/Witcher/history/provinces/493 - Igornay.txt index 553efca76..cc8b818f4 100644 --- a/MOD/Witcher/history/provinces/493 - Igornay.txt +++ b/MOD/Witcher/history/provinces/493 - Igornay.txt @@ -7,7 +7,7 @@ title = c_igornay max_settlements = 4 b_igornay = castle -#b_igornay_2 = city +b_igornay_2 = city #b_igornay_3 = temple #b_igornay_4 = castle diff --git a/MOD/Witcher/history/provinces/494 - Klye.txt b/MOD/Witcher/history/provinces/494 - Klye.txt index 898d02d26..01ca5d4ba 100644 --- a/MOD/Witcher/history/provinces/494 - Klye.txt +++ b/MOD/Witcher/history/provinces/494 - Klye.txt @@ -7,7 +7,7 @@ title = c_klye max_settlements = 4 b_klye = castle -#b_klye_2 = city +b_klye_2 = city #b_klye_3 = temple #b_klye_4 = castle diff --git a/MOD/Witcher/history/provinces/495 - Orgibet.txt b/MOD/Witcher/history/provinces/495 - Orgibet.txt index e21827c16..d471e2683 100644 --- a/MOD/Witcher/history/provinces/495 - Orgibet.txt +++ b/MOD/Witcher/history/provinces/495 - Orgibet.txt @@ -4,11 +4,12 @@ title = c_orgibet # Settlements -max_settlements = 3 +max_settlements = 4 b_orgibet = castle -#b_orgibet_2 = city +b_orgibet_2 = city #b_orgibet_3 = temple +#b_orgibet_4 = castle # Misc culture = temerian diff --git a/MOD/Witcher/history/titles/c_ard_kestrel.txt b/MOD/Witcher/history/titles/c_ard_kestrel.txt index 9418b6dc9..0a75746a7 100644 --- a/MOD/Witcher/history/titles/c_ard_kestrel.txt +++ b/MOD/Witcher/history/titles/c_ard_kestrel.txt @@ -3,5 +3,5 @@ law = succ_gavelkind } 800.1.1={ - liege=d_kaer_morhen + liege=d_ard_kestrel } diff --git a/MOD/Witcher/history/titles/c_azyam.txt b/MOD/Witcher/history/titles/c_azyam.txt index 36b079b7e..cc7d1045f 100644 --- a/MOD/Witcher/history/titles/c_azyam.txt +++ b/MOD/Witcher/history/titles/c_azyam.txt @@ -4,5 +4,5 @@ law = succ_gavelkind } 800.1.1={ - liege=d_kaer_morhen + liege=d_ard_kestrel } diff --git a/MOD/Witcher/history/titles/c_bois.txt b/MOD/Witcher/history/titles/c_bois.txt index 92d65cc4c..41143640d 100644 --- a/MOD/Witcher/history/titles/c_bois.txt +++ b/MOD/Witcher/history/titles/c_bois.txt @@ -7,7 +7,7 @@ } 1025.1.1={holder=121100} #Léonard[24003] -1027.09.30={holder=121101} #Centule[24003] +1047.09.30={holder=121101} #Centule[24003] 1063.04.29={holder=121106} #Hamelin[24003] 1103.01.22={holder=121107} #Rajmund[24003] 1120.08.11={holder=121109} #Jourdain[24003] diff --git a/MOD/Witcher/history/titles/c_kaer_morhen.txt b/MOD/Witcher/history/titles/c_kaer_morhen.txt index 15c0ba1e5..2316a45c2 100644 --- a/MOD/Witcher/history/titles/c_kaer_morhen.txt +++ b/MOD/Witcher/history/titles/c_kaer_morhen.txt @@ -3,7 +3,7 @@ law = succ_gavelkind } 1100.1.1={ - liege=d_kaer_morhen + liege=d_ard_kestrel } 1025.1.1={holder=19150} #Baatyr[4074] diff --git a/MOD/Witcher/history/titles/c_kaer_trolde.txt b/MOD/Witcher/history/titles/c_kaer_trolde.txt index d2ff2fd3a..df67a53cc 100644 --- a/MOD/Witcher/history/titles/c_kaer_trolde.txt +++ b/MOD/Witcher/history/titles/c_kaer_trolde.txt @@ -3,7 +3,7 @@ law = succ_gavelkind } 1080.1.1={ - liege=d_west_skellig + liege=d_ard_skellig } #Craite diff --git a/MOD/Witcher/history/titles/c_kagen.txt b/MOD/Witcher/history/titles/c_kagen.txt index 9bacdff87..7de850fa4 100644 --- a/MOD/Witcher/history/titles/c_kagen.txt +++ b/MOD/Witcher/history/titles/c_kagen.txt @@ -3,7 +3,7 @@ law = succ_gavelkind } 1080.1.1={ - liege=d_armeria + liege=d_kagen } 1025.1.1={holder=28400} #Bolo[1504] diff --git a/MOD/Witcher/history/titles/c_kolooma.txt b/MOD/Witcher/history/titles/c_kolooma.txt index 5793c32db..c7cc14a2a 100644 --- a/MOD/Witcher/history/titles/c_kolooma.txt +++ b/MOD/Witcher/history/titles/c_kolooma.txt @@ -3,7 +3,7 @@ law = succ_gavelkind } 1080.1.1={ - liege=d_kaer_morhen + liege=d_ard_kestrel } 1025.1.1={holder=18700} #Vjshata[4083] diff --git a/MOD/Witcher/history/titles/c_lana_san.txt b/MOD/Witcher/history/titles/c_lana_san.txt index 8e0a7ede5..d5923d606 100644 --- a/MOD/Witcher/history/titles/c_lana_san.txt +++ b/MOD/Witcher/history/titles/c_lana_san.txt @@ -1,3 +1,10 @@ +500.1.1={ + liege=k_brokilon +} 800.1.1={ - liege=d_caenn_treise + law = succ_gavelkind + law = enatic_succession } +1260.1.1={ + holder=70001 +} \ No newline at end of file diff --git a/MOD/Witcher/history/titles/c_malleore.txt b/MOD/Witcher/history/titles/c_malleore.txt index c90c9421b..2f5d40d79 100644 --- a/MOD/Witcher/history/titles/c_malleore.txt +++ b/MOD/Witcher/history/titles/c_malleore.txt @@ -8,7 +8,7 @@ holder=97601 #Wiestard } 1202.1.1={ - holder=97602 #Ryngold + holder=97602 #Kerstigens } 1232.1.1={ holder=97606 #Manwyd diff --git a/MOD/Witcher/history/titles/c_marfink.txt b/MOD/Witcher/history/titles/c_marfink.txt index 36b079b7e..cc7d1045f 100644 --- a/MOD/Witcher/history/titles/c_marfink.txt +++ b/MOD/Witcher/history/titles/c_marfink.txt @@ -4,5 +4,5 @@ law = succ_gavelkind } 800.1.1={ - liege=d_kaer_morhen + liege=d_ard_kestrel } diff --git a/MOD/Witcher/history/titles/c_midun.txt b/MOD/Witcher/history/titles/c_midun.txt index fe6fc157a..059622495 100644 --- a/MOD/Witcher/history/titles/c_midun.txt +++ b/MOD/Witcher/history/titles/c_midun.txt @@ -4,5 +4,5 @@ law = succ_gavelkind } 800.1.1={ - liege=d_armeria + liege=d_kagen } diff --git a/MOD/Witcher/history/titles/c_skardh.txt b/MOD/Witcher/history/titles/c_skardh.txt index 704989438..df67a53cc 100644 --- a/MOD/Witcher/history/titles/c_skardh.txt +++ b/MOD/Witcher/history/titles/c_skardh.txt @@ -1,8 +1,11 @@ -# k_skellig 500.1.1={ law = agnatic_succession law = succ_gavelkind } -800.1.1={ +1080.1.1={ liege=d_ard_skellig } + +#Craite +1220.1.1={holder=35204} #Aralt[7001] +1242.2.2={holder=35200} #Crach[7001] \ No newline at end of file diff --git a/MOD/Witcher/history/titles/c_smalengs.txt b/MOD/Witcher/history/titles/c_smalengs.txt index b95e49f93..03db89002 100644 --- a/MOD/Witcher/history/titles/c_smalengs.txt +++ b/MOD/Witcher/history/titles/c_smalengs.txt @@ -3,7 +3,7 @@ law = succ_gavelkind } 1080.1.1={ - liege=d_kaer_morhen + liege=d_ard_kestrel } 1025.1.1={holder=18400} #Ankip[4057] diff --git a/MOD/Witcher/history/titles/c_terssac.txt b/MOD/Witcher/history/titles/c_terssac.txt index 36b079b7e..cc7d1045f 100644 --- a/MOD/Witcher/history/titles/c_terssac.txt +++ b/MOD/Witcher/history/titles/c_terssac.txt @@ -4,5 +4,5 @@ law = succ_gavelkind } 800.1.1={ - liege=d_kaer_morhen + liege=d_ard_kestrel } diff --git a/MOD/Witcher/history/titles/c_tiga.txt b/MOD/Witcher/history/titles/c_tiga.txt index 36b079b7e..cc7d1045f 100644 --- a/MOD/Witcher/history/titles/c_tiga.txt +++ b/MOD/Witcher/history/titles/c_tiga.txt @@ -4,5 +4,5 @@ law = succ_gavelkind } 800.1.1={ - liege=d_kaer_morhen + liege=d_ard_kestrel } diff --git a/MOD/Witcher/history/titles/c_turiac.txt b/MOD/Witcher/history/titles/c_turiac.txt index fe6fc157a..059622495 100644 --- a/MOD/Witcher/history/titles/c_turiac.txt +++ b/MOD/Witcher/history/titles/c_turiac.txt @@ -4,5 +4,5 @@ law = succ_gavelkind } 800.1.1={ - liege=d_armeria + liege=d_kagen } diff --git a/MOD/Witcher/history/titles/c_zurbarran.txt b/MOD/Witcher/history/titles/c_zurbarran.txt index 5fb7654e1..39ef5a384 100644 --- a/MOD/Witcher/history/titles/c_zurbarran.txt +++ b/MOD/Witcher/history/titles/c_zurbarran.txt @@ -7,7 +7,7 @@ } 1025.1.1={holder=121500} #Antoine[24007] -1027.03.06={holder=121502} #Gaucher[24007] +1057.03.06={holder=121502} #Gaucher[24007] 1099.08.16={holder=121506} #Centule[24007] 1098.12.07={holder=121508} #Philippe[24007] 1122.04.15={holder=121514} #Raynaud[24007] diff --git a/MOD/Witcher/history/titles/d_ard_kestrel.txt b/MOD/Witcher/history/titles/d_ard_kestrel.txt index 5e7442183..8faf9b815 100644 --- a/MOD/Witcher/history/titles/d_ard_kestrel.txt +++ b/MOD/Witcher/history/titles/d_ard_kestrel.txt @@ -1,8 +1,21 @@ -# e_kaedwen 500.1.1={ law = agnatic_succession law = succ_gavelkind } -800.1.1={ +1080.1.1={ liege=e_kaedwen } + +1025.1.1={holder=18400} #Ankip[4057] +1060.06.16={holder=18401} #Demid[4057] +1078.09.24={holder=18407} #Bezperst[4057] +1116.11.24={holder=18411} #Velimir[4057] +1170.09.24={holder=18412} #Chernek[4057] +1179.08.28={holder=18415} #Stepan[4057] +1202.06.27={holder=18419} #Baatyr[4057] +1234.04.01={holder=18422} #Iar[4057] +1279.09.19={holder=18425} #Mitrofan[4057] +1290.03.30={holder=18426} #Dilhomil[4057] +1326.05.16={holder=18430} #Pavel[4057] +1373.03.15={holder=18433} #Libomir[4057] +1371.04.14={holder=18437} #Sviatogor[4057] \ No newline at end of file diff --git a/MOD/Witcher/history/titles/d_kaer_morhen.txt b/MOD/Witcher/history/titles/d_kaer_morhen.txt deleted file mode 100644 index 223fb0e95..000000000 --- a/MOD/Witcher/history/titles/d_kaer_morhen.txt +++ /dev/null @@ -1,21 +0,0 @@ -500.1.1={ - law = agnatic_succession - law = succ_gavelkind -} -1080.1.1={ - liege=e_kaedwen -} - -1025.1.1={holder=18400} #Ankip[4057] -1060.06.16={holder=18401} #Demid[4057] -1078.09.24={holder=18407} #Bezperst[4057] -1116.11.24={holder=18411} #Velimir[4057] -1170.09.24={holder=18412} #Chernek[4057] -1179.08.28={holder=18415} #Stepan[4057] -1202.06.27={holder=18419} #Baatyr[4057] -1234.04.01={holder=18422} #Iar[4057] -1279.09.19={holder=18425} #Mitrofan[4057] -1290.03.30={holder=18426} #Dilhomil[4057] -1326.05.16={holder=18430} #Pavel[4057] -1373.03.15={holder=18433} #Libomir[4057] -1371.04.14={holder=18437} #Sviatogor[4057] \ No newline at end of file diff --git a/MOD/Witcher/history/titles/d_kagen.txt b/MOD/Witcher/history/titles/d_kagen.txt index 2069cfaf1..cf9f40be3 100644 --- a/MOD/Witcher/history/titles/d_kagen.txt +++ b/MOD/Witcher/history/titles/d_kagen.txt @@ -4,5 +4,19 @@ law = succ_gavelkind } 800.1.1={ - liege=k_upper_sodden + liege=e_sodden } + +1025.1.1={holder=28400} #Bolo[1504] +1053.07.30={holder=28403} #Adaloald[1504] +1088.04.11={holder=28406} #Erchempert[1504] +1099.05.25={holder=28408} #Nordepert[1504] +1150.04.27={holder=28416} #Pandenulf[1504] +1171.06.10={holder=28418} #Godepert[1504] +1217.08.11={holder=28420} #Gundo[1504] +1237.12.06={holder=28423} #Ago[1504] +1270.11.03={holder=28425} #Ferdulf[1504] +1289.08.26={holder=28431} #Zotto[1504] +1329.05.24={holder=28432} #Wechtar[1504] +1349.12.24={holder=28437} #Thrasimund[1504] +1387.11.01={holder=28440} #Theotpert[1504] \ No newline at end of file diff --git a/MOD/Witcher/history/titles/d_malleore.txt b/MOD/Witcher/history/titles/d_malleore.txt index ca10f5651..23b454f03 100644 --- a/MOD/Witcher/history/titles/d_malleore.txt +++ b/MOD/Witcher/history/titles/d_malleore.txt @@ -9,7 +9,7 @@ holder=97601 #Wiestard } 1202.1.1={ - holder=97602 #Ryngold + holder=97602 #Kerstigens } 1215.1.1={ liege=0 diff --git a/MOD/Witcher/history/titles/d_zurbarran.txt b/MOD/Witcher/history/titles/d_zurbarran.txt index 8f680b296..f7c67f193 100644 --- a/MOD/Witcher/history/titles/d_zurbarran.txt +++ b/MOD/Witcher/history/titles/d_zurbarran.txt @@ -6,7 +6,7 @@ liege=k_toussaint } -1025.1.1={holder=121500} #Antoine[24007] +1057.1.1={holder=121500} #Antoine[24007] 1027.03.06={holder=121502} #Gaucher[24007] 1099.08.16={holder=121506} #Centule[24007] 1098.12.07={holder=121508} #Philippe[24007] diff --git a/MOD/Witcher/interface/portrait_properties.txt b/MOD/Witcher/interface/portrait_properties.txt index a719756b0..7ea934da1 100644 --- a/MOD/Witcher/interface/portrait_properties.txt +++ b/MOD/Witcher/interface/portrait_properties.txt @@ -6,7 +6,7 @@ factor = 1 modifier = { factor = 0 - NOT = { religion_group = christian } + NOT = { religion_group = northern_religions } } } @@ -78,7 +78,7 @@ factor = 1 modifier = { factor = 0 - NOT = { religion_group = pagan_group } + NOT = { religion_group = northern_religions } } } 8 = { # Gallows @@ -88,7 +88,7 @@ factor = 100 modifier = { factor = 0 - NOT = { religion_group = christian } + NOT = { religion_group = northern_religions } } modifier = { factor = 0 @@ -148,18 +148,18 @@ } } 15 = { # Muslim interior 2 - factor = 1 - modifier = { + # factor = 1 + # modifier = { factor = 0 - NOT = { religion_group = muslim } - } + # NOT = { religion_group = muslim } + # } } 16 = { # Mongol camp 1 factor = 1 modifier = { factor = 0 - NOT = { culture = mongol } + NOT = { culture = haak } } } @@ -167,7 +167,7 @@ factor = 1 modifier = { factor = 0 - NOT = { culture = mongol } + NOT = { culture = haak } } } @@ -204,7 +204,7 @@ factor = 1 modifier = { factor = 0 - NOT = { religion_group = pagan_group } + NOT = { religion_group = northern_religions } } } } @@ -349,7 +349,7 @@ modifier = { factor = 0 is_female = no - NOT = { religion_group = christian } + NOT = { religion_group = northern_religions } } modifier = { factor = 0 @@ -441,7 +441,7 @@ factor = 1 modifier = { factor = 5 - religion_group = pagan_group + religion_group = northern_religions } # Does not suit Western females with African style headgear @@ -467,7 +467,7 @@ modifier = { factor = 5 - religion_group = pagan_group + religion_group = northern_religions } # Does not suit Western females with African style headgear @@ -616,6 +616,10 @@ NOT = { spouse = { real_tier = baron } } NOT = { has_minor_title = title_prince } } + modifier = { + factor = 10 + trait = sorcerer + } } 4 = { # Noble clothes 2 @@ -637,6 +641,10 @@ NOT = { spouse = { real_tier = baron } } NOT = { has_minor_title = title_prince } } + modifier = { + factor = 10 + trait = sorcerer + } } 5 = { # Noble clothes 3 @@ -658,6 +666,10 @@ NOT = { spouse = { real_tier = baron } } NOT = { has_minor_title = title_prince } } + modifier = { + factor = 10 + trait = sorcerer + } } 6 = { # Modest clothes 1 @@ -678,7 +690,7 @@ factor = 10 is_ruler = yes is_theocracy = yes - religion_group = pagan_group + religion_group = northern_religions } } 7 = { # Modest clothes 2 @@ -984,7 +996,7 @@ factor = 10 is_ruler = yes is_theocracy = yes - religion_group = pagan_group + religion_group = northern_religions } } @@ -1077,6 +1089,7 @@ graphical_culture = elvengfx graphical_culture = celticgfx trait = witcher + trait = sorcerer } } modifier = { @@ -1122,6 +1135,10 @@ spouse = { real_tier = duke } } } + modifier = { + factor = 10 + trait = sorcerer + } } } diff --git a/MOD/Witcher/localisation/0_Barony_names.csv b/MOD/Witcher/localisation/0_Barony_names.csv index 86cd0f983..33991a0d4 100644 --- a/MOD/Witcher/localisation/0_Barony_names.csv +++ b/MOD/Witcher/localisation/0_Barony_names.csv @@ -3953,6 +3953,8 @@ b_orgibet_2;Orgibet;Orgibet;Orgibet;;Orgibet;;;;;;;;;x b_orgibet_2_adj;Orgibetian;;orgibeter;;;;;;;;;;;x b_orgibet_3;Orgibet;Orgibet;Orgibet;;Orgibet;;;;;;;;;x b_orgibet_3_adj;Orgibetian;;orgibeter;;;;;;;;;;;x +b_orgibet_4;Orgibet;Orgibet;Orgibet;;Orgibet;;;;;;;;;x +b_orgibet_4_adj;Orgibetian;;orgibeter;;;;;;;;;;;x b_orgovany;Orgovány;Orgovány;Orgovány;;Orgovány;;;;;;;;;x b_orgovany_adj;Orgovánian;;orgováner;;;;;;;;;;;x b_ornas;Ornas;Ornas;Ornas;;Ornas;;;;;;;;;x diff --git a/MOD/Witcher/localisation/W_artifact_events.csv b/MOD/Witcher/localisation/W_artifact_events.csv index d4763d9f8..4a4c72869 100644 --- a/MOD/Witcher/localisation/W_artifact_events.csv +++ b/MOD/Witcher/localisation/W_artifact_events.csv @@ -143,7 +143,7 @@ EVTOPTAartifact.1063;Only the best armour for me.;;;;;;;;;;;;;x EVTDESCartifact.1064;Even the best blacksmiths couldn't repair the Raven's armour. The armour somehow holds together and is pretty to look at, but you doubt it will do any good in real combat.;;;;;;;;;;;;;x EVTOPTAartifact.1064;I just wasted gold.;;;;;;;;;;;;;x EVTDESCartifact.1070;After hearing rumours about an old fortune-teller, you decided to visit her. Much to your surprise you were expected. When you asked how the fortune-teller knew that you would come she revealed that she owns a Nehalenias' Mirror and she can sell it to you if you wish.;;;;;;;;;;;;;x -EVTOPTAartifact.1070;If you really have a Nehalenias' Mirror of course I will buying it.;;;;;;;;;;;;;x +EVTOPTAartifact.1070;If you really have a Nehalenia's Mirror of course I will buying it.;;;;;;;;;;;;;x EVTOPTBartifact.1070;Seems a bit shady.;;;;;;;;;;;;;x EVTDESCartifact.1080;A guard informs you - there is an old shady man, who wishes to meet you. After deciding that it's most likely something important, he is brought to you. The old man presents himself as an "trader of information" that wishes to retire, but before he can do so, he wishes to entrust someone a Seeing Stone hw owns, for price of course.;;;;;;;;;;;;;x EVTOPTAartifact.1080;A Seeing Stone is pretty useful thing to have.;;;;;;;;;;;;;x diff --git a/MOD/Witcher/map/provinceDef.xls b/MOD/Witcher/map/provinceDef.xls index df3bd9172b7f769edb91ea365df2e6c65a3bd864..e25526c1b1d4e2aecd8b395d328aa6e3e3efa918 100644 GIT binary patch delta 863 zcmZ9KTS!z<6o%K@XOEW|XPj|n&T%rF(EaSLS8Zzdo$@GDwP;n zKDex-R?40HcYjHU8iI5q8{8mcc@t@>dKt+^!tzMTi|nD0qwD z_=6A;&EP@~gO*YTnN19gy$n8&FsOgc;NUES%V7fSkOkP4DZtAj0p_X&xY{bfm`{L| zdjdRuCcvQ&0*o>a(@qXu>p7g=qSSbKzS>!WCq&CU7{Lx^xP*JPX{k~jKH)lyT!mjx z;sDcOQ~)Y>&fqPbtqm}>v;jY&4x#(spjy=vies=W)Pk z2P;6ice7mPO-+-_lC(4-RS9XqcD+}OZZFaHN4?&HkuGzg8=#hP9D*TeQ=j&uxfo~F zSHIBZ!d`X8&P<4X>b!&5?#FZ?G@r`u*8U_>k7?N&fsAYpi<3Ey2Jk5<<7^}LD2K;c zl&uGuwkMBt%>+L5wYH8kwRK$BT`Pn_kn&jG^s_22PR|+p(ll=5a-$%KZvLzo?=={0lkNQo= zZ0Mr?)5P0Dv!lyZ{{zhiX>MATE1H!38p9%8EPjpF5@tW8E}d3vH7Xw9_6r zfKECmufRBJb1Ilj%VjT3S8Q&po;Lc9z#3he0me_-s8CVRMkd8a2b6qzrX<+^Yn~8& zu6Ueiq2IFXK&cRTt;;c-uU0X)tG@w=_@|oR^WErJ7o>%@~y)OKWFaFvXoz>;b4|0{fvKj%as# zFlh@8X^+06+l`&t2PZQlp45K0m}4Nl3n9EWbV`4GrcvjIbOL!H0ly#-cA*3jH89L( zVz;_+m`!nXBh$ao4Z|}-1S732!%S-#=Bui$HM$kjU4RX+jjJE?glp<1eg*_M^j|y` uY{2W7q}vE}OjnX>3yNYa(kg>O