From c8f13ac04c02356705332228625709b6da0ba9dc Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Mon, 25 Oct 2021 19:06:07 +0900 Subject: [PATCH 01/19] :memo: Update readme v0.6.3 --- descriptor.mod | 2 +- readme.steam.en.txt | 4 ++-- readme.steam.ja.txt | 2 +- readme.steam.zh-cn.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/descriptor.mod b/descriptor.mod index ddf3881..742eec1 100644 --- a/descriptor.mod +++ b/descriptor.mod @@ -1,4 +1,4 @@ -version="0.6.0" +version="0.6.3" tags={ "Map" "Historical" diff --git a/readme.steam.en.txt b/readme.steam.en.txt index 9785b7d..c5e4e2e 100644 --- a/readme.steam.en.txt +++ b/readme.steam.en.txt @@ -1,6 +1,6 @@ -Shogunate Map alteration Sub-MOD beta Version 0.6.2 'Benkei' +Shogunate Map alteration Sub-MOD beta Version 0.6.3 'Benkei' -[h1]Shogunate Map alteration Sub-MOD beta Version 0.6.0 'Benkei'[/h1] +[h1]Shogunate Map alteration Sub-MOD beta Version 0.6 'Benkei'[/h1] ==== Shogunate Map alteration sub MOD is a submod of the Shogunate mod. It replaces the map with a high-resolution one and increases the Provence-Baron territory. diff --git a/readme.steam.ja.txt b/readme.steam.ja.txt index e68458b..f4f3bb7 100644 --- a/readme.steam.ja.txt +++ b/readme.steam.ja.txt @@ -1,4 +1,4 @@ -Shogunate 地図改変サブ MOD 日本語 ベータ版 Version 0.6.2 'Benkei' +Shogunate 地図改変サブ MOD 日本語 ベータ版 Version 0.6.3 'Benkei' [h1]Shogunate 地図改変サブ MOD 日本語 ベータ版 Version 0.6 'Benkei'[/h1] ==== diff --git a/readme.steam.zh-cn.txt b/readme.steam.zh-cn.txt index be4a4df..9236f47 100644 --- a/readme.steam.zh-cn.txt +++ b/readme.steam.zh-cn.txt @@ -1,4 +1,4 @@ -幕府地图的更改副MODbeta版0.6.2'办庆' +幕府地图的更改副MODbeta版0.6.3'办庆' [h1]Shogunate Map alteration Sub-MOD beta Version 0.6 'Benkei'[/h1] 幕府地图的更改副MOD是幕府mod的一个副mod。 From c345c07462437e0f2ce475d41c68b20e696ec640 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Mon, 25 Oct 2021 20:20:25 +0900 Subject: [PATCH 02/19] add House MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Issue #311 Hatta キャラクターデータ更新 - 八田知家の四男・宍戸家政に殺害者:朝比奈義秀を設定。 --- .../coat_of_arms/shgnt_dynasties.txt | 135 ++++++++++++++++++ .../dynasty_houses/shgnt_dynasty_houses.txt | 73 +++++++++- common/named_colors/shgnt_colors.txt | 9 +- .../12C-05_northern_kanto_characters.txt | 130 +++++++++++++---- .../characters/eastern_kanto_characters.txt | 60 +++++--- .../shgnt_dynasty_names_l_english.yml | 17 ++- .../shgnt_dynasty_names_l_english.yml | 17 ++- .../japanese/shgnt_mottos_l_english.yml | 32 ++--- 8 files changed, 404 insertions(+), 69 deletions(-) diff --git a/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt b/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt index ac0e980..6b0bd1d 100644 --- a/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt +++ b/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt @@ -4357,4 +4357,139 @@ house_shgnt_ashina_inawashiro={ #Inawashiro color1 = "shiro" instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } } +} +10007007 = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "kuro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "shiro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_oda = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "shiro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_ishira = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "aka_iro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_motegi = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "ki_iro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_shishido = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "midori_iro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_asaba = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "ao_iro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_tanaka = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "murasaki" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_takano = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "daidai_iro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_chujo = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "kimidori" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_chuzenji = { # 三つ巴、中禅寺の破風の写真から + pattern = "pattern_solid.dds" + color1 = "asagi_iro" + colored_emblem = { + texture = "ce_tomoe_cc_18.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_okami = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "kon_iro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "hai_iro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_teno = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "shikon" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "shiro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_hojo = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "koikurenai" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "shiro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_tamiya = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "kikuchiba_iro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_hatta_kodaka = { # 洲浜 + pattern = "pattern_solid.dds" + color1 = "hanarokusho_iro" + colored_emblem = { + texture = "ce_suhame_cc_1.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } } \ No newline at end of file diff --git a/common/dynasty_houses/shgnt_dynasty_houses.txt b/common/dynasty_houses/shgnt_dynasty_houses.txt index 3d4ba50..c17846f 100644 --- a/common/dynasty_houses/shgnt_dynasty_houses.txt +++ b/common/dynasty_houses/shgnt_dynasty_houses.txt @@ -2240,5 +2240,76 @@ house_shgnt_ashina_tomita={ house_shgnt_ashina_inawashiro={ name="dynn_Inawashiro" # 猪苗代 dynasty=10000070 # Ashina - motto="kotowaza_050_motto" + motto="kotowaza_051_motto" +} +# Hatta, 八田; Oda, 小田 +house_shgnt_hatta_oda={ + name="dynn_Oda1" # 小田 + dynasty=10007007 # Hatta + motto="kotowaza_052_motto" +} +house_shgnt_hatta_ishira={ + name="dynn_Ishira" # 伊志良 + dynasty=10007007 # Hatta + motto="kotowaza_053_motto" +} +house_shgnt_hatta_motegi={ + name="dynn_Motegi" # 茂木 + dynasty=10007007 # Hatta + motto="kotowaza_054_motto" +} +house_shgnt_hatta_shishido={ + name="dynn_Shishido" # 宍戸 + dynasty=10007007 # Hatta + motto="kotowaza_055_motto" +} +house_shgnt_hatta_asaba={ + name="dynn_Asaba" # 浅羽 + dynasty=10007007 # Hatta + motto="kotowaza_056_motto" +} +house_shgnt_hatta_tanaka={ + name="dynn_Tanaka" # 田中 + dynasty=10007007 # Hatta + motto="kotowaza_057_motto" +} +house_shgnt_hatta_takano={ + name="dynn_Takano" # 高野 + dynasty=10007007 # Hatta + motto="kotowaza_058_motto" +} +house_shgnt_hatta_chujo={ + name="dynn_Chujo" # 中条 + dynasty=10007007 # Hatta + motto="kotowaza_059_motto" +} +house_shgnt_hatta_chuzenji={ + name="dynn_Chuzenji" # 中禅寺 + dynasty=10007007 # Hatta + motto="kotowaza_060_motto" +} +house_shgnt_hatta_okami={ + name="dynn_Okami" # 岡見 + dynasty=10007007 # Hatta + motto="kotowaza_061_motto" +} +house_shgnt_hatta_teno={ + name="dynn_Teno1" # 手野 + dynasty=10007007 # Hatta + motto="kotowaza_062_motto" +} +house_shgnt_hatta_hojo={ + name="dynn_Hojo" # 北条 + dynasty=10007007 # Hatta + motto="kotowaza_062_motto" +} +house_shgnt_hatta_tamiya={ + name="dynn_Tamiya" # 田宮 + dynasty=10007007 # Hatta + motto="kotowaza_064_motto" +} +house_shgnt_hatta_kodaka={ + name="dynn_Kodaka" # 小高 + dynasty=10007007 # Hatta + motto="kotowaza_065_motto" } \ No newline at end of file diff --git a/common/named_colors/shgnt_colors.txt b/common/named_colors/shgnt_colors.txt index bf6995c..93779d9 100644 --- a/common/named_colors/shgnt_colors.txt +++ b/common/named_colors/shgnt_colors.txt @@ -17,6 +17,7 @@ colors = { aomidori_iro = hsv360 { 175 100 64 } aotake_iro = hsv360 { 162 34 75 } # 青竹色 asabeni = hsv360 { 352 34 95 } + asagi_iro = hsv360 { 184 100 69 } # 浅葱色 asamurasaki = hsv360 { 309 17 77 } # 浅紫 awabenifuji = hsv360 { 307 11 90 } awafuji_iro = hsv360 { 222 19 90 } @@ -33,9 +34,10 @@ colors = { enji_iro = hsv360 { 357 65 73 } # えんじ色 fujimurasaki = hsv360 { 254 24 79 } futaai = hsv360 { 307 37 57 } + hai_iro = hsv360 { 0 0 49 } # 灰色 hajizome = hsv360 { 42 79 85 } # 櫨染 hanada_iro = hsv360 { 199 80 76 } - hanarokusho_iro = hsv360 { 167 100 64 } + hanarokusho_iro = hsv360 { 167 100 64 } # 花緑青 himawari_iro = hsv360 { 48 100 99 } hisui_iro = hsv360 { 160 69 71 } ikkonzome = hsv360 { 16 38 96 } @@ -53,13 +55,16 @@ colors = { kihada_iro = hsv360 { 55 61 100 } kikuchiba_iro = hsv360 { 40 68 83 } # 黄朽葉色 kijujin = hsv360 { 78 30 47 } # 麹塵 + kimidori = hsv360 { 67 100 82 } # 黄緑 kitsurubami = hsv360 { 37 58 72 } # 黄橡 kinaka = hsv360 { 21 97 92 } # 金赤 kobai_iro = hsv360 { 359 34 95 } # 紅梅色 kogareko = hsv360 { 25 49 68 } # 焦香 koiai = hsv360 { 222 81 31 } + koikurenai = hsv360 { 222 81 31 } # 濃紅 kokihanada = hsv360 { 222 63 45 } # 深縹色 kokutan = hsv360 { 21 100 15 } + kon_iro = hsv360 { 222 70 44 } # 紺色 konpeki_iro = hsv360 { 201 100 73 } konruri = hsv360 { 212 83 52 } konjiki = hsv360 { 45 85 90 } # 金色 @@ -111,7 +116,7 @@ colors = { seiheki = hsv360 { 181 46 52 } seiran = hsv360 { 214 68 47 } shikoku = hsv360 { 283 15 19 } - shikon = hsv360 { 302 80 27 } + shikon = hsv360 { 302 80 27 } # 紫紺 shinku = hsv360 { 345 80 64 } shiraai = hsv360 { 188 17 91 } # 白藍 shirafuji = hsv360 { 270 10 90 } diff --git a/history/characters/12C-05_northern_kanto_characters.txt b/history/characters/12C-05_northern_kanto_characters.txt index cd8cf47..89cdc84 100644 --- a/history/characters/12C-05_northern_kanto_characters.txt +++ b/history/characters/12C-05_northern_kanto_characters.txt @@ -3224,7 +3224,8 @@ birth=yes } 1222.1.1={ - dynasty=10000104 # Oda + #dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" } 1228.1.1 ={ death=yes @@ -3239,6 +3240,9 @@ 1166.1.1={ birth=yes } + 1196.01.01={ + dynasty_house="house_shgnt_hatta_ishira" + } 1216.1.1={ death=yes } @@ -3252,6 +3256,9 @@ 1169.1.1 ={ birth=yes } + 1199.01.01={ + dynasty_house="house_shgnt_hatta_motegi" + } 1219.1.1={ death=yes } @@ -3265,9 +3272,13 @@ 1188.1.1={ birth=yes } + 1208.01.01={ + dynasty_house="house_shgnt_hatta_shishido" + } 1213.5.3={ death={ death_reason=death_battle + killer=12211512 # Asahina Yoshihide, 朝比奈義秀 } } } @@ -3293,6 +3304,9 @@ 1192.1.1={ birth=yes } + 1212.01.01={ + dynasty_house="house_shgnt_hatta_asaba" + } 1221.7.5={ death={ death_reason=death_battle @@ -3308,6 +3322,9 @@ 1194.1.1={ birth=yes } + 1224.01.01={ + dynasty_house="house_shgnt_hatta_tanaka" + } 1244.1.1={ death=yes } @@ -3321,6 +3338,9 @@ 1196.1.1={ birth=yes } + 1226.01.01={ + dynasty_house="house_shgnt_hatta_takano" + } 1246.1.1={ death=yes } @@ -3334,6 +3354,9 @@ 1198.1.1={ birth=yes } + 1228.01.01={ + dynasty_house="house_shgnt_hatta_chujo" + } 1248.1.1={ death=yes } @@ -3348,13 +3371,20 @@ 1200.1.1={ birth=yes } + 1210.01.01={ + culture="kanto_buddhist" + } + 1230.01.01={ + dynasty_house="house_shgnt_hatta_chuzenji" + } 1250.1.1={ death=yes } } 12127510={ name=character_name_12127510 # Yasutomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127500 # Oda Tomoshige religion="shinto" culture="northern_kanto" @@ -3367,7 +3397,8 @@ } 12127520={ name=character_name_12127520 # Tokitomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127510 # Oda Yasutomo religion="shinto" culture="northern_kanto" @@ -3380,7 +3411,8 @@ } 12127530={ name=character_name_12127530 # Munetomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127520 # Oda Tokitomo religion="shinto" culture="northern_kanto" @@ -3393,20 +3425,25 @@ } 12127531={ name=character_name_12127531 # Michitomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127520 # Oda Tokitomo religion="shinto" culture="northern_kanto" 1260.1.1={ birth=yes } + 1290.01.01={ + dynasty_house="house_shgnt_hatta_hojo" + } 1310.1.1={ death=yes } } 12127540={ name=character_name_12127540 # Naotomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127530 # Oda Munetomo religion="shinto" culture="northern_kanto" @@ -3419,7 +3456,8 @@ } 12127541={ name=character_name_12127541 # Sadatomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127530 # Oda Munetomo religion="shinto" culture="northern_kanto" @@ -3432,20 +3470,25 @@ } 12127542={ name=character_name_12127542 # Tomosada - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127530 # Oda Munetomo religion="shinto" culture="northern_kanto" 1288.1.1={ birth=yes } + 1318.01.01={ + dynasty_house="house_shgnt_hatta_teno" + } 1338.1.1={ death=yes } } 12127543={ name=character_name_12127543 # Sadauji - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127530 # Oda Munetomo religion="shinto" culture="northern_kanto" @@ -3458,7 +3501,8 @@ } 12127550={ name=character_name_12127550 # Haruhisa - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127541 # Oda Sadatomo religion="shinto" culture="northern_kanto" @@ -3471,7 +3515,8 @@ } 12127560={ name=character_name_12127560 # Takatomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa religion="shinto" culture="northern_kanto" @@ -3484,20 +3529,25 @@ } 12127562={ name=character_name_12127562 # Tomomura - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa religion="shinto" culture="northern_kanto" 1345.1.1={ birth=yes } + 1375.01.01={ + dynasty_house="house_shgnt_hatta_tamiya" + } 1395.1.1={ death=yes } } 12127563={ name=character_name_12127563 # Tomoshige - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa religion="shinto" culture="northern_kanto" @@ -3510,33 +3560,42 @@ } 12127564={ name=character_name_12127564 # Tomohide - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa religion="shinto" culture="northern_kanto" 1349.1.1={ birth=yes } + 1379.01.01={ + dynasty_house="house_shgnt_hatta_kodaka" + } 1399.1.1={ death=yes } } 12127565={ name=character_name_12127565 # Kunitomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa religion="shinto" culture="northern_kanto" 1350.1.1={ birth=yes } + 1370.01.01={ + dynasty_house="house_shgnt_hatta_okami" + } 1400.1.1={ death=yes } } 12127570={ name=character_name_12127570 # Harutomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127560 # Oda Takatomo religion="shinto" culture="northern_kanto" @@ -3549,7 +3608,8 @@ } 12127580={ name=character_name_12127580 # Kunihisa - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=12127565 # Oda Kunitomo religion="shinto" culture="northern_kanto" @@ -3562,7 +3622,8 @@ } 12127581={ name=character_name_12127581 # Haruyori - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=12127580 # Oda Kunihisa religion="shinto" culture="northern_kanto" @@ -3575,7 +3636,8 @@ } 12127582={ name=character_name_12127582 # Yorihisa - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=12127581 # Oda Haruyori religion="shinto" culture="northern_kanto" @@ -3588,7 +3650,8 @@ } 12127583={ name=character_name_12127583 # Haruchika - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=12127582 # Oda Yorihisa religion="shinto" culture="northern_kanto" @@ -3601,7 +3664,8 @@ } 12127584={ name=character_name_12127584 # Muneharu - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=12127583 # Oda Haruchika religion="shinto" culture="northern_kanto" @@ -3614,7 +3678,8 @@ } 12127700={ name=character_name_12127700 # Iechika - dynasty=10007005 # Shishido + #dynasty=10007005 # Shishido + dynasty_house="house_shgnt_hatta_shishido" father=12127503 # Shishido Iemasa religion="shinto" culture="northern_kanto" @@ -3627,7 +3692,8 @@ } 12127705={ name=character_name_12127705 # Iemune - dynasty=10007005 # Shishido +# dynasty=10007005 # Shishido + dynasty_house="house_shgnt_hatta_shishido" father=12127700 # Shishido Iechika religion="shinto" culture="northern_kanto" @@ -3640,7 +3706,8 @@ } 12127706={ name=character_name_12127706 # Ieuji - dynasty=10007005 # Shishido +# dynasty=10007005 # Shishido + dynasty_house="house_shgnt_hatta_shishido" father=12127700 # Shishido Iechika religion="shinto" culture="northern_kanto" @@ -3653,7 +3720,8 @@ } 12127710={ name=character_name_12127710 # Ietoki - dynasty=10007005 # Shishido +# dynasty=10007005 # Shishido + dynasty_house="house_shgnt_hatta_shishido" father=12127705 # Shishido Iemune religion="shinto" culture="northern_kanto" @@ -3666,7 +3734,8 @@ } 12127711={ name=character_name_12127711 # Tomomune - dynasty=10007005 # Shishido +# dynasty=10007005 # Shishido + dynasty_house="house_shgnt_hatta_shishido" father=12127705 # Shishido Iemune religion="shinto" culture="northern_kanto" @@ -3679,7 +3748,8 @@ } 12127715={ name=character_name_12127715 # Tomotoki - dynasty=10007005 # Shishido +# dynasty=10007005 # Shishido + dynasty_house="house_shgnt_hatta_shishido" father=12127710 # Shishido Ietoki religion="shinto" culture="northern_kanto" @@ -3692,7 +3762,8 @@ } 12127716={ name=character_name_12127716 # Ieyoshi - dynasty=10007005 # Shishido +# dynasty=10007005 # Shishido + dynasty_house="house_shgnt_hatta_shishido" father=12127710 # Shishido Ietoki religion="shinto" culture="northern_kanto" @@ -3705,7 +3776,8 @@ } 12127720={ name=character_name_12127720 # Tomosato - dynasty=10007005 # Shishido +# dynasty=10007005 # Shishido + dynasty_house="house_shgnt_hatta_shishido" father=12127715 # Shishido Tomotoki religion="shinto" culture="northern_kanto" diff --git a/history/characters/eastern_kanto_characters.txt b/history/characters/eastern_kanto_characters.txt index 04c1fd7..471cee8 100644 --- a/history/characters/eastern_kanto_characters.txt +++ b/history/characters/eastern_kanto_characters.txt @@ -1121,7 +1121,8 @@ 10010206 = { name=character_name_10010206 # Mochiko female=yes - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010406 religion="shinto" culture="northern_kanto" @@ -1859,7 +1860,8 @@ } 10010401 = { name=character_name_10010401 # Masaharu - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010403 # Oda Shigeharu religion="shinto" culture="northern_kanto" @@ -1886,7 +1888,8 @@ } 10010402 = { name=character_name_10010402 # Ujiharu,氏治 - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010401 diplomacy=8 martial=8 @@ -1917,7 +1920,8 @@ } 10010403 = { name=character_name_10010403 # Shigeharu - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010405 religion="shinto" culture="northern_kanto" @@ -1936,7 +1940,8 @@ 10010404 = { name=character_name_10010404 # Haruko female=yes - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010403 religion="shinto" culture="northern_kanto" @@ -1949,7 +1954,8 @@ } 10010405 = { name=character_name_10010405 # Tomohisa - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010406 religion="shinto" culture="northern_kanto" @@ -1962,7 +1968,8 @@ } 10010406 = { name=character_name_10010406 # Mochiie,持家 - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=12127570 # Oda Harutomo religion="shinto" culture="northern_kanto" @@ -1978,7 +1985,8 @@ } 10010407 = { name=character_name_10010407 # Harutaka - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010403 religion="shinto" culture="northern_kanto" @@ -1991,7 +1999,8 @@ } 10010408 = { name=character_name_10010408 # Akiie - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010403 religion="shinto" culture="northern_kanto" @@ -2005,7 +2014,8 @@ 10010409 = { name=character_name_10010409 # Nariko female=yes - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010403 religion="shinto" culture="northern_kanto" @@ -2018,7 +2028,8 @@ } 10010410 = { name=character_name_10010410 # Tomoharu - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010402 religion="shinto" culture="northern_kanto" @@ -2031,7 +2042,8 @@ } 10010411 = { name=character_name_10010411 # Moriharu - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010402 religion="shinto" culture="northern_kanto" @@ -2044,7 +2056,8 @@ } 10010412 = { name=character_name_10010412 # Yoshiharu - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010410 religion="shinto" culture="northern_kanto" @@ -2057,7 +2070,8 @@ } 10010413 = { name=character_name_10010413 # Tomoshige - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010410 religion="shinto" culture="northern_kanto" @@ -2070,7 +2084,8 @@ } 10010414={ name=character_name_10010414 # Yoshiharu - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=10010403 # religion="shinto" culture="northern_kanto" @@ -2083,7 +2098,8 @@ } 10010415={ name=character_name_10010415 # Yoshitsuna - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=10010414 # religion="shinto" culture="northern_kanto" @@ -2096,7 +2112,8 @@ } 10010416={ name=character_name_10010416 # Yoshitomo - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=10010415 # religion="shinto" culture="northern_kanto" @@ -2109,20 +2126,25 @@ } 10010417={ name=character_name_10010417 # Harusuke - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_oda" # Oda father=10010407 # Oda Harutaka religion="shinto" culture="northern_kanto" 1495.1.1={ birth=yes } + 1515.01.01={ + dynasty_house="house_shgnt_hatta_okami" + } 1569.1.1={ death=yes } } 10010418={ name=character_name_10010418 # Haruhiro - dynasty=10000104 # Oda +# dynasty=10000104 # Oda + dynasty_house="house_shgnt_hatta_okami" father=10010417 # Oda Harusuke religion="shinto" culture="northern_kanto" diff --git a/localization/english/dynasties/shgnt_dynasty_names_l_english.yml b/localization/english/dynasties/shgnt_dynasty_names_l_english.yml index cb852a0..d366e92 100644 --- a/localization/english/dynasties/shgnt_dynasty_names_l_english.yml +++ b/localization/english/dynasties/shgnt_dynasty_names_l_english.yml @@ -437,4 +437,19 @@ dynn_Mukunashi:0 "Mukunashi" dynn_Kiryu:0 "Kiryū" # Ashina, 葦名 dynn_Tomita:0 "Tomita" -dynn_Inawashiro:0 "Inawashiro" \ No newline at end of file +dynn_Inawashiro:0 "Inawashiro" +# Hatta,八田 & Oda, 小田 +dynn_Oda1:0 "Oda" +dynn_Ishira:0 "Ishira" +dynn_Motegi:0 "Motegi" +dynn_Shishido:0 "Shishido" +dynn_Asaba:0 "Asaba" +dynn_Tanaka:0 "Tanaka" +dynn_Takano:0 "Takano" +dynn_Chujo:0 "Chūjō" +dynn_Chuzenji:0 "Chūzenji" +dynn_Okami:0 "Okami" +dynn_Teno1:0 "Teno" +dynn_Hojo:0 "Hōjō" +dynn_Tamiya:0 "Tamiya" +dynn_Kodaka:0 "Kodaka" \ No newline at end of file diff --git a/localization/japanese/dynasties/shgnt_dynasty_names_l_english.yml b/localization/japanese/dynasties/shgnt_dynasty_names_l_english.yml index b557643..f2683ea 100644 --- a/localization/japanese/dynasties/shgnt_dynasty_names_l_english.yml +++ b/localization/japanese/dynasties/shgnt_dynasty_names_l_english.yml @@ -439,4 +439,19 @@ dynn_Mukunashi:0 "椋梨" dynn_Kiryu:0 "桐生" # Ashina, 葦名 dynn_Tomita:0 "富田" -dynn_Inawashiro:0 "猪苗代" \ No newline at end of file +dynn_Inawashiro:0 "猪苗代" +# Hatta,八田 & Oda, 小田 +dynn_Oda1:0 "小田" +dynn_Ishira:0 "伊志良" +dynn_Motegi:0 "茂木" +dynn_Shishido:0 "宍戸" +dynn_Asaba:0 "浅羽" +dynn_Tanaka:0 "田中" +dynn_Takano:0 "高野" +dynn_Chujo:0 "中条" +dynn_Chuzenji:0 "中禅寺" +dynn_Okami:0 "岡見" +dynn_Teno1:0 "手野" +dynn_Hojo:0 "北条" +dynn_Tamiya:0 "田宮" +dynn_Kodaka:0 "小高" \ No newline at end of file diff --git a/localization/japanese/shgnt_mottos_l_english.yml b/localization/japanese/shgnt_mottos_l_english.yml index 6bd3083..09b17a2 100644 --- a/localization/japanese/shgnt_mottos_l_english.yml +++ b/localization/japanese/shgnt_mottos_l_english.yml @@ -413,22 +413,22 @@ kotowaza_047_motto:0 "石部金吉金兜" kotowaza_048_motto:0 "伊勢は津で持つ、津は伊勢で持つ、尾張名古屋は城で持つ" kotowaza_049_motto:0 "伊勢へ七度熊野へ三度" - kotowaza_050_motto:0 "居候三杯目にはそっと出し" - kotowaza_051_motto:0 "急がば回れ" - kotowaza_052_motto:0 "頂く物は夏も小袖" - kotowaza_053_motto:0 "鼬の最後っ屁" - kotowaza_054_motto:0 "鼬の無き間の貂誇り" - kotowaza_055_motto:0 "一押二金三男" - kotowaza_056_motto:0 "一金二男" - kotowaza_057_motto:0 "一河の流れを汲むも他生の縁" - kotowaza_058_motto:0 "一工面二働" - kotowaza_059_motto:0 "一事が万事" - kotowaza_060_motto:0 "一日の計は晨にあり" - kotowaza_061_motto:0 "一日一善" - kotowaza_062_motto:0 "一人虚を伝うれば万人実を伝う" - kotowaza_062_motto:0 "一人当千" - kotowaza_064_motto:0 "一念岩をも通す" - kotowaza_065_motto:0 "一念天に通ず" + kotowaza_050_motto:0 "居候三杯目にはそっと出し" # house_shgnt_ashina_tomita + kotowaza_051_motto:0 "急がば回れ" # house_shgnt_ashina_inawashiro + kotowaza_052_motto:0 "頂く物は夏も小袖" # house_shgnt_hatta_oda + kotowaza_053_motto:0 "鼬の最後っ屁" # house_shgnt_hatta_ishira + kotowaza_054_motto:0 "鼬の無き間の貂誇り" # house_shgnt_hatta_motegi + kotowaza_055_motto:0 "一押二金三男" # house_shgnt_hatta_shishido + kotowaza_056_motto:0 "一金二男" # house_shgnt_hatta_asaba + kotowaza_057_motto:0 "一河の流れを汲むも他生の縁" # house_shgnt_hatta_tanaka + kotowaza_058_motto:0 "一工面二働" # house_shgnt_hatta_takano + kotowaza_059_motto:0 "一事が万事" # house_shgnt_hatta_chujo + kotowaza_060_motto:0 "一日の計は晨にあり" # house_shgnt_hatta_chuzenji + kotowaza_061_motto:0 "一日一善" # house_shgnt_hatta_okami + kotowaza_062_motto:0 "一人虚を伝うれば万人実を伝う" # house_shgnt_hatta_teno + kotowaza_062_motto:0 "一人当千" # house_shgnt_hatta_hojo + kotowaza_064_motto:0 "一念岩をも通す" # house_shgnt_hatta_tamiya + kotowaza_065_motto:0 "一念天に通ず" # house_shgnt_hatta_kodaka kotowaza_066_motto:0 "一年の計は元旦にあり" kotowaza_067_motto:0 "一の裏は六" kotowaza_068_motto:0 "一富士二鷹三茄子" From 610a25aaeb2385552b55e8d1612a096904666cba Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Wed, 27 Oct 2021 20:05:55 +0900 Subject: [PATCH 03/19] Update default.map - fixed #318 - fixed #317 - fixed #316 - fixed #315 - fixed #313 - fixed #312 --- map_data/default.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map_data/default.map b/map_data/default.map index 63a10a2..5c3b4a1 100644 --- a/map_data/default.map +++ b/map_data/default.map @@ -31,7 +31,7 @@ river_provinces = LIST { 3179 } ######## # LAKES ######## -lakes = LIST { 2912 3092 3094 3095 3096 3120 3128 3129 3131 3132 3122 3091 3130 3190 } +lakes = LIST { 2903 2904 2907 2909 2910 2911 2912 3092 3094 3095 3096 3120 3128 3129 3131 3132 3122 3091 3130 3190 } ##################### # IMPASSABLE TERRAIN From 936b95ad3853d984bee1d9364b62baef21dc3f98 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Wed, 27 Oct 2021 20:08:10 +0900 Subject: [PATCH 04/19] Update default.map - fixed #314 --- map_data/default.map | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/map_data/default.map b/map_data/default.map index 5c3b4a1..2de5df7 100644 --- a/map_data/default.map +++ b/map_data/default.map @@ -31,7 +31,7 @@ river_provinces = LIST { 3179 } ######## # LAKES ######## -lakes = LIST { 2903 2904 2907 2909 2910 2911 2912 3092 3094 3095 3096 3120 3128 3129 3131 3132 3122 3091 3130 3190 } +lakes = LIST { 2903 2904 2907 2909 2910 2911 2912 3092 3093 3094 3095 3096 3120 3128 3129 3131 3132 3122 3091 3130 3190 } ##################### # IMPASSABLE TERRAIN @@ -39,7 +39,7 @@ lakes = LIST { 2903 2904 2907 2909 2910 2911 2912 3092 3094 3095 3096 3120 3128 # Can be colored by whoever owns the most of the province's neighbours. # Blocks unit movement. -impassable_mountains = LIST { 365 980 2078 2103 2105 2106 2107 2108 2109 2246 2247 2248 2249 2627 2628 2629 2652 2653 2654 2655 2656 2657 2658 2659 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2851 2857 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2941 2942 3034 3093 3098 3099 3108 3110 3122 3123 3124 3125 3126 3127 3133 3134 3135 3136 3137 3138 3140 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165} +impassable_mountains = LIST { 365 980 2078 2103 2105 2106 2107 2108 2109 2246 2247 2248 2249 2627 2628 2629 2652 2653 2654 2655 2656 2657 2658 2659 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2851 2857 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2941 2942 3034 3098 3099 3108 3110 3122 3123 3124 3125 3126 3127 3133 3134 3135 3136 3137 3138 3140 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165} ############ # WASTELAND From 881881c1e3c4af023d5f60e4eb672f3f0e94f439 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Wed, 27 Oct 2021 20:24:45 +0900 Subject: [PATCH 05/19] :adhesive_bandage: duplicate character Issue #321 --- .../12C-05_northern_kanto_characters.txt | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/history/characters/12C-05_northern_kanto_characters.txt b/history/characters/12C-05_northern_kanto_characters.txt index 89cdc84..bf8fec8 100644 --- a/history/characters/12C-05_northern_kanto_characters.txt +++ b/history/characters/12C-05_northern_kanto_characters.txt @@ -3345,22 +3345,22 @@ death=yes } } -12127508={ - name=character_name_12127508 # Yoshikatsu - dynasty=10007007 # Hatta - father=12130005 # Hatta Tomoie - religion="shinto" - culture="northern_kanto" - 1198.1.1={ - birth=yes - } - 1228.01.01={ - dynasty_house="house_shgnt_hatta_chujo" - } - 1248.1.1={ - death=yes - } -} +#12127508={ # 12205304とキャラクター重複 (Issue #321) +# name=character_name_12127508 # Yoshikatsu +# dynasty=10007007 # Hatta +# father=12130005 # Hatta Tomoie +# religion="shinto" +# culture="northern_kanto" +# 1198.1.1={ +# birth=yes +# } +# 1228.01.01={ +# dynasty_house="house_shgnt_hatta_chujo" +# } +# 1248.1.1={ +# death=yes +# } +#} 12127509={ name=character_name_12127509 # Meigen dynasty=10007007 # Hatta From 283fc806f9eede3849fedd6c8cdc46fddbe5d88f Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Wed, 27 Oct 2021 20:26:50 +0900 Subject: [PATCH 06/19] =?UTF-8?q?:fire:=20=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E5=88=86=E5=AE=B6=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue #311 --- common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt | 9 --------- common/dynasty_houses/shgnt_dynasty_houses.txt | 5 ----- 2 files changed, 14 deletions(-) diff --git a/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt b/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt index 6b0bd1d..a8d8eae 100644 --- a/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt +++ b/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt @@ -4430,15 +4430,6 @@ house_shgnt_hatta_takano = { # 洲浜 instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } } } -house_shgnt_hatta_chujo = { # 洲浜 - pattern = "pattern_solid.dds" - color1 = "kimidori" - colored_emblem = { - texture = "ce_suhame_cc_1.dds" - color1 = "kuro" - instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } - } -} house_shgnt_hatta_chuzenji = { # 三つ巴、中禅寺の破風の写真から pattern = "pattern_solid.dds" color1 = "asagi_iro" diff --git a/common/dynasty_houses/shgnt_dynasty_houses.txt b/common/dynasty_houses/shgnt_dynasty_houses.txt index c17846f..2e7754c 100644 --- a/common/dynasty_houses/shgnt_dynasty_houses.txt +++ b/common/dynasty_houses/shgnt_dynasty_houses.txt @@ -2278,11 +2278,6 @@ house_shgnt_hatta_takano={ dynasty=10007007 # Hatta motto="kotowaza_058_motto" } -house_shgnt_hatta_chujo={ - name="dynn_Chujo" # 中条 - dynasty=10007007 # Hatta - motto="kotowaza_059_motto" -} house_shgnt_hatta_chuzenji={ name="dynn_Chuzenji" # 中禅寺 dynasty=10007007 # Hatta From 30c92796bcecff6490754395eb92e0c8c981c4bd Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Wed, 27 Oct 2021 20:51:17 +0900 Subject: [PATCH 07/19] =?UTF-8?q?=F0=9F=92=A5=20change=20default=20title?= =?UTF-8?q?=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 岩門城に基づき名前変更 - 晴気城に基づき名前変更 - 平安時代からある馬ヶ岳城に基づき名前変更 - holdingをタイプ城としてデフォルト有効化 - 沓尾崎城に基づき名前変更 - 櫛間院に基づき名前変更 - b_shgnt_morokata_2 の名前を三俣院に変更 - b_shgnt_minami_morokata_1 の名前を"救仁院"に変更 - b_shgnt_morokata_6 の名前を真幸院に変更 - 昔からある地名に基づき変更 - 若江城に基づき名前変更 - 堅志田城に基づき名前変更 --- history/provinces/k_shgnt_northern_kyushu.txt | 5 ++++- .../english/shgnt_titles_l_english.yml | 22 +++++++++---------- .../japanese/shgnt_titles_l_english.yml | 22 +++++++++---------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/history/provinces/k_shgnt_northern_kyushu.txt b/history/provinces/k_shgnt_northern_kyushu.txt index 5cf5a8d..9b42c56 100644 --- a/history/provinces/k_shgnt_northern_kyushu.txt +++ b/history/provinces/k_shgnt_northern_kyushu.txt @@ -558,7 +558,10 @@ 2348 = { # Miyako_2 culture = northern_kyushu religion = shinto - holding = none + holding = castle_holding # 馬ヶ岳城 + 942.01.01={ + holding = castle_holding # 馬ヶ岳城 + } } 2349 = { # Nakatsu_1 culture = northern_kyushu diff --git a/localization/english/shgnt_titles_l_english.yml b/localization/english/shgnt_titles_l_english.yml index bf8044a..9b69d9f 100644 --- a/localization/english/shgnt_titles_l_english.yml +++ b/localization/english/shgnt_titles_l_english.yml @@ -92,7 +92,7 @@ b_shgnt_kawachi_1:0 "Mizuhai no Tate" b_shgnt_kawachi_2:0 "Karashima no Maki" b_shgnt_wakae_1:0 "Kawamata Mikuriya" - b_shgnt_wakae_2:0 "Tamagawa" + b_shgnt_wakae_2:0 "Wakae" b_shgnt_wakae_3:0 "Yamamoto" b_shgnt_takayasu_1:0 "Kita Takayasu" b_shgnt_takayasu_2:0 "Minami Takayasu" @@ -2284,7 +2284,7 @@ b_shgnt_chikuzen_naka_1:0 "Hakata" b_shgnt_chikuzen_naka_2:0 "Katakasu" b_shgnt_chikuzen_naka_3:0 "Naka" - b_shgnt_chikuzen_naka_4:0 "Iwado" + b_shgnt_chikuzen_naka_4:0 "Iwato" b_shgnt_sahara_1:0 "Takuma" b_shgnt_sahara_2:0 "Uchino" b_shgnt_sahara_3:0 "Nishijin" @@ -2340,10 +2340,10 @@ b_shgnt_buzen_takawa_3:0 "Ikata" b_shgnt_buzen_takawa_4:0 "Itoda" b_shgnt_miyako_1:0 "Katta" - b_shgnt_miyako_2:0 "Isayama" + b_shgnt_miyako_2:0 "Umagatake" b_shgnt_nakatsu_1:0 "Buzen Kokufu" b_shgnt_nakatsu_2:0 "Imagawa" - b_shgnt_nakatsu_3:0 "Minoshima" + b_shgnt_nakatsu_3:0 "Kutsuozaki" b_shgnt_tsuiki_1:0 "Denpoji" b_shgnt_tsuiki_2:0 "Hatta" b_shgnt_tsuiki_3:0 "Shiida" @@ -2424,7 +2424,7 @@ b_shgnt_saka_8:0 "Kawazoe" b_shgnt_saka_9:0 "Saga" b_shgnt_oki_1:0 "Misato" - b_shgnt_oki_2:0 "Iwamatsu" + b_shgnt_oki_2:0 "Haruke" b_shgnt_oki_3:0 "Nishitaku" b_shgnt_oki_4:0 "Kitataku" b_shgnt_oki_5:0 "Kitayama" @@ -2483,13 +2483,13 @@ b_shgnt_kami_mashiki_3:0 "Takio" b_shgnt_kami_mashiki_4:0 "Shimoyabe" b_shgnt_kami_mashiki_5:0 "Nakashima" - b_shgnt_kami_mashiki_6:0 "Asahi" + b_shgnt_kami_mashiki_6:0 "Yabe" b_shgnt_kami_mashiki_7:0 "Shirazu" b_shgnt_shimo_mashiki_1:0 "Gonoe" b_shgnt_shimo_mashiki_2:0 "Tono_O" b_shgnt_shimo_mashiki_3:0 "Sugiai" b_shgnt_shimo_mashiki_4:0 "Tomochi" - b_shgnt_shimo_mashiki_5:0 "Toyono" + b_shgnt_shimo_mashiki_5:0 "Katashida" b_shgnt_uto_1:0 "Amizu" b_shgnt_uto_2:0 "Oda" b_shgnt_akita_1:0 "Kurokami" @@ -2538,14 +2538,14 @@ b_shgnt_usuki_5:0 "Inoue Jō" b_shgnt_usuki_6:0 "Kitago" b_shgnt_morokata_1:0 "Takaoka" - b_shgnt_morokata_2:0 "Takaki" + b_shgnt_morokata_2:0 "Mimata In" b_shgnt_morokata_3:0 "Nishitake" b_shgnt_morokata_4:0 "Shimazu In" b_shgnt_morokata_5:0 "Isoichi" - b_shgnt_morokata_6:0 "Iino" + b_shgnt_morokata_6:0 "Masaki In" b_shgnt_morokata_7:0 "Suki" b_shgnt_morokata_8:0 "Yashiro" - b_shgnt_minami_morokata_1:0 "Shibushi" + b_shgnt_minami_morokata_1:0 "Kuni In" b_shgnt_minami_morokata_2:0 "Nishi Shibushi" b_shgnt_minami_morokata_3:0 "Tsukino" b_shgnt_miyazaki_1:0 "Tajima" @@ -2554,7 +2554,7 @@ b_shgnt_hyuga_naka_1:0 "Kitago" b_shgnt_hyuga_naka_2:0 "Udo" b_shgnt_hyuga_naka_3:0 "Sakeya" - b_shgnt_hyuga_naka_4:0 "Otaba" + b_shgnt_hyuga_naka_4:0 "Kushima In" b_shgnt_hyuga_naka_5:0 "Ichiki" b_shgnt_hyuga_naka_6:0 "Agata" b_shgnt_koyu_1:0 "Tsuno Jinja" diff --git a/localization/japanese/shgnt_titles_l_english.yml b/localization/japanese/shgnt_titles_l_english.yml index 9c82457..a3a3130 100644 --- a/localization/japanese/shgnt_titles_l_english.yml +++ b/localization/japanese/shgnt_titles_l_english.yml @@ -92,7 +92,7 @@ b_shgnt_kawachi_1:0 "水走館" b_shgnt_kawachi_2:0 "辛島牧" b_shgnt_wakae_1:0 "河俣御厨" - b_shgnt_wakae_2:0 "玉川" + b_shgnt_wakae_2:0 "若江" b_shgnt_wakae_3:0 "山本郷" b_shgnt_takayasu_1:0 "北高安" b_shgnt_takayasu_2:0 "南高安" @@ -2285,7 +2285,7 @@ b_shgnt_chikuzen_naka_1:0 "博多" b_shgnt_chikuzen_naka_2:0 "堅粕" b_shgnt_chikuzen_naka_3:0 "那珂" - b_shgnt_chikuzen_naka_4:0 "岩戸" + b_shgnt_chikuzen_naka_4:0 "岩門" b_shgnt_sahara_1:0 "田隈" b_shgnt_sahara_2:0 "内野" b_shgnt_sahara_3:0 "西新" @@ -2341,10 +2341,10 @@ b_shgnt_buzen_takawa_3:0 "伊方荘" b_shgnt_buzen_takawa_4:0 "糸田荘" b_shgnt_miyako_1:0 "苅田" - b_shgnt_miyako_2:0 "諌山" + b_shgnt_miyako_2:0 "馬ヶ岳城" b_shgnt_nakatsu_1:0 "豊前国府" b_shgnt_nakatsu_2:0 "今川" - b_shgnt_nakatsu_3:0 "蓑島" + b_shgnt_nakatsu_3:0 "沓尾崎" b_shgnt_tsuiki_1:0 "伝法寺荘" b_shgnt_tsuiki_2:0 "八津田" b_shgnt_tsuiki_3:0 "椎田" @@ -2425,7 +2425,7 @@ b_shgnt_saka_8:0 "川副" b_shgnt_saka_9:0 "佐嘉荘" b_shgnt_oki_1:0 "三里" - b_shgnt_oki_2:0 "岩松" + b_shgnt_oki_2:0 "晴気" b_shgnt_oki_3:0 "西多久" b_shgnt_oki_4:0 "北多久" b_shgnt_oki_5:0 "北山" @@ -2484,13 +2484,13 @@ b_shgnt_kami_mashiki_3:0 "滝尾" b_shgnt_kami_mashiki_4:0 "下矢部" b_shgnt_kami_mashiki_5:0 "中島" - b_shgnt_kami_mashiki_6:0 "朝日" + b_shgnt_kami_mashiki_6:0 "矢部" b_shgnt_kami_mashiki_7:0 "白水" b_shgnt_shimo_mashiki_1:0 "河江" b_shgnt_shimo_mashiki_2:0 "当尾" b_shgnt_shimo_mashiki_3:0 "杉合" b_shgnt_shimo_mashiki_4:0 "砥用" - b_shgnt_shimo_mashiki_5:0 "豊野" + b_shgnt_shimo_mashiki_5:0 "堅志田" b_shgnt_uto_1:0 "網津" b_shgnt_uto_2:0 "網田" b_shgnt_akita_1:0 "黒髪" @@ -2539,14 +2539,14 @@ b_shgnt_usuki_5:0 "井上城" b_shgnt_usuki_6:0 "北郷" b_shgnt_morokata_1:0 "高岡" - b_shgnt_morokata_2:0 "高城" + b_shgnt_morokata_2:0 "三俣院" b_shgnt_morokata_3:0 "西岳" b_shgnt_morokata_4:0 "島津院" b_shgnt_morokata_5:0 "五十市" - b_shgnt_morokata_6:0 "飯野" + b_shgnt_morokata_6:0 "真幸院" b_shgnt_morokata_7:0 "須木" b_shgnt_morokata_8:0 "八代" - b_shgnt_minami_morokata_1:0 "志布志" + b_shgnt_minami_morokata_1:0 "救仁院" b_shgnt_minami_morokata_2:0 "西志布志" b_shgnt_minami_morokata_3:0 "月野" b_shgnt_miyazaki_1:0 "田嶋" @@ -2555,7 +2555,7 @@ b_shgnt_hyuga_naka_1:0 "北郷" b_shgnt_hyuga_naka_2:0 "鵜戸" b_shgnt_hyuga_naka_3:0 "酒谷" - b_shgnt_hyuga_naka_4:0 "大束" + b_shgnt_hyuga_naka_4:0 "櫛間院" b_shgnt_hyuga_naka_5:0 "市木" b_shgnt_hyuga_naka_6:0 "吾田" b_shgnt_koyu_1:0 "都農神社" From e9adb6578e8b0c8fa3427c0a685ade6a3f4779f3 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Fri, 29 Oct 2021 17:13:31 +0900 Subject: [PATCH 08/19] =?UTF-8?q?=E2=9C=85=20=E3=82=AD=E3=83=A3=E3=83=A9?= =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=BC=E3=83=87=E3=83=BC=E3=82=BF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20-=20=E3=83=8B=E3=83=83=E3=82=AF=E3=83=8D=E3=83=BC?= =?UTF-8?q?=E3=83=A0=E8=BF=BD=E5=8A=A0=20-=20=E5=AE=87=E9=83=BD=E5=AE=AE?= =?UTF-8?q?=E6=9C=9D=E7=B6=B1=E3=81=A8=E5=B9=B3=E8=B2=9E=E8=83=BD=E3=81=AB?= =?UTF-8?q?=E5=8F=8B=E4=BA=BA=E9=96=A2=E4=BF=82=E3=82=92=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 💥 キャラクターデータ変更 - 源頼朝乳母の寒河尼の誕生年を変更 - 小山朝政の誕生年を変更 - 宇都宮朝綱のニックネーム「左衛門尉」設定年月日を変更 - 小田泰知の死亡年月日を西暦換算に変更 - 小田時知の死亡年月日を西暦換算に変更 - 小田宗知の死亡年月日を西暦換算に変更 - 小田貞朝の死亡年月日を西暦換算に変更 - 小田泰知の生年を変更 - 小田時知の生年を変更 --- .../12C-05_northern_kanto_characters.txt | 162 +++++++++++++----- .../characters/eastern_kanto_characters.txt | 2 +- history/characters/taira.txt | 8 +- 3 files changed, 129 insertions(+), 43 deletions(-) diff --git a/history/characters/12C-05_northern_kanto_characters.txt b/history/characters/12C-05_northern_kanto_characters.txt index bf8fec8..f71b90b 100644 --- a/history/characters/12C-05_northern_kanto_characters.txt +++ b/history/characters/12C-05_northern_kanto_characters.txt @@ -3230,6 +3230,7 @@ 1228.1.1 ={ death=yes } + # 子に高岡八郎左衛門尉泰重(『尊卑分脉』『系図纂要』) } 12127501={ name=character_name_12127501 # Aritomo @@ -3382,35 +3383,52 @@ } } 12127510={ - name=character_name_12127510 # Yasutomo + name=character_name_12127510 # Yasutomo,泰知 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127500 # Oda Tomoshige religion="shinto" culture="northern_kanto" - 1222.1.1={ + 1211.1.1={ # https://historyofjapan-henki.hateblo.jp/entry/2021/02/11/120000 birth=yes } - 1245.5.13={ - death=yes + #1238.01.01={ + # give_nickname="" # 「小田奥太郎」(『系図纂要』) + #} + # 妻は三浦泰村の娘 + 1221.01.01={ + give_nickname="nick_the_saemon_no_jo" # (Henkipedia) + } + 1245.06.08={ + death=yes # 「寛元3(1245)年五月十三日卒卅五」(『系図纂要』) } + # 「常陸守護」 # (Henkipedia) + # TODO: 「子に小田時知、女子(結城広綱室、小萱重広母)」(Henkipedia) } 12127520={ - name=character_name_12127520 # Tokitomo + name=character_name_12127520 # Tokitomo,時知 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127510 # Oda Yasutomo + #mother= # 三浦泰村の娘(Henkipedia, https://historyofjapan-henki.hateblo.jp/entry/2021/02/10/120000) religion="shinto" culture="northern_kanto" - 1238.1.1={ + 1242.1.1={ birth=yes } - 1293.5.15={ - death=yes + 1252.01.01={ + give_nickname="nick_the_saemon_no_jo" # 「小田左衛門尉時知」(『吾妻鏡』建長4(1252)年12月16日条) + } + 1280.01.01={ + give_nickname="nick_the_hitachi_no_suke" # 「常陸介殿」(Henkipedia) + } + 1293.06.20={ + death=yes # 「正応6(1293)年五ノ十五日卒五十二」(『系図纂要』) } + # 「子に小田宗知、北条道知、小神野時義」(Henkipedia) } 12127530={ - name=character_name_12127530 # Munetomo + name=character_name_12127530 # Munetomo, 宗知 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127520 # Oda Tokitomo @@ -3419,12 +3437,16 @@ 1259.1.1={ birth=yes } - 1306.12.6={ - death=yes + 1294.01.01={ + give_nickname="nick_the_chikugo_no_kami" # 「筑後守宗朝」(Henkipedia, https://historyofjapan-henki.hateblo.jp/entry/2021/02/12/000000) + } + 1307.01.10={ + death=yes # 「徳治1(1306)年十二ノ六卒四十八」(『系図纂要』) } + # TODO: 「子に復庵宗己、田宗壽」(Henkipedia) } 12127531={ - name=character_name_12127531 # Michitomo + name=character_name_12127531 # Michitomo, 道知 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127520 # Oda Tokitomo @@ -3436,6 +3458,9 @@ 1290.01.01={ dynasty_house="house_shgnt_hatta_hojo" } + 1300.01.01={ + give_nickname="nick_chikuzen_no_kami" # 「筑前守」(『尊卑分脉』) + } 1310.1.1={ death=yes } @@ -3455,7 +3480,7 @@ } } 12127541={ - name=character_name_12127541 # Sadatomo + name=character_name_12127541 # Sadatomo, 貞朝(『系図纂要』)、貞宗(『尊卑分脉』) # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127530 # Oda Munetomo @@ -3464,12 +3489,15 @@ 1282.1.1={ birth=yes } - 1335.10.23={ - death=yes + 1312.01.01={ + give_nickname="nick_the_hitachi_no_suke" # 「前常陸介貞宗」(文保2(1318)年5月4日付「小田貞宗請文」『常陸国総社宮文書』)https://historyofjapan-henki.hateblo.jp/entry/2021/02/08/170000 + } + 1335.11.09={ + death=yes # 「建武2(1335)年閏十ノ廿三日卒四十八」(『系図纂要』) } } 12127542={ - name=character_name_12127542 # Tomosada + name=character_name_12127542 # Tomosada, 知貞 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127530 # Oda Munetomo @@ -3478,8 +3506,12 @@ 1288.1.1={ birth=yes } + 1304.01.01={ + give_nickname="nick_Hikoshiro" # 「彦四郎」(『尊卑分脉』) + } 1318.01.01={ dynasty_house="house_shgnt_hatta_teno" + give_nickname="nick_saemon_no_jo" # 「左衛門尉」(『分脉』) } 1338.1.1={ death=yes @@ -3500,7 +3532,7 @@ } } 12127550={ - name=character_name_12127550 # Haruhisa + name=character_name_12127550 # Haruhisa, 治久、「初名高知」(Henkipedia, https://historyofjapan-henki.hateblo.jp/entry/2021/02/14/000000) # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127541 # Oda Sadatomo @@ -3509,12 +3541,24 @@ 1300.1.1={ birth=yes } + 1325.01.01={ + give_nickname="nick_the_saemon_no_jo" # 「左衛門尉」(Henkipedia) + } + 1327.01.01={ + give_nickname="nick_the_owari_no_kami" # TODO: 「尾張権守」(Henkipedia) + } + 1337.01.01={ + give_nickname="nick_the_kunai_no_sho" # TODO: 「宮内権少輔」(Henkipedia) + } + 1340.01.01={ + give_nickname="nick_the_hitachi_no_suke" # (Henkipedia) + } 1353.1.16={ - death=yes + death=yes # 「文和1(1352)年十二ノ十一薨七十」(『系図纂要』) } } 12127560={ - name=character_name_12127560 # Takatomo + name=character_name_12127560 # Takatomo, 孝朝 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa @@ -3524,11 +3568,11 @@ birth=yes } 1414.7.3={ - death=yes + death=yes # 「応永廿一年六ノ十六卒七十九」(『系図纂要』) } } 12127562={ - name=character_name_12127562 # Tomomura + name=character_name_12127562 # Tomomura, 知村 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa @@ -3539,13 +3583,14 @@ } 1375.01.01={ dynasty_house="house_shgnt_hatta_tamiya" + give_nickname="nick_ukon" # TODO: 「右近太郎」(『系図纂要』) } 1395.1.1={ death=yes } } 12127563={ - name=character_name_12127563 # Tomoshige + name=character_name_12127563 # Tomoshige, 知繁 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa @@ -3554,12 +3599,15 @@ 1347.1.1={ birth=yes } + 1363.01.01={ + give_nickname="nick_Matajio" # 「成井又二郎」(『系図纂要』) + } 1397.1.1={ death=yes } } 12127564={ - name=character_name_12127564 # Tomohide + name=character_name_12127564 # Tomohide, 知秀 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127550 # Oda Haruhisa @@ -3568,6 +3616,9 @@ 1349.1.1={ birth=yes } + 1365.01.01={ + give_nickname="nick_Magosaburo" # 「小高孫三郎」(『系図纂要』) + } 1379.01.01={ dynasty_house="house_shgnt_hatta_kodaka" } @@ -3999,9 +4050,10 @@ } } 12130000={ - name=character_name_12130000 # Munetsuna + name=character_name_12130000 # Munetsuna,宗綱 dynasty=10000109 # Utsunomiya - father=11005863 # Fujiwara Soen + father=11005863 # Fujiwara Soen + # TODO: 養父は藤原兼房の子・兼仲(『尊卑分脉』) religion="shinto" culture="northern_kanto" 1086.1.1 ={ @@ -4012,12 +4064,15 @@ set_realm_capital=title:c_shgnt_shimotsuke_kawachi } } + # TODO: 「八田武者所」(『吾妻鏡』) + # TODO: 「常陸平氏の多気致幹の娘と婚姻」(『宇都宮正統系図』) + # 源義朝が下野守であった7年間に下野目代だった可能性がある(野口実、「下野宇都宮氏の成立と、その平家政権下における存在形態」、2013) 1162.9.30 ={ - death=yes + death=yes # 「平治元年1159年八月廿日」(『宇都宮系図』別本)、「応保二年(1162年)八月二十日卒、年七十七」(『宇都宮正統系図』) } } 12130001={ - name=character_name_12130001 # Munefusa + name=character_name_12130001 # Munefusa,宗房 dynasty=10001000 # Fujiwara father=11005863 # Fujiwara Soen religion="shinto" @@ -4025,12 +4080,17 @@ 1090.1.1 ={ birth=yes } + # TODO: 「改姓於中原」(『尊卑分脉』) + # TODO: 「外記」→「造酒正」(野口実、下野宇都宮氏の成立と、その平家政権下における存在形態」、2013) + # TODO: 「造酒正」(『吾妻鏡』) 1170.1.1 ={ death=yes } + # TODO: 坂戸源氏の右馬允季長は実子(『分脉』) + # TODO: 娘は源季国の母(『分脉』) } 12130003 = { - name=character_name_12130003 # Tomotsuna + name=character_name_12130003 # Tomotsuna,朝綱 dynasty=10000109 # Utsunomiya father=12130000 # Utsunomiya Munetsuna religion="shinto" @@ -4041,39 +4101,52 @@ 1122.1.1={ birth=yes } + # 「鳥羽院武者所」「後白河院北面」(『尊卑分脉』) 1150.1.1={ add_spouse=12130009 # Daigo Tsubone } - 1156.1.1={ - give_nickname="nick_the_saemon_no_jo" - } 1162.09.30 = { effect={ set_realm_capital=title:c_shgnt_shimotsuke_kawachi } } + 1168.02.14={ # 仁安3(1168)年正月補任 + give_nickname="nick_the_uhyoe_no_jo" # 「右兵衛尉」(野口実、「下野宇都宮氏の成立と、その平家政権下における存在形態」、2013) + } + 1179.12.18={ + effect = { + set_relation_friend = character:10110221 # 平貞能 + } + } + 1180.02.01={ # 「治承4(1180)年正月補任」(野口、2013) + give_nickname="nick_the_saemon_no_jo" # 「左衛門尉」(『分脉』)、「左衛門権少尉」(野口、2013) + } + # 寿永2(1183)年七月まで在京(野口、2013) + # 朝綱が源頼朝に属した時期については諸説有る + # 「源頼朝により宇都宮社務職安堵」(『吾妻鏡」元暦元(1184)年五月二十四日条) 1204.9.1={ death=yes } } 12130004={ female=yes - name=character_name_12130004 # Samukawa + name=character_name_12130004 # Samukawa, 寒河尼 dynasty=10000109 # Utsunomiya father=12130000 # Utsunomiya Munetsuna religion="shinto" culture="northern_kanto" - 1137.1.1 ={ + 1138.1.1 ={ # 「保延4(1138)年の誕生」(野口実、下野宇都宮氏の成立と、その平家政権下における存在形態」、2013) birth=yes } + # 近衛天皇に仕える(「老士雑談」『改訂史籍集覧』第十三冊) 1228.3.1 ={ death=yes } } 12130005={ - name=character_name_12130005 # Tomoie + name=character_name_12130005 # Tomoie,知家 dynasty=10000109 # Utsunomiya -> Hatta - father=12130000 # Utsunomiya Munetsuna + father=12130000 # Utsunomiya Munetsuna religion="shinto" culture="northern_kanto" diplomacy=9 @@ -4083,8 +4156,9 @@ birth=yes } 1158.1.1={ - give_nickname="nick_shiro" + give_nickname="nick_shiro" # 「八田四郎武者朝家」(『吾妻鏡』養和元年閏二月二十三日条) } + # 「武者所」「右馬允」「左衛門尉」「筑後守」(『尊卑分脉』) 1162.1.1={ dynasty=10007007 # Hatta } @@ -4518,7 +4592,7 @@ } } 12130150={ - name=character_name_12130150 # Nobufusa + name=character_name_12130150 # Nobufusa,信房 dynasty=10000670 # Kii father=12130001 # Fujiwara Munefusa religion="shinto" @@ -4530,6 +4604,9 @@ 1162.9.30={ employer=12130003 # Utsunomiya Tomotsuna } + 1207.05.01={# 「建永元年(1206)四月三日の臨時除目」(野口実、「下野宇都宮氏の成立と、その平家政権下における存在形態」、2013) + give_nickname=nick_the_yamato_no_kami #「大和守」 + } 1234.8.27 ={ death=yes } @@ -4905,7 +4982,7 @@ } } 12135001 = { - name = character_name_12135001 # Tomomasa + name = character_name_12135001 # Tomomasa,朝政 # dynasty = 10000112 #Oyama dynasty_house = house_shgnt_oyama religion = "shinto" @@ -4920,8 +4997,9 @@ trait="intellect_good_2" trait="brave" father = 12135000 #Oyama Masamitsu + # 小山朝政の母は寒河尼とする説(野口実)と否定する説(松本一夫『寒河尼』)とがある(野口実、「下野宇都宮氏の成立と、その平家政権下における存在形態」、2013) prowess=18 - 1158.1.1 = { + 1158.1.1 = { # 「久寿2(1155)年」(野口、2013) birth=yes } 1174.1.1={ @@ -4930,10 +5008,12 @@ 1191.5.11={ give_nickname="nick_the_shimotsukeno_no_suke" } + # TODO: 「兵衛尉」(野口、2013) + # TODO: 「左衛門尉(さらに検非違使の宣旨を蒙る)」(野口、2013) 1225.3.3 = { - give_nickname="nick_the_shimotsukeno_no_kami" + give_nickname="nick_the_shimotsukeno_no_kami" # 「下野守」(野口、2013) effect = { - add_trait = "jugoi_ge" + add_trait = "jugoi_ge" # 「五位」(野口、2013) } } 1238.5.15 = { diff --git a/history/characters/eastern_kanto_characters.txt b/history/characters/eastern_kanto_characters.txt index 471cee8..825b502 100644 --- a/history/characters/eastern_kanto_characters.txt +++ b/history/characters/eastern_kanto_characters.txt @@ -1443,7 +1443,7 @@ } } 10010227 = { - name=character_name_10010227 # Tomomitsu + name=character_name_10010227 # Tomomitsu,朝光 # dynasty=10000102 # Yuki dynasty_house = house_shgnt_yuki religion="shinto" diff --git a/history/characters/taira.txt b/history/characters/taira.txt index fd5e246..1f72a58 100644 --- a/history/characters/taira.txt +++ b/history/characters/taira.txt @@ -2103,7 +2103,7 @@ } } 10110221={ - name=character_name_10110221 # Sadayoshi + name=character_name_10110221 # Sadayoshi,貞能 dynasty=10001100 # Taira father=10110215 # Taira Iesada religion="shinto" @@ -2117,6 +2117,9 @@ } 1179.12.18={ employer=10110025 + effect = { + set_relation_friend = character:12130003 # 宇都宮朝綱 + } } 1180.1.1={ give_nickname="nick_the_higo_no_kami" @@ -2124,6 +2127,9 @@ add_trait = "jugoi_jo" } } + 1185.07.07={ + employer=12130003 # 宇都宮朝綱 + } 1186.1.1={ death=yes } From 705d76e78c588212a0c4e7bc1f4366596d474455 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sun, 31 Oct 2021 16:37:12 +0900 Subject: [PATCH 09/19] Some map object locators have been adjusted. --- gfx/map/map_object_data/building_locators.txt | 4 ++-- gfx/map/map_object_data/player_stack_locators.txt | 2 +- gfx/map/map_object_data/siege_locators.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index c847696..fef1d4a 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -9607,8 +9607,8 @@ } { id=1606 - position={ 6553.000000 0.000000 3380.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + position={ 6559.968262 0.000000 3399.840820 } + rotation={ -0.000000 -0.627410 -0.000000 0.778689 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index 60334cf..f9d8051 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -9631,7 +9631,7 @@ } { id=1606 - position={ 6557.000000 0.000000 3375.000000 } + position={ 6554.760254 0.000000 3395.161377 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt index da16822..493d64e 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -9619,8 +9619,8 @@ } { id=1606 - position={ 6561.000000 0.000000 3382.000000 } - rotation={ -0.000000 -0.615412 -0.000000 0.788205 } + position={ 6563.516602 0.000000 3392.031250 } + rotation={ -0.000000 -0.973742 -0.000000 0.227651 } scale={ 1.000000 1.000000 1.000000 } } { From 3a0c78597391a108fcfb359816bd0babc67d7dca Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sun, 31 Oct 2021 16:37:25 +0900 Subject: [PATCH 10/19] Added a tree map object. --- .../map_objects/masks/tree_leaf_01_mask.png | 4 +- .../generated/tree_leaf_high_generator_1.txt | 44 ++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/content_source/map_objects/masks/tree_leaf_01_mask.png b/content_source/map_objects/masks/tree_leaf_01_mask.png index c79d008..f9248ee 100644 --- a/content_source/map_objects/masks/tree_leaf_01_mask.png +++ b/content_source/map_objects/masks/tree_leaf_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be96cf9ff738cf465ce02e8dfc86af9742a6914c1238286f521977ee7f187476 -size 271033 +oid sha256:389b15bd4a5f0207ffd49a076ffb8979cb4c825dd19967b023a39cbb97a156f7 +size 271322 diff --git a/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt b/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt index 3baf8cb..ac04dac 100644 --- a/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt +++ b/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt @@ -5,7 +5,7 @@ generated_content=yes layer="tree_high_layer" pdxmesh="tree_leaf_01_a_mesh" - count=26351 + count=26393 transform="3349.704834 0.000000 2042.022339 0.000000 0.990706 0.000000 -0.136018 0.800817 0.800817 0.800817 3312.177734 0.000000 2041.020020 0.000000 0.386871 0.000000 -0.922134 0.821095 0.821095 0.821095 3319.947998 0.000000 2039.373291 0.000000 0.803384 0.000000 0.595461 0.752865 0.752865 0.752865 @@ -21272,10 +21272,14 @@ 6597.414062 0.000000 3335.439209 0.000000 0.701731 0.000000 -0.712442 0.849096 0.849096 0.849096 6571.917969 0.000000 3328.566406 0.000000 0.976526 0.000000 0.215399 0.788293 0.788293 0.788293 6606.956055 0.000000 3436.976807 0.000000 0.984904 0.000000 -0.173100 0.888606 0.888606 0.888606 +6583.682617 0.000000 3447.201416 0.000000 0.999964 0.000000 -0.008516 0.800612 0.800612 0.800612 6619.035645 0.000000 3390.879395 0.000000 0.331182 0.000000 0.943567 0.171916 0.171916 0.171916 +6574.959473 0.000000 3445.406738 0.000000 0.854722 0.000000 0.519087 0.758578 0.758578 0.758578 6619.806641 0.000000 3384.423828 0.000000 0.997995 0.000000 0.063298 0.768753 0.768753 0.768753 6602.912109 0.000000 3438.551758 0.000000 0.803803 0.000000 0.594896 0.518775 0.518775 0.518775 6600.862305 0.000000 3406.697266 0.000000 0.869948 0.000000 0.493143 0.537357 0.537357 0.537357 +6583.076172 0.000000 3428.253174 0.000000 0.591925 0.000000 0.805993 0.743837 0.743837 0.743837 +6594.729492 0.000000 3454.448730 0.000000 0.242194 0.000000 -0.970228 0.898001 0.898001 0.898001 6622.852539 0.000000 3418.017334 0.000000 0.998680 0.000000 -0.051371 0.826174 0.826174 0.826174 6614.599121 0.000000 3396.465820 0.000000 0.990935 0.000000 0.134343 0.731372 0.731372 0.731372 6623.264648 0.000000 3405.574707 0.000000 0.293208 0.000000 0.956049 0.151557 0.151557 0.151557 @@ -21285,14 +21289,19 @@ 6601.709473 0.000000 3431.754883 0.000000 0.924431 0.000000 0.381351 0.774994 0.774994 0.774994 6609.410645 0.000000 3440.919434 0.000000 0.069668 0.000000 0.997570 0.035510 0.035510 0.035510 6617.810547 0.000000 3416.393066 0.000000 0.792506 0.000000 0.609864 0.465958 0.465958 0.465958 +6578.846191 0.000000 3450.188477 0.000000 0.932351 0.000000 0.361555 0.772663 0.772663 0.772663 6584.956543 0.000000 3348.150635 0.000000 0.829453 0.000000 -0.558577 0.839062 0.839062 0.839062 6617.879883 0.000000 3367.396973 0.000000 0.514167 0.000000 0.857690 0.727946 0.727946 0.727946 +6577.768555 0.000000 3423.822998 0.000000 0.872624 0.000000 -0.488392 0.837706 0.837706 0.837706 6542.472168 0.000000 3332.622803 0.000000 0.997492 0.000000 0.070781 0.793492 0.793492 0.793492 6622.221680 0.000000 3434.226318 0.000000 0.884232 0.000000 0.467048 0.552508 0.552508 0.552508 +6582.840820 0.000000 3434.794189 0.000000 0.999043 0.000000 -0.043749 0.804021 0.804021 0.804021 6582.574219 0.000000 3359.735840 0.000000 0.918801 0.000000 -0.394721 0.836468 0.836468 0.836468 6605.046387 0.000000 3396.534912 0.000000 0.618223 0.000000 -0.786003 1.260564 1.260564 1.260564 +6585.595215 0.000000 3432.542969 0.000000 0.319739 0.000000 0.947506 0.707972 0.707972 0.707972 6622.330566 0.000000 3411.506836 0.000000 0.931356 0.000000 -0.364111 0.989803 0.989803 0.989803 6618.548828 0.000000 3410.663818 0.000000 0.626572 0.000000 -0.779363 1.255132 1.255132 1.255132 +6591.875977 0.000000 3442.050537 0.000000 0.560445 0.000000 0.828192 0.727885 0.727885 0.727885 6607.887207 0.000000 3406.939697 0.000000 0.461889 0.000000 -0.886938 1.355475 1.355475 1.355475 6611.388672 0.000000 3433.339355 0.000000 0.185893 0.000000 -0.982570 1.504771 1.504771 1.504771 6608.388184 0.000000 3400.568359 0.000000 0.948377 0.000000 -0.317145 0.964359 0.964359 0.964359 @@ -21304,7 +21313,11 @@ 6613.265625 0.000000 3339.245850 0.000000 0.296097 0.000000 0.955158 0.706136 0.706136 0.706136 6606.701172 0.000000 3424.457275 0.000000 0.999711 0.000000 -0.024053 0.802402 0.802402 0.802402 6604.328613 0.000000 3443.122070 0.000000 0.898225 0.000000 -0.439535 0.996324 0.996324 0.996324 +6562.128418 0.000000 3422.787598 0.000000 0.626816 0.000000 0.779167 0.726848 0.726848 0.726848 6620.914062 0.000000 3396.621094 0.000000 0.739900 0.000000 0.672716 0.424204 0.424204 0.424204 +6564.508301 0.000000 3413.955566 0.000000 0.262138 0.000000 0.965030 0.682662 0.682662 0.682662 +6569.324219 0.000000 3417.782227 0.000000 0.767040 0.000000 -0.641600 0.861215 0.861215 0.861215 +6584.979004 0.000000 3451.143799 0.000000 0.739707 0.000000 0.672930 0.727760 0.727760 0.727760 6598.093750 0.000000 3407.753418 0.000000 0.806194 0.000000 0.591651 0.512967 0.512967 0.512967 6604.859863 0.000000 3432.176514 0.000000 0.999468 0.000000 -0.032609 0.813223 0.813223 0.813223 6602.434082 0.000000 3409.114014 0.000000 0.658068 0.000000 0.752959 0.365802 0.365802 0.365802 @@ -21314,7 +21327,9 @@ 6607.407227 0.000000 3343.086426 0.000000 0.728696 0.000000 0.684838 0.715626 0.715626 0.715626 6613.411621 0.000000 3436.484375 0.000000 0.955007 0.000000 0.296582 0.674309 0.674309 0.674309 6607.754883 0.000000 3411.343018 0.000000 0.810091 0.000000 -0.586304 1.119068 1.119068 1.119068 +6559.802734 0.000000 3416.998291 0.000000 0.951267 0.000000 -0.308368 0.828800 0.828800 0.828800 6619.668945 0.000000 3405.807617 0.000000 0.091407 0.000000 -0.995814 1.553382 1.553382 1.553382 +6581.818359 0.000000 3444.452148 0.000000 0.791185 0.000000 0.611577 0.735600 0.735600 0.735600 6621.153320 0.000000 3415.915527 0.000000 0.778323 0.000000 -0.627864 1.145713 1.145713 1.145713 6620.509277 0.000000 3366.586914 0.000000 0.944871 0.000000 -0.327442 0.831981 0.831981 0.831981 6621.992188 0.000000 3391.063721 0.000000 0.937906 0.000000 -0.346890 0.980420 0.980420 0.980420 @@ -21331,13 +21346,16 @@ 6599.806641 0.000000 3367.741455 0.000000 0.665037 0.000000 0.746811 0.714107 0.714107 0.714107 6610.476562 0.000000 3396.377441 0.000000 0.458333 0.000000 0.888781 0.242485 0.242485 0.242485 6599.442871 0.000000 3371.885742 0.000000 0.997637 0.000000 -0.068707 0.808103 0.808103 0.808103 +6577.584961 0.000000 3445.687988 0.000000 0.619258 0.000000 -0.785188 0.891979 0.891979 0.891979 6621.521973 0.000000 3431.059326 0.000000 0.006954 0.000000 -0.999976 1.596458 1.596458 1.596458 6602.388184 0.000000 3441.136963 0.000000 0.016971 0.000000 0.999856 0.185535 0.185535 0.185535 6614.736328 0.000000 3384.867920 0.000000 0.992282 0.000000 0.124003 0.751085 0.751085 0.751085 6616.855469 0.000000 3389.367188 0.000000 0.181066 0.000000 -0.983471 1.507273 1.507273 1.507273 +6571.242676 0.000000 3442.234131 0.000000 0.914382 0.000000 0.404852 0.745056 0.745056 0.745056 6618.863770 0.000000 3394.930908 0.000000 0.999808 0.000000 -0.019590 0.809978 0.809978 0.809978 6602.003906 0.000000 3411.666016 0.000000 0.693844 0.000000 -0.720126 1.209466 1.209466 1.209466 6617.815918 0.000000 3400.306641 0.000000 0.675391 0.000000 -0.737460 1.222360 1.222360 1.222360 +6570.066406 0.000000 3437.835449 0.000000 0.684913 0.000000 -0.728625 0.892931 0.892931 0.892931 6603.116699 0.000000 3340.937256 0.000000 0.137683 0.000000 -0.990476 0.943070 0.943070 0.943070 6604.780273 0.000000 3414.955322 0.000000 0.564976 0.000000 -0.825107 1.294216 1.294216 1.294216 6613.016113 0.000000 3410.802002 0.000000 0.329901 0.000000 -0.944015 1.428775 1.428775 1.428775 @@ -21347,23 +21365,31 @@ 6606.407227 0.000000 3409.048340 0.000000 0.206321 0.000000 0.978484 0.105838 0.105838 0.105838 6607.749512 0.000000 3356.106689 0.000000 0.833120 0.000000 0.553092 0.715722 0.715722 0.715722 6614.250977 0.000000 3398.936035 0.000000 0.353468 0.000000 -0.935447 1.416004 1.416004 1.416004 +6591.502441 0.000000 3454.973877 0.000000 0.354907 0.000000 -0.934901 0.947170 0.947170 0.947170 6623.350098 0.000000 3386.573975 0.000000 0.538185 0.000000 -0.842827 1.310576 1.310576 1.310576 +6589.136230 0.000000 3453.994141 0.000000 0.174612 0.000000 -0.984637 1.006217 1.006217 1.006217 6601.518066 0.000000 3392.432129 0.000000 0.775569 0.000000 0.631263 0.716767 0.716767 0.716767 6600.054199 0.000000 3396.083496 0.000000 0.509127 0.000000 0.860691 0.346585 0.346585 0.346585 +6563.924316 0.000000 3410.389404 0.000000 0.589200 0.000000 0.807987 0.668480 0.668480 0.668480 6623.301270 0.000000 3395.588623 0.000000 0.663374 0.000000 0.748288 0.369402 0.369402 0.369402 6614.023438 0.000000 3392.733398 0.000000 0.831441 0.000000 0.555613 0.499974 0.499974 0.499974 +6571.352539 0.000000 3431.299316 0.000000 0.688337 0.000000 0.725391 0.696258 0.696258 0.696258 6614.127441 0.000000 3444.748779 0.000000 0.951045 0.000000 0.309051 0.756701 0.756701 0.756701 6602.786133 0.000000 3401.145996 0.000000 0.989633 0.000000 -0.143617 0.873397 0.873397 0.873397 6611.769043 0.000000 3419.689209 0.000000 0.767346 0.000000 0.641233 0.456599 0.456599 0.456599 6621.837402 0.000000 3420.299805 0.000000 0.193877 0.000000 -0.981026 1.431941 1.431941 1.431941 +6577.856445 0.000000 3437.392578 0.000000 0.487325 0.000000 0.873221 0.643075 0.643075 0.643075 6614.335449 0.000000 3387.378662 0.000000 0.985189 0.000000 0.171470 0.712582 0.712582 0.712582 6618.437500 0.000000 3408.225830 0.000000 0.790626 0.000000 -0.612299 1.135608 1.135608 1.135608 6612.231445 0.000000 3415.573242 0.000000 0.863640 0.000000 0.504109 0.530914 0.530914 0.530914 6623.123047 0.000000 3357.351562 0.000000 0.363682 0.000000 0.931523 0.352350 0.352350 0.352350 6608.685547 0.000000 3438.636230 0.000000 0.475714 0.000000 -0.879600 1.347504 1.347504 1.347504 +6567.156250 0.000000 3422.400635 0.000000 0.989410 0.000000 -0.145145 0.821528 0.821528 0.821528 6582.402832 0.000000 3340.953125 0.000000 0.709940 0.000000 -0.704262 0.926409 0.926409 0.926409 +6568.181152 0.000000 3427.036133 0.000000 0.540829 0.000000 -0.841133 0.923751 0.923751 0.923751 6606.208984 0.000000 3405.087402 0.000000 0.906765 0.000000 -0.421636 1.021671 1.021671 1.021671 6611.141602 0.000000 3448.987793 0.000000 0.647920 0.000000 -0.761709 0.929713 0.929713 0.929713 +6585.330566 0.000000 3441.504395 0.000000 0.719086 0.000000 0.694921 0.686447 0.686447 0.686447 6609.738770 0.000000 3393.070312 0.000000 0.752000 0.000000 0.659163 0.554201 0.554201 0.554201 6597.275879 0.000000 3385.401367 0.000000 0.918054 0.000000 0.396454 0.732423 0.732423 0.732423 6599.301758 0.000000 3403.614014 0.000000 0.967898 0.000000 0.251342 0.670605 0.670605 0.670605 @@ -21372,6 +21398,7 @@ 6614.668457 0.000000 3407.090332 0.000000 0.670748 0.000000 0.741685 0.374443 0.374443 0.374443 6600.159180 0.000000 3353.308594 0.000000 0.825419 0.000000 -0.564521 0.889854 0.889854 0.889854 6622.554199 0.000000 3413.912109 0.000000 0.982134 0.000000 0.188183 0.703584 0.703584 0.703584 +6575.600098 0.000000 3430.298584 0.000000 0.485091 0.000000 -0.874463 0.957303 0.957303 0.957303 6619.273438 0.000000 3335.895996 0.000000 0.996478 0.000000 -0.083858 0.814421 0.814421 0.814421 6599.676270 0.000000 3441.694580 0.000000 0.522629 0.000000 0.852561 0.671549 0.671549 0.671549 6617.138672 0.000000 3377.303223 0.000000 0.792036 0.000000 -0.610474 0.914101 0.914101 0.914101 @@ -21381,6 +21408,7 @@ 6600.304688 0.000000 3344.907471 0.000000 0.646108 0.000000 -0.763246 0.940474 0.940474 0.940474 6580.339844 0.000000 3328.787598 0.000000 0.691528 0.000000 0.722349 0.659742 0.659742 0.659742 6594.722168 0.000000 3346.935303 0.000000 0.131773 0.000000 0.991280 0.544276 0.544276 0.544276 +6567.123047 0.000000 3418.436279 0.000000 0.146286 0.000000 -0.989242 1.010459 1.010459 1.010459 6613.512207 0.000000 3402.751221 0.000000 0.980735 0.000000 -0.195344 0.900132 0.900132 0.900132 6556.765625 0.000000 3328.265869 0.000000 0.876378 0.000000 -0.481624 0.867243 0.867243 0.867243 6604.988770 0.000000 3354.713867 0.000000 0.946187 0.000000 0.323621 0.750635 0.750635 0.750635 @@ -21400,6 +21428,7 @@ 6588.323242 0.000000 3334.963623 0.000000 0.599253 0.000000 -0.800560 0.955727 0.955727 0.955727 6606.953125 0.000000 3416.326416 0.000000 0.997669 0.000000 0.068245 0.767398 0.767398 0.767398 6606.654785 0.000000 3401.968018 0.000000 0.089764 0.000000 -0.995963 1.554222 1.554222 1.554222 +6562.542480 0.000000 3418.252686 0.000000 0.858703 0.000000 -0.512474 0.879523 0.879523 0.879523 6597.695801 0.000000 3353.790771 0.000000 0.295502 0.000000 -0.955342 1.028431 1.028431 1.028431 6602.017090 0.000000 3360.181152 0.000000 0.749624 0.000000 -0.661864 0.928570 0.928570 0.928570 6617.611328 0.000000 3384.566650 0.000000 0.985607 0.000000 0.169054 0.726039 0.726039 0.726039 @@ -21409,26 +21438,32 @@ 6615.656738 0.000000 3435.803223 0.000000 0.268801 0.000000 0.963196 0.299414 0.299414 0.299414 6603.356934 0.000000 3376.361816 0.000000 0.628334 0.000000 0.777944 0.637992 0.637992 0.637992 6604.663574 0.000000 3437.144775 0.000000 0.999999 0.000000 -0.001233 0.800628 0.800628 0.800628 +6574.597168 0.000000 3433.984131 0.000000 0.818217 0.000000 0.574909 0.710699 0.710699 0.710699 6602.875000 0.000000 3444.944336 0.000000 0.585437 0.000000 0.810718 0.618738 0.618738 0.618738 +6560.232910 0.000000 3410.228271 0.000000 0.646098 0.000000 0.763254 0.671664 0.671664 0.671664 6623.369141 0.000000 3436.790283 0.000000 0.419788 0.000000 -0.907622 1.379367 1.379367 1.379367 6606.325195 0.000000 3366.186279 0.000000 0.086753 0.000000 -0.996230 1.069703 1.069703 1.069703 6591.468750 0.000000 3350.089111 0.000000 0.818019 0.000000 -0.575192 0.918727 0.918727 0.918727 6612.167480 0.000000 3330.401855 0.000000 0.252997 0.000000 -0.967467 1.028497 1.028497 1.028497 +6589.008301 0.000000 3448.235596 0.000000 0.993568 0.000000 -0.113235 0.816772 0.816772 0.816772 6622.395996 0.000000 3367.945557 0.000000 0.946144 0.000000 -0.323747 0.854653 0.854653 0.854653 6605.318848 0.000000 3372.794922 0.000000 0.985276 0.000000 0.170973 0.773920 0.773920 0.773920 6599.238770 0.000000 3340.040527 0.000000 0.999850 0.000000 0.017316 0.796680 0.796680 0.796680 6545.483887 0.000000 3329.541016 0.000000 0.380101 0.000000 -0.924945 1.033494 1.033494 1.033494 6609.424805 0.000000 3412.754150 0.000000 0.827303 0.000000 -0.561756 1.103798 1.103798 1.103798 +6585.798828 0.000000 3438.083496 0.000000 0.999505 0.000000 -0.031457 0.806158 0.806158 0.806158 6616.669434 0.000000 3433.895752 0.000000 0.869078 0.000000 -0.494675 1.000497 1.000497 1.000497 6619.990723 0.000000 3434.791748 0.000000 0.054465 0.000000 0.998516 0.203401 0.203401 0.203401 6615.422363 0.000000 3421.574707 0.000000 0.968151 0.000000 0.250366 0.707003 0.707003 0.707003 6591.322754 0.000000 3338.187988 0.000000 0.588570 0.000000 0.808446 0.613839 0.613839 0.613839 +6562.197754 0.000000 3413.843994 0.000000 0.954057 0.000000 0.299624 0.755026 0.755026 0.755026 6612.863281 0.000000 3400.643555 0.000000 0.577413 0.000000 -0.816452 1.286500 1.286500 1.286500 6602.188965 0.000000 3436.556152 0.000000 0.683095 0.000000 0.730330 0.445129 0.445129 0.445129 6605.910645 0.000000 3435.075195 0.000000 0.233513 0.000000 -0.972354 1.479964 1.479964 1.479964 6618.891113 0.000000 3386.613770 0.000000 0.798586 0.000000 -0.601881 1.128931 1.128931 1.128931 6615.953125 0.000000 3366.218018 0.000000 0.282678 0.000000 -0.959215 0.984671 0.984671 0.984671 6609.625488 0.000000 3419.558105 0.000000 0.853197 0.000000 0.521588 0.568764 0.568764 0.568764 +6573.813965 0.000000 3425.992432 0.000000 0.609476 0.000000 -0.792805 0.935292 0.935292 0.935292 6617.270020 0.000000 3439.980957 0.000000 0.986835 0.000000 0.161729 0.770152 0.770152 0.770152 6584.538574 0.000000 3345.875977 0.000000 0.799562 0.000000 -0.600583 0.902934 0.902934 0.902934 6599.848145 0.000000 3378.965088 0.000000 0.995989 0.000000 0.089478 0.783000 0.783000 0.783000 @@ -21446,11 +21481,13 @@ 6608.091797 0.000000 3422.883057 0.000000 0.669223 0.000000 0.743061 0.676201 0.676201 0.676201 6593.721191 0.000000 3361.962891 0.000000 0.743018 0.000000 -0.669272 0.920083 0.920083 0.920083 6603.861816 0.000000 3412.997559 0.000000 0.166932 0.000000 -0.985968 1.514582 1.514582 1.514582 +6574.044922 0.000000 3439.934082 0.000000 0.960063 0.000000 0.279785 0.758090 0.758090 0.758090 6608.584961 0.000000 3435.385742 0.000000 0.989099 0.000000 -0.147253 0.875269 0.875269 0.875269 6621.340820 0.000000 3385.814209 0.000000 0.760594 0.000000 -0.649228 1.145741 1.145741 1.145741 6606.070312 0.000000 3444.567383 0.000000 0.998935 0.000000 0.046139 0.783131 0.783131 0.783131 6618.990723 0.000000 3388.811279 0.000000 0.814053 0.000000 -0.580790 1.115610 1.115610 1.115610 6609.509277 0.000000 3432.417725 0.000000 0.102441 0.000000 -0.994739 1.547735 1.547735 1.547735 +6589.694824 0.000000 3450.238525 0.000000 0.877047 0.000000 0.480404 0.725937 0.725937 0.725937 6617.374023 0.000000 3402.340820 0.000000 0.948794 0.000000 -0.315895 0.963688 0.963688 0.963688 6620.412598 0.000000 3354.555908 0.000000 0.324942 0.000000 0.945734 0.413702 0.413702 0.413702 6603.758301 0.000000 3362.838867 0.000000 0.009755 0.000000 0.999952 0.506930 0.506930 0.506930 @@ -22377,6 +22414,11 @@ 6624.912598 0.000000 3424.167969 0.000000 0.101145 0.000000 -0.994872 1.548399 1.548399 1.548399 6639.118652 0.000000 3395.530273 0.000000 0.375612 0.000000 -0.926777 1.403892 1.403892 1.403892 6627.636719 0.000000 3372.178467 0.000000 0.036608 0.000000 0.999330 0.018648 0.018648 0.018648 +6584.062012 0.000000 3460.362061 0.000000 0.152484 0.000000 0.988306 0.749033 0.749033 0.749033 +6578.087891 0.000000 3455.623535 0.000000 0.507164 0.000000 -0.861849 0.864323 0.864323 0.864323 +6586.020020 0.000000 3457.533936 0.000000 0.942295 0.000000 -0.334784 0.827954 0.827954 0.827954 +6591.782715 0.000000 3458.301270 0.000000 0.894040 0.000000 0.447987 0.765674 0.765674 0.765674 +6596.028320 0.000000 3457.946533 0.000000 0.993438 0.000000 -0.114376 0.808471 0.808471 0.808471 6710.395996 0.000000 3495.710693 0.000000 0.960723 0.000000 0.277509 0.793822 0.793822 0.793822 6669.477539 0.000000 3531.187500 0.000000 0.980367 0.000000 0.197182 0.791675 0.791675 0.791675 6694.777344 0.000000 3520.468262 0.000000 0.365905 0.000000 0.930652 0.747440 0.747440 0.747440 From 52276da37baf9b1c1f10b244349b7147f8ff59e9 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sun, 31 Oct 2021 09:20:27 +0900 Subject: [PATCH 11/19] =?UTF-8?q?=E2=9C=85=20=E3=82=AD=E3=83=A3=E3=83=A9?= =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=BC=E3=83=87=E3=83=BC=E3=82=BF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ニックネーム追加 - 小田治朝の死亡月日を変更 - 小田持家の死亡年月日を変更 - 死因追加 - 小田治孝の死亡月日を変更 - 小田知重の死亡年月日を変更 --- .../12C-05_northern_kanto_characters.txt | 108 ++++++++++++++---- .../characters/eastern_kanto_characters.txt | 86 ++++++++++---- .../characters/southern_oshu_characters.txt | 2 +- .../characters/western_chugoku_characters.txt | 4 +- 4 files changed, 152 insertions(+), 48 deletions(-) diff --git a/history/characters/12C-05_northern_kanto_characters.txt b/history/characters/12C-05_northern_kanto_characters.txt index f71b90b..4f0f257 100644 --- a/history/characters/12C-05_northern_kanto_characters.txt +++ b/history/characters/12C-05_northern_kanto_characters.txt @@ -3215,7 +3215,7 @@ } } 12127500={ - name=character_name_12127500 # Tomoshige + name=character_name_12127500 # Tomoshige, 知重 dynasty=10007007 # Hatta father=12130005 # Hatta Tomoie religion="shinto" @@ -3223,17 +3223,29 @@ 1164.1.1 ={ birth=yes } + 1180.01.01={ + give_nickname="nick_goro" # TODO: 「八田五郎左衛門尉」(『尊卑分脉』) + } + 1214.01.01={ + give_nickname="nick_the_kii_no_kami" # 「紀伊守」「承久乱之時、紀伊前司」(『尊卑分脉』) + trait="jugoi_ge" + } 1222.1.1={ #dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" } - 1228.1.1 ={ - death=yes + 1224.01.01={ + give_nickname="nick_the_sahyoe_no_jo" # 「従五位下左兵衛尉小田知重卒す」(『大日本史料』) + } + 1229.01.09={ + death={ + death_reason=death_natural_causes # 「安貞2(1228)年十二月十三日」(『大日本史料』) + } } # 子に高岡八郎左衛門尉泰重(『尊卑分脉』『系図纂要』) } 12127501={ - name=character_name_12127501 # Aritomo + name=character_name_12127501 # Aritomo, 有知 dynasty=10007007 # Hatta father=12130005 # Hatta Tomoie religion="shinto" @@ -3241,15 +3253,23 @@ 1166.1.1={ birth=yes } + 1182.01.01={ + give_nickname="nick_jio" # 「八田二郎(三イ)」(『尊卑分脉』) + } 1196.01.01={ - dynasty_house="house_shgnt_hatta_ishira" + dynasty_house="house_shgnt_hatta_ishira" # 「伊志良、イ伊自良」(『尊卑分脉』) + } + 1206.01.01={ + give_nickname="nick_the_uemon_no_jo" # 「右衛門尉」(『尊卑分脉』) } 1216.1.1={ - death=yes + death={ + death_reason=death_natural_causes + } } } 12127502={ - name=character_name_12127502 # Tomomoto + name=character_name_12127502 # Tomomoto, 知基、「或知幹、或知俊舎弟云々」(『尊卑分脉』) dynasty=10007007 # Hatta father=12130005 # Hatta Tomoie religion="shinto" @@ -3257,15 +3277,20 @@ 1169.1.1 ={ birth=yes } + 1185.01.01={ + give_nickname="nick_saburo" # 「茂木三郎」(『尊卑分脉』) + } 1199.01.01={ dynasty_house="house_shgnt_hatta_motegi" } - 1219.1.1={ - death=yes + 1239.04.22={ + death={ + death_reason=death_old_age # 「住下野国茂木此所知家建久3(1192)年八月従頼朝拝領之所譲与知基也、外紀州賀太庄、知基承久3(1221)年九月十六日為勲功賞賜之、延応元己亥年(1239年)三月十七日卒」(『茂木文書』「茂木系図」) + } } } 12127503={ - name=character_name_12127503 # Iemasa + name=character_name_12127503 # Iemasa, 家政 dynasty=10007007 # Hatta father=12130005 # Hatta Tomoie religion="shinto" @@ -3273,8 +3298,12 @@ 1188.1.1={ birth=yes } + 1206.01.01={ + give_nickname="nick_shiro" # 「宍戸四郎左衛門」」(『尊卑分脉』) + } 1208.01.01={ dynasty_house="house_shgnt_hatta_shishido" + give_nickname="nick_the_saemon_no_jo" } 1213.5.3={ death={ @@ -3293,11 +3322,13 @@ birth=yes } 1240.1.1={ - death=yes + death={ + death_reason=death_natural_causes + } } } 12127505={ - name=character_name_12127505 # Tomohisa + name=character_name_12127505 # Tomohisa, 知尚 dynasty=10007007 # Hatta father=12130005 # Hatta Tomoie religion="shinto" @@ -3305,10 +3336,14 @@ 1192.1.1={ birth=yes } - 1212.01.01={ - dynasty_house="house_shgnt_hatta_asaba" + 1208.01.01={ + give_nickname="nick_rokuro" # 「号八田六郎、号八田」(『尊卑分脉』) + } + 1210.01.01={ + give_nickname="nick_the_saemon_no_jo" # TODO: 「六郎左衛門」(『尊卑分脉』) } 1221.7.5={ + dynasty_house="house_shgnt_hatta_asaba" death={ death_reason=death_battle } @@ -3323,15 +3358,21 @@ 1194.1.1={ birth=yes } + 1210.01.01={ + give_nickname="nick_kuro" # 「九郎左衛門尉」(『尊卑分脉』) + } 1224.01.01={ dynasty_house="house_shgnt_hatta_tanaka" + give_nickname="nick_the_saemon_no_jo" } 1244.1.1={ - death=yes + death={ + death_reason=death_natural_causes + } } } 12127507={ - name=character_name_12127507 # Tokiie + name=character_name_12127507 # Tokiie,時家、「号小田 高野」 dynasty=10007007 # Hatta father=12130005 # Hatta Tomoie religion="shinto" @@ -3339,11 +3380,19 @@ 1196.1.1={ birth=yes } + 1212.01.01={ + give_nickname="nick_juro" # 「十郎」(『尊卑分脉』) + } 1226.01.01={ dynasty_house="house_shgnt_hatta_takano" } + 1236.01.01={ + give_nickname="nick_the_iga_no_kami" # 「伊賀守」(『尊卑分脉』) + } 1246.1.1={ - death=yes + death={ + death_reason=death_natural_causes + } } } #12127508={ # 12205304とキャラクター重複 (Issue #321) @@ -3363,7 +3412,7 @@ # } #} 12127509={ - name=character_name_12127509 # Meigen + name=character_name_12127509 # Meigen,明玄 dynasty=10007007 # Hatta father=12130005 # Hatta Tomoie religion="shinto" @@ -3373,13 +3422,15 @@ birth=yes } 1210.01.01={ - culture="kanto_buddhist" + culture="kanto_buddhist" # 「大浦法眼 イ大輔法眼」(『尊卑分脉』) } 1230.01.01={ - dynasty_house="house_shgnt_hatta_chuzenji" + dynasty_house="house_shgnt_hatta_chuzenji" # 「中禪寺別当」(尊卑分脉』) } 1250.1.1={ - death=yes + death={ + death_reason=death_natural_causes + } } } 12127510={ @@ -3393,7 +3444,7 @@ birth=yes } #1238.01.01={ - # give_nickname="" # 「小田奥太郎」(『系図纂要』) + # give_nickname="" # TODO: 「小田奥太郎」(『尊卑分脉』) #} # 妻は三浦泰村の娘 1221.01.01={ @@ -3567,6 +3618,10 @@ 1337.1.1={ birth=yes } + 1367.01.01={ + give_nickname="nick_sanuki_no_kami" # 「讃岐守」(「朝日日本歴史人物事典」『コトバンク』) + } + # TODO: 「小田流剣法の祖」(「デジタル版 日本人名大辞典+Plus」『コトバンク』) 1414.7.3={ death=yes # 「応永廿一年六ノ十六卒七十九」(『系図纂要』) } @@ -3644,7 +3699,7 @@ } } 12127570={ - name=character_name_12127570 # Harutomo + name=character_name_12127570 # Harutomo, 治朝、「イ治知」(『小田本宗支族系図』https://clioimg.hi.u-tokyo.ac.jp/viewer/image/idata/200/2075/1085/0141.tif) # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=12127560 # Oda Takatomo @@ -3653,8 +3708,11 @@ 1362.1.1={ birth=yes } - 1403.1.1={ - death=yes + 1392.01.01={ + give_nickname="nick_sanuki_no_kami" # 「讃岐守」(『小田本宗支族系図』) + } + 1403.03.23={ + death=yes # 「応永10(1403)年三月一日先父卒四十一」(『小田本宗支族系図』) } } 12127580={ diff --git a/history/characters/eastern_kanto_characters.txt b/history/characters/eastern_kanto_characters.txt index 825b502..be30198 100644 --- a/history/characters/eastern_kanto_characters.txt +++ b/history/characters/eastern_kanto_characters.txt @@ -1859,7 +1859,7 @@ } } 10010401 = { - name=character_name_10010401 # Masaharu + name=character_name_10010401 # Masaharu, 政治 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=10010403 # Oda Shigeharu @@ -1882,8 +1882,13 @@ set_realm_capital = title:c_shgnt_tsukuha } } + 1522.01.01={ + give_nickname="nick_the_sakyo_dayu" # 「左京大夫」(『小田本宗支族系図』https://clioimg.hi.u-tokyo.ac.jp/viewer/image/idata/200/2075/1085/0150.tif) + } 1548.3.31={ - death=yes + death={ + death_reason=death_natural_causes + } } } 10010402 = { @@ -1905,36 +1910,49 @@ 1534.1.1={ birth=yes } + 1547.01.01={ + give_nickname="nick_Kotaro" # 「通称は小太郎」(「デジタル版 日本人名大辞典+Plus」『コトバンク』) + } 1548.3.31={ effect = { set_realm_capital=title:c_shgnt_tsukuha } } + 1561.01.01={ + give_nickname="nick_sanuki_no_kami" # 「讃岐守」(「佐竹古文書」『史料綜覧』) + } # 永禄12(1569)年、手這坂(てばいざか)合戦で破れ、小田城を失い土浦城に逃げ以後本拠(中根正人「戦国期の東関東:真壁氏と佐竹氏の関係を中心に」、2018。) # 元亀元(1570)年正月、重臣・信太氏を殺害しその城・木田余城を打入、二月から木田余城を居城とする(中根、〃、2018。) # 天正6(1578)年七月、木田余城を失い、土浦城を居城とする(中根、〃、2018。) # 天正14(1586)年二月、藤澤城を居城とする(中根、〃、2018。) 1602.1.6={ - death=yes + death={ + death_reason=death_old_age + } } } 10010403 = { - name=character_name_10010403 # Shigeharu + name=character_name_10010403 # Shigeharu, 成治 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=10010405 religion="shinto" culture="northern_kanto" 1449.7.12={ - birth=yes + birth=yes # 「文安6(1449)年六月二十二日生」(『小田本宗支族系図』https://clioimg.hi.u-tokyo.ac.jp/viewer/image/idata/200/2075/1085/0141.tif) } 1455.6.5={ effect = { set_realm_capital = title:c_shgnt_tsukuha } } + 1449.7.12={ + give_nickname="nick_saemon_no_kami" # 「左衛門督」(『小田本宗支族系図』) + } 1514.5.15={ - death=yes + death={ + death_reason=death_old_age + } } } 10010404 = { @@ -1949,21 +1967,28 @@ birth=yes } 1540.1.1={ - death=yes + death={ + death_reason=death_old_age + } } } 10010405 = { - name=character_name_10010405 # Tomohisa + name=character_name_10010405 # Tomohisa, 朝久、「知久」(「デジタル版 日本人名大辞典+Plus」『コトバンク』) # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda - father=10010406 + father=10010406 # 小田持家(「デジタル版 日本人名大辞典+Plus」『コトバンク』) religion="shinto" culture="northern_kanto" 1417.3.23={ birth=yes } + 1437.01.01={ + give_nickname="nick_nakatsukasa_daihu" # 「中務大輔」(『小田本宗支族系図』https://clioimg.hi.u-tokyo.ac.jp/viewer/image/idata/200/2075/1085/0141.tif) + } 1455.6.5={ - death=yes + death={ + death_reason=death_ill # 「病死」(「デジタル版 日本人名大辞典+Plus」『コトバンク』) + } } } 10010406 = { @@ -1976,15 +2001,18 @@ 1402.1.1={ birth=yes } + # 「応永9(1402)年継祖父跡」(『小田本宗支族系図』https://clioimg.hi.u-tokyo.ac.jp/viewer/image/idata/200/2075/1085/0141.tif) 1432.01.01={ give_nickname="nick_sanuki_no_kami" # 「讃岐守」# 宝徳2(1450)年四月時点、「小田讃岐守」(「足利成氏書状写」『鎌倉大草子』) } - 1481.1.1={ - death=yes + 1487.11.06={ + death={ + death_reason=death_old_age # 「文明19(1487)年十月廿一日卒八十六」(『小田本宗支族系図』) + } } } 10010407 = { - name=character_name_10010407 # Harutaka + name=character_name_10010407 # Harutaka, 治孝 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=10010403 @@ -1993,12 +2021,18 @@ 1472.1.1={ birth=yes } - 1496.1.1={ - death=yes + 1488.01.01={ + give_nickname="nick_taro" # 「太郎」(『小田本宗支族系図』https://clioimg.hi.u-tokyo.ac.jp/viewer/image/idata/200/2075/1085/0141.tif) + } + 1496.04.01={ + death={ + death_reason=death_murder # 「明応5(1496)年閏二月十八日死ス二十五」(『小田本宗支族系図』) + killer=10010408 # 「北条顕家」(「常陸小田治光、其弟北條顯家に殺さる、季弟政治、顯家を殺して、家を嗣ぐ」(『史料綜覧』) + } } } 10010408 = { - name=character_name_10010408 # Akiie + name=character_name_10010408 # Akiie, 顕家,顯家 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=10010403 @@ -2007,8 +2041,15 @@ 1474.1.1={ birth=yes } - 1496.1.1={ - death=yes + 1490.01.01={ + give_nickname="nick_goro" # 「北條五郎」 + dynasty_house="house_shgnt_hatta_hojo" + } + 1496.04.01={ + death={ + death_reason=death_battle + killer=10010401 # 小田政治(『史料綜覧』) + } } } 10010409 = { @@ -2023,7 +2064,9 @@ birth=yes } 1550.1.1={ - death=yes + death={ + death_reason=death_natural_causes + } } } 10010410 = { @@ -2041,7 +2084,7 @@ } } 10010411 = { - name=character_name_10010411 # Moriharu + name=character_name_10010411 # Moriharu, 守治 # dynasty=10000104 # Oda dynasty_house="house_shgnt_hatta_oda" # Oda father=10010402 @@ -2050,6 +2093,9 @@ 1557.1.1={ birth=yes } + 1573.01.01={ + give_nickname="nick_Hikotaro" # 「彦太郎」(「佐竹古文書」『史料綜覧』) + } 1610.1.1={ death=yes } diff --git a/history/characters/southern_oshu_characters.txt b/history/characters/southern_oshu_characters.txt index 90eb04a..1933c3f 100644 --- a/history/characters/southern_oshu_characters.txt +++ b/history/characters/southern_oshu_characters.txt @@ -3982,7 +3982,7 @@ birth=yes } 1447.01.01={ - give_nickname="" # 「幼名三郎」(「蘆名系圖」『会津資料叢書 第6』) + give_nickname="nick_saburo" # 「幼名三郎」(「蘆名系圖」『会津資料叢書 第6』) } 1450.1.1={ add_spouse=10007009 # TODO: 「室 三浦時高ノ妹 大慈院殿」(「蘆名系圖」『会津資料叢書 第6』) diff --git a/history/characters/western_chugoku_characters.txt b/history/characters/western_chugoku_characters.txt index 4fac041..a228c8e 100644 --- a/history/characters/western_chugoku_characters.txt +++ b/history/characters/western_chugoku_characters.txt @@ -5486,7 +5486,7 @@ birth=yes } 1416.01.01={ - give_nickname="" # 「次郎三郎」(『近世防長諸家系図綜覧』) + give_nickname="nick_saburo" # 「次郎三郎」(『近世防長諸家系図綜覧』) } 1420.01.01={ give_nickname="nick_jibu_no_sho" # 「治部少輔」(『近世防長諸家系図綜覧』) @@ -5625,7 +5625,7 @@ birth=yes } 1216.01.01={ - give_nickname="" # 「弥次郎 或左衛門次郎 入道慈願」(『近世防長諸家系図綜覧』) + give_nickname="nick_Yajio" # 「弥次郎 或左衛門次郎 入道慈願」(『近世防長諸家系図綜覧』) } 1268.10.24={ death={ From 46720e854b8bbb4b9b9076bf1ee2cb2c7e075a5d Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sun, 31 Oct 2021 21:00:15 +0900 Subject: [PATCH 12/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e912cff..bc5fab0 100644 --- a/README.md +++ b/README.md @@ -38,4 +38,4 @@ We are looking for people who can help us in the following areas: - Using the map editor to place the treemap objects. - Translating the title name and content of this Steam Workshop into English, French, German, Korean, Russian, Simplified Chinese, Spanish, and other languages. - 3D modeling of character hair and clothes in Maya or Blender, exporting them in PDX format, and adjusting them so that they work in-game. I've put together a post on the Paradox Forum about the 3D models needed for this mod or the main mod. [See also](https://forum.paradoxplaza.com/forum/threads/mod-public-alpha-shogunate-map-alteration-sub-mod.1467780/post-27623098). -It would be helpful if you could inform us in advance to avoid conflicts in the deliverables. Please contact us through [Paradox Forum](https://forum.paradoxplaza.com/forum/threads/mod-public-alpha-shogunate-map-alteration-sub-mod.1467780/) or [Discord](https://discord.gg/jfcSfchJGC). +It would be helpful if you could inform us in advance to avoid conflicts in the deliverables. Please contact us through [Paradox Forum](https://forum.paradoxplaza.com/forum/threads/mod-public-alpha-shogunate-map-alteration-sub-mod.1467780/) or [Discord](https://discord.gg/jfcSfchJGC). \ No newline at end of file From 727f0a4c12f14ef0aefc7044ac3c3dbadda7b276 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sat, 6 Nov 2021 17:19:25 +0900 Subject: [PATCH 13/19] =?UTF-8?q?=F0=9F=90=9B=20The=20lake=20had=20dried?= =?UTF-8?q?=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fixed Issue #326 --- map_data/default.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map_data/default.map b/map_data/default.map index 2de5df7..b7fcdf0 100644 --- a/map_data/default.map +++ b/map_data/default.map @@ -31,7 +31,7 @@ river_provinces = LIST { 3179 } ######## # LAKES ######## -lakes = LIST { 2903 2904 2907 2909 2910 2911 2912 3092 3093 3094 3095 3096 3120 3128 3129 3131 3132 3122 3091 3130 3190 } +lakes = LIST { 2903 2904 2906 2907 2909 2910 2911 2912 3092 3093 3094 3095 3096 3120 3128 3129 3131 3132 3122 3091 3130 3190 } ##################### # IMPASSABLE TERRAIN From 73e3d64f3770a5621a876d7650dab1283d556050 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sun, 31 Oct 2021 17:03:07 +0900 Subject: [PATCH 14/19] =?UTF-8?q?=F0=9F=92=A5=20change=20default=20title?= =?UTF-8?q?=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - b_shgnt_iwafune_4のデフォルト名を変更 - b_shgnt_iwafune_3のデフォルト名を変更 fixed #327 💥 Set up a baronial renaming #323 - Issue #323 --- history/provinces/k_shgnt_hokuriku.txt | 1719 +++++++++-------- history/provinces/k_shgnt_northern_kyushu.txt | 1572 +++++++-------- history/provinces/k_shgnt_shikoku.txt | 867 ++++----- history/provinces/k_shgnt_southern_kinai.txt | 1071 +++++----- history/provinces/k_shgnt_southern_kyushu.txt | 966 ++++----- history/titles/k_shgnt_hokuriku.txt | 507 ++--- history/titles/k_shgnt_northern_kyushu.txt | 484 ++--- history/titles/k_shgnt_shikoku.txt | 363 ++-- history/titles/k_shgnt_southern_kinai.txt | 324 ++-- history/titles/k_shgnt_southern_kyushu.txt | 244 ++- .../english/shgnt_titles_l_english.yml | 20 +- .../japanese/shgnt_titles_l_english.yml | 22 +- 12 files changed, 4162 insertions(+), 3997 deletions(-) diff --git a/history/provinces/k_shgnt_hokuriku.txt b/history/provinces/k_shgnt_hokuriku.txt index a959b29..23816da 100644 --- a/history/provinces/k_shgnt_hokuriku.txt +++ b/history/provinces/k_shgnt_hokuriku.txt @@ -1,1351 +1,1354 @@ #k_shgnt_hokuriku 1415 = { # Asuha_1 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1416 = { # Asuha_2 - culture = western_hokuriku - religion = shinto - holding = castle_holding # 稲津 - 1471.01.01 = { - holding = castle_holding # Ichijodani,一乗谷 - } - 1573.09.16 = { - holding = castle_holding # Togōmakiyama,東郷槇山城 - } + culture = western_hokuriku + religion = shinto + holding = castle_holding # 稲津 + 1471.01.01 = { + holding = castle_holding # Ichijodani,一乗谷 + } + 1573.09.16 = { + holding = castle_holding # Togōmakiyama,東郷槇山城 + } } 1417 = { # Asuha_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1418 = { # Asuha_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1419 = { # Asuha_5 - culture = western_hokuriku - religion = shinto - holding = castle_holding # Kida, 木田 + culture = western_hokuriku + religion = shinto + holding = castle_holding # Kida, 木田 } 1420 = { # Asuha_6 - culture = western_hokuriku - religion = shinto - holding = none - 1394.01.01={ - holding=castle_holding # Ago,安居城 - } + culture = western_hokuriku + religion = shinto + holding = none + 1394.01.01={ + holding=castle_holding # Ago,安居城 + } } 1421 = { # Asuha_7 - culture = western_hokuriku - religion = shinto - holding = castle_holding # Asuwa Mikuriya, 足羽御厨 - 1573.09.16 = { - holding = castle_holding # Kitanoshō - } + culture = western_hokuriku + religion = shinto + holding = castle_holding # Asuwa Mikuriya, 足羽御厨 + 1573.09.16 = { + holding = castle_holding # Kitanoshō + } } 1422 = { # Yoshida_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1423 = { # Yoshida_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1424 = { # Yoshida_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1425 = { # Yoshida_4 - culture = western_hokuriku - religion = shinto - holding = none - 1244.01.01={ - holding=church_holding # Eiheiji,永平寺 - } + culture = western_hokuriku + religion = shinto + holding = none + 1244.01.01={ + holding=church_holding # Eiheiji,永平寺 + } } 1426 = { # Yoshida_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1427 = { # Yoshida_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1428 = { # Yoshida_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1429 = { # Niu_1 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1430 = { # Niu_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1431 = { # Niu_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1432 = { # Niu_4 - culture = western_hokuriku - religion = shinto - holding = city_holding # Kuriyaura, 厨浦 + culture = western_hokuriku + religion = shinto + holding = city_holding # Kuriyaura, 厨浦 } 1433 = { # Niu_5 - culture = western_hokuriku - religion = shinto - holding = church_holding # Tsurugi Jinja, 劔神社 + culture = western_hokuriku + religion = shinto + holding = church_holding # Tsurugi Jinja, 劔神社 } 1434 = { # Niu_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1435 = { # Niu_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1436 = { # Imatachi_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1437 = { # Imatachi_2 - culture = western_hokuriku - religion = shinto - holding = none - 1394.01.01 = { - holding = castle_holding # Kuratani, Komaru - } - 1581.01.01 = { - holding = none - } + culture = western_hokuriku + religion = shinto + holding = none + 1394.01.01 = { + holding = castle_holding # Kuratani, Komaru + } + 1581.01.01 = { + holding = none + } } 1438 = { # Imatachi_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1439 = { # Imatachi_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1440 = { # Imatachi_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1441 = { # Imatachi_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1442 = { # Imatachi_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1443 = { # Imatachi_8 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1444 = { # Nanjo_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1445 = { # Nanjo_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1446 = { # Nanjo_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1447 = { # Nanjo_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1448 = { # Echizen_Sakai_1 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1449 = { # Echizen_Sakai_2 - culture = western_hokuriku - religion = shinto - holding = none - 1394.01.01={ - holding=castle_holding # 溝江郷 → Kanazu,金津城 - } + culture = western_hokuriku + religion = shinto + holding = none + 1394.01.01={ + holding=castle_holding # 溝江郷 → Kanazu,金津城 + } } 1450 = { # Echizen_Sakai_3 - culture = western_hokuriku - religion = shinto - holding = castle_holding # Hikita, 疋田 + culture = western_hokuriku + religion = shinto + holding = castle_holding # Hikita, 疋田 } 1451 = { # Echizen_Sakai_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1452 = { # Echizen_Sakai_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1453 = { # Echizen_Sakai_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1454 = { # Echizen_Sakai_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1455 = { # Echizen_Sakai_8 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1456 = { # Echizen_Sakai_9 - culture = western_hokuriku - religion = shinto - holding = none - 1576.01.01={ - holding=castle_holding # Maruoka,丸岡城 - } + culture = western_hokuriku + religion = shinto + holding = none + 1576.01.01={ + holding=castle_holding # Maruoka,丸岡城 + } } 1457 = { # Echizen_Sakai_10 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1458 = { # Echizen_Sakai_11 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1459 = { # Echizen_Sakai_12 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1460 = { # Echizen_Ono_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1461 = { # Echizen_Ono_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1462 = { # Echizen_Ono_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1463 = { # Echizen_Ono_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1464 = { # Echizen_Ono_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1465 = { # Echizen_Ono_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1466 = { # Echizen_Ono_7 - culture = western_hokuriku - religion = shinto - holding = none - 1575.10.06 = { - holding = castle_holding # Ōno - } + culture = western_hokuriku + religion = shinto + holding = none + 1575.10.06 = { + holding = castle_holding # Ōno + } } 1467 = { # Echizen_Ono_8 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1468 = { # Echizen_Ono_9 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1469 = { # Tsuruga_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1470 = { # Tsuruga_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1471 = { # Kaga_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1472 = { # Kaga_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1473 = { # Kaga_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1474 = { # Kaga_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1475 = { # Kaga_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1476 = { # Kaga_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1477 = { # Kaga_Ishikawa_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1478 = { # Kaga_Ishikawa_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1479 = { # Kaga_Ishikawa_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1480 = { # Kaga_Ishikawa_4 - culture = western_hokuriku - religion = shinto - holding = castle_holding # Togashi no Tate, 富樫館 + culture = western_hokuriku + religion = shinto + holding = castle_holding # Togashi no Tate, 富樫館 } 1481 = { # Kaga_Ishikawa_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1482 = { # Kaga_Ishikawa_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1483 = { # Kaga_Ishikawa_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1484 = { # Kaga_Ishikawa_8 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1485 = { # Kaga_Ishikawa_9 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1486 = { # Kaga_Ishikawa_10 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1487 = { # Kaga_Ishikawa_11 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1488 = { # Kaga_Ishikawa_12 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1489 = { # Kaga_Ishikawa_13 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1490 = { # Kaga_Ishikawa_14 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1491 = { # Kaga_Ishikawa_15 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1492 = { # Nomi_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding # Minato, 湊 + culture = western_hokuriku + religion = shinto + holding = castle_holding # Minato, 湊 } 1493 = { # Nomi_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1494 = { # Nomi_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1495 = { # Nomi_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1496 = { # Nomi_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1497 = { # Nomi_6 - culture = western_hokuriku - religion = shinto - holding = castle_holding # Ataka no Seki, 安宅関 → Komatsu,小松城 + culture = western_hokuriku + religion = shinto + holding = castle_holding # Ataka no Seki, 安宅関 → Komatsu,小松城 } 1498 = { # Nomi_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1499 = { # Nomi_8 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1500 = { # Nomi_9 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1501 = { # Nomi_10 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1502 = { # Nomi_11 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1503 = { # Enuma_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1504 = { # Enuma_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1505 = { # Enuma_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1506 = { # Enuma_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1507 = { # Enuma_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1508 = { # Enuma_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1509 = { # Enuma_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1510 = { # Hakui_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1511 = { # Hakui_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1512 = { # Hakui_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1513 = { # Hakui_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1514 = { # Hakui_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1515 = { # Hakui_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1516 = { # Hakui_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1517 = { # Hakui_8 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1518 = { # Noto_1 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1519 = { # Noto_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1520 = { # Noto_3 - culture = western_hokuriku - religion = shinto - holding = castle_holding # 能登国府 - 1333.07.04 = { - holding = none - } - 1500.01.01 = { - holding = castle_holding # 七尾城 - } - 1589.01.01 = { - holding = none - } + culture = western_hokuriku + religion = shinto + holding = castle_holding # 能登国府 + 1333.07.04 = { + holding = none + } + 1500.01.01 = { + holding = castle_holding # 七尾城 + } + 1589.01.01 = { + holding = none + } } 1521 = { # Noto_4 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1522 = { # Noto_5 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1523 = { # Noto_6 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1524 = { # Noto_7 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1525 = { # Fugeshi_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1526 = { # Fugeshi_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1527 = { # Fugeshi_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1528 = { # Fugeshi_4 - culture = western_hokuriku - religion = shinto - holding = none - 1218.11.16 = { - holding = castle_holding # Anamizu - } + culture = western_hokuriku + religion = shinto + holding = none + 1218.11.16 = { + holding = castle_holding # Anamizu + } } 1529 = { # Suzu_1 - culture = western_hokuriku - religion = shinto - holding = castle_holding + culture = western_hokuriku + religion = shinto + holding = castle_holding } 1530 = { # Suzu_2 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1531 = { # Suzu_3 - culture = western_hokuriku - religion = shinto - holding = none + culture = western_hokuriku + religion = shinto + holding = none } 1532 = { # Shimo_Niikawa_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1533 = { # Shimo_Niikawa_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1534 = { # Shimo_Niikawa_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1535 = { # Shimo_Niikawa_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1536 = { # Shimo_Niikawa_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1537 = { # Shimo_Niikawa_6 - culture = eastern_hokuriku - religion = shinto - holding = none - 1335.01.01 = { - holding = castle_holding # Matsukura - } - 1596.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1335.01.01 = { + holding = castle_holding # Matsukura + } + 1596.01.01 = { + holding = none + } } 1538 = { # Naka_Niikawa_1 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1539 = { # Naka_Niikawa_2 - culture = eastern_hokuriku - religion = shinto - holding = none - 1394.01.01 = { - holding = castle_holding # 弓庄城 - } - 1595.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1394.01.01 = { + holding = castle_holding # 弓庄城 + } + 1595.01.01 = { + holding = none + } } 1540 = { # Naka_Niikawa_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1541 = { # Naka_Niikawa_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1542 = { # Naka_Niikawa_5 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding # 〔平安〕「日置庄」 - 1394.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = castle_holding # 〔平安〕「日置庄」 + 1394.01.01 = { + holding = none + } } 1543 = { # Kami_Niikawa_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1544 = { # Kami_Niikawa_2 - culture = eastern_hokuriku - religion = shinto - holding = none - 1543.01.01 = { - holding = castle_holding # Toyama - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1543.01.01 = { + holding = castle_holding # Toyama + } } 1545 = { # Kami_Niikawa_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1546 = { # Kami_Niikawa_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1547 = { # Kami_Niikawa_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1548 = { # Nei_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1549 = { # Nei_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1550 = { # Nei_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1551 = { # Nei_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1552 = { # Nei_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1553 = { # Nei_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1554 = { # Imizu_1 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1555 = { # Imizu_2 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding # Ōi, 大袋荘 → 放生津城 + culture = eastern_hokuriku + religion = shinto + holding = castle_holding # Ōi, 大袋荘 → 放生津城 } 1556 = { # Imizu_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1557 = { # Imizu_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1558 = { # Imizu_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1559 = { # Imizu_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1560 = { # Imizu_7 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1561 = { # Imizu_8 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1562 = { # Imizu_9 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1563 = { # Imizu_10 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1564 = { # Imizu_11 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1565 = { # Imizu_12 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1566 = { # Imizu_13 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1567 = { # Himi_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1568 = { # Himi_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1569 = { # Himi_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1570 = { # Himi_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1571 = { # Higashi_Tonami_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1572 = { # Higashi_Tonami_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1573 = { # Higashi_Tonami_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1574 = { # Higashi_Tonami_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1575 = { # Higashi_Tonami_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1576 = { # Higashi_Tonami_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1577 = { # Higashi_Tonami_7 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1578 = { # Higashi_Tonami_8 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1579 = { # Nishi_Tonami_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1580 = { # Nishi_Tonami_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1581 = { # Nishi_Tonami_3 - culture = eastern_hokuriku - religion = shinto - holding = none - 1519.01.01 = { - holding = church_holding # Shōkōji - } - 1581.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1519.01.01 = { + holding = church_holding # Shōkōji + } + 1581.01.01 = { + holding = none + } } 1582 = { # Nishi_Tonami_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1583 = { # Nishi_Tonami_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1584 = { # Nishi_Tonami_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1585 = { # Nishi_Tonami_7 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1586 = { # Nishi_Tonami_8 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1587 = { # Kubiki_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1588 = { # Kubiki_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1589 = { # Kubiki_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1590 = { # Kubiki_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1591 = { # Kubiki_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1592 = { # Naka_Kubiki_1 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1593 = { # Naka_Kubiki_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1594 = { # Naka_Kubiki_3 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding # 越後国府 - 1333.07.04 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = castle_holding # 越後国府 + 1333.07.04 = { + holding = none + } } 1595 = { # Naka_Kubiki_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1596 = { # Naka_Kubiki_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1597 = { # Naka_Kubiki_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1598 = { # Naka_Kubiki_7 - culture = eastern_hokuriku - religion = shinto - holding = none - 1532.01.01={ - holding=castle_holding # Samegao,鮫ヶ尾城 - } - 1578.01.01={ - holding=none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1532.01.01={ + holding=castle_holding # Samegao,鮫ヶ尾城 + } + 1578.01.01={ + holding=none + } } 1599 = { # Naka_Kubiki_8 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1600 = { # Naka_Kubiki_9 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1601 = { # Nishi_Kubiki_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1602 = { # Nishi_Kubiki_2 - culture = eastern_hokuriku - religion = shinto - holding = none - 1573.02.03 = { - holding = castle_holding # Nechi - } - 1599.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1573.02.03 = { + holding = castle_holding # Nechi + } + 1599.01.01 = { + holding = none + } } 1603 = { # Nishi_Kubiki_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1604 = { # Iwafune_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1605 = { # Iwafune_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1606 = { # Iwafune_3 - culture = eastern_hokuriku - religion = shinto - holding = none - 1500.01.01 = { - holding = castle_holding # Murakami - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1500.01.01 = { + holding = castle_holding # Murakami + } } 1607 = { # Iwafune_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none + 1333.07.04={ + holding=castle_holding # Hirabayashi,平林城 + } } 1608 = { # Nutari_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1609 = { # Nutari_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1610 = { # Nutari_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1611 = { # Nutari_4 - culture = eastern_hokuriku - religion = shinto - holding = none - 1201.03.28 = { - holding = castle_holding # Shibata - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1201.03.28 = { + holding = castle_holding # Shibata + } } 1612 = { # Nutari_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1613 = { # Nutari_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1614 = { # Nutari_7 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1615 = { # Nutari_8 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1616 = { # Kambara_1 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1617 = { # Kambara_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1618 = { # Kambara_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1619 = { # Kambara_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1620 = { # Kambara_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1621 = { # Kambara_6 - culture = eastern_hokuriku - religion = shinto - holding = none - 1000.01.01 = { - holding = castle_holding # Gomadō; Sanjō - } - 1642.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1000.01.01 = { + holding = castle_holding # Gomadō; Sanjō + } + 1642.01.01 = { + holding = none + } } 1622 = { # Kambara_7 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1623 = { # Kambara_8 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1624 = { # Kambara_9 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1625 = { # Nishi_Kambara_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1626 = { # Nishi_Kambara_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1627 = { # Nishi_Kambara_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1628 = { # Nishi_Kambara_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1629 = { # Nishi_Kambara_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1630 = { # Nishi_Kambara_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1631 = { # Nishi_Kambara_7 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1632 = { # Nishi_Kambara_8 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1633 = { # Higashi_Kambara_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1634 = { # Higashi_Kambara_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1635 = { # Higashi_Kambara_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1636 = { # Mishima_1 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1637 = { # Mishima_2 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding - 1579.2.28 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = castle_holding + 1579.2.28 = { + holding = none + } } 1638 = { # Mishima_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1639 = { # Mishima_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1640 = { # Mishima_5 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1641 = { # Mishima_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1642 = { # Kita_Iwonuma_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1643 = { # Kita_Iwonuma_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1644 = { # Kita_Iwonuma_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1645 = { # Kita_Iwonuma_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1646 = { # Iwonuma_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1647 = { # Iwonuma_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1648 = { # Iwonuma_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1649 = { # Iwonuma_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1650 = { # Iwonuma_5 - culture = eastern_hokuriku - religion = shinto - holding = none - 1392.01.01 = { - holding = castle_holding # Sakado - } - 1609.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1392.01.01 = { + holding = castle_holding # Sakado + } + 1609.01.01 = { + holding = none + } } 1651 = { # Iwonuma_6 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1652 = { # Koshi_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding - 1616.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = castle_holding + 1616.01.01 = { + holding = none + } } 1653 = { # Koshi_2 - culture = eastern_hokuriku - religion = shinto - holding = none - 1392.01.01 = { - holding = castle_holding # Tochio - } - 1610.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1392.01.01 = { + holding = castle_holding # Tochio + } + 1610.01.01 = { + holding = none + } } 1654 = { # Koshi_3 - culture = eastern_hokuriku - religion = shinto - holding = none - 1504.01.01 = { - holding = castle_holding # Suyoshi - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1504.01.01 = { + holding = castle_holding # Suyoshi + } } 1655 = { # Koshi_4 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1656 = { # Santo_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1657 = { # Santo_2 - culture = eastern_hokuriku - religion = shinto - holding = none - 1550.01.01 = { - holding = castle_holding # Yoita - } - 1599.01.01 = { - holding = none - } + culture = eastern_hokuriku + religion = shinto + holding = none + 1550.01.01 = { + holding = castle_holding # Yoita + } + 1599.01.01 = { + holding = none + } } 1658 = { # Santo_3 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } 1659 = { # Sawada_1 - culture = eastern_hokuriku - religion = shinto - holding = castle_holding + culture = eastern_hokuriku + religion = shinto + holding = castle_holding } 1660 = { # Sawada_2 - culture = eastern_hokuriku - religion = shinto - holding = none + culture = eastern_hokuriku + religion = shinto + holding = none } diff --git a/history/provinces/k_shgnt_northern_kyushu.txt b/history/provinces/k_shgnt_northern_kyushu.txt index 9b42c56..6e27fa5 100644 --- a/history/provinces/k_shgnt_northern_kyushu.txt +++ b/history/provinces/k_shgnt_northern_kyushu.txt @@ -1,1231 +1,1243 @@ #k_shgnt_northern_kyushu 2250 = { # Onga_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2251 = { # Onga_2 - culture = northern_kyushu - religion = shinto - holding = none - 1469.01.01={ - holding=castle_holding # Oka, 岡城 - } - 1570.01.01={ - holding=none # TODO 岡城の廃城年月日は要検討 - } + culture = northern_kyushu + religion = shinto + holding = none + 1469.01.01={ + holding=castle_holding # Oka, 岡城 + } + 1570.01.01={ + holding=none # TODO 岡城の廃城年月日は要検討 + } } 2252 = { # Onga_3 - culture = northern_kyushu - religion = shinto - holding = none - 1194.01.01 = { - holding = castle_holding # 花尾城 - } - 1569.01.01 = { - holding = none - } + culture = northern_kyushu + religion = shinto + holding = none + 1194.01.01 = { + holding = castle_holding # 花尾城 + } + 1569.01.01 = { + holding = none + } } 2253 = { # Onga_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2254 = { # Munakata_1 - culture = northern_kyushu - religion = shinto - holding = church_holding + culture = northern_kyushu + religion = shinto + holding = church_holding } 2255 = { # Munakata_2 - culture = northern_kyushu - religion = shinto - holding = none - 1445.01.01={ - holding=castle_holding # Tsutadake, 蘿岳城 - } - 1588.01.01={ - holding=none # Akama, 赤間 - } + culture = northern_kyushu + religion = shinto + holding = none + 1445.01.01={ + holding=castle_holding # Tsutadake, 蘿岳城 + } + 1588.01.01={ + holding=none # Akama, 赤間 + } } 2256 = { # Munakata_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2257 = { # Munakata_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2258 = { # Munakata_5 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2259 = { # Kurate_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2260 = { # Kurate_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2261 = { # Kurate_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2262 = { # Kurate_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2263 = { # Kurate_5 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2264 = { # Honami_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2265 = { # Honami_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2266 = { # Honami_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2267 = { # Honami_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2268 = { # Kama_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2269 = { # Kama_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2270 = { # Kama_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2271 = { # Kama_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2272 = { # Kamutsuasakura_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2273 = { # Kamutsuasakura_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2274 = { # Shimotsuasakura_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2275 = { # Shimotsuasakura_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2276 = { # Chikuzen_Yasu_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2277 = { # Chikuzen_Yasu_2 - culture = northern_kyushu - religion = shinto - holding = castle_holding - 1203.01.01 = { - holding = castle_holding # 古処山城 - } - 1587.01.01 = { - holding = none - } + culture = northern_kyushu + religion = shinto + holding = castle_holding + 1203.01.01 = { + holding = castle_holding # 古処山城 + } + 1587.01.01 = { + holding = none + } } 2278 = { # Chikuzen_Yasu_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2279 = { # Mikasa_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding # 太宰府 - 1532.01.01 = { - holding = castle_holding # 岩屋城 - } - 1597.1.15 = { - holding = none # 落城 - } + culture = northern_kyushu + religion = shinto + holding = castle_holding # 太宰府 + 1532.01.01 = { + holding = castle_holding # 岩屋城 + } + 1597.1.15 = { + holding = none # 落城 + } } 2280 = { # Mikasa_2 - culture = northern_kyushu - religion = shinto - holding = none - 1533.01.01={ - holding=castle_holding # Hōmanzan, 宝満山城 - } - 1586.01.01={ - holding=none # TODO 宝満山城の廃城年月日については要検討 - } + culture = northern_kyushu + religion = shinto + holding = none + 1533.01.01={ + holding=castle_holding # Hōmanzan, 宝満山城 + } + 1586.01.01={ + holding=none # TODO 宝満山城の廃城年月日については要検討 + } } 2281 = { # Mikasa_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2282 = { # Mikasa_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2283 = { # Kasuya_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2284 = { # Kasuya_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2285 = { # Kasuya_3 - culture = northern_kyushu - religion = shinto - holding = none - 1334.01.01 = { - holding = castle_holding # 立花山城 - } - 1600.01.01 = { - holding = none - } + culture = northern_kyushu + religion = shinto + holding = none + 1334.01.01 = { + holding = castle_holding # 立花山城 + } + 1600.01.01 = { + holding = none + } } 2286 = { # Kasuya_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2287 = { # Kasuya_5 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2288 = { # Mushirota_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2289 = { # Chikuzen_Naka_1 - culture = northern_kyushu - religion = shinto - holding = city_holding + culture = northern_kyushu + religion = shinto + holding = city_holding } 2290 = { # Chikuzen_Naka_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2291 = { # Chikuzen_Naka_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2292 = { # Chikuzen_Naka_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none + 1284.01.01={ + holding=castle_holding # Iwato,岩門城 + } } 2293 = { # Sahara_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2294 = { # Sahara_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2295 = { # Sahara_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2296 = { # Sahara_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2297 = { # Chikuzen_Ito_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2298 = { # Chikuzen_Ito_2 - culture = northern_kyushu - religion = shinto - holding = castle_holding -# 1249.01.01 = { -# holding = castle_holding # Takasu -# } + culture = northern_kyushu + religion = shinto + holding = castle_holding +# 1249.01.01 = { +# holding = castle_holding # Takasu +# } } 2299 = { # Chikuzen_Ito_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2300 = { # Chikuzen_Ito_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2301 = { # Chikuzen_Shima_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2302 = { # Chikuzen_Shima_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2303 = { # Chikuzen_Shima_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2304 = { # Chikuzen_Shima_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2305 = { # Ikuha_1 - culture = central_kyushu - religion = shinto - holding = none - 1313.01.01 = { - holding = castle_holding # 長岩城 - } - 1587.01.01 = { - holding = none - } + culture = central_kyushu + religion = shinto + holding = none + 1313.01.01 = { + holding = castle_holding # 長岩城 + } + 1587.01.01 = { + holding = none + } } 2306 = { # Ikuha_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2307 = { # Takano_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2308 = { # Takano_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2309 = { # Chikugo_Yamamoto_1 - culture = central_kyushu - religion = shinto - holding = castle_holding - 1587.01.01 = { - holding = none - } + culture = central_kyushu + religion = shinto + holding = castle_holding + 1587.01.01 = { + holding = none + } } 2310 = { # Mihara_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2311 = { # Mihara_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2312 = { # Mihara_3 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2313 = { # Mii_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2314 = { # Mii_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2315 = { # Mii_3 - culture = central_kyushu - religion = shinto - holding = castle_holding # 筑後国府 - 1333.07.04 = { - holding = church_holding # Kōra, 高良大社 - } + culture = central_kyushu + religion = shinto + holding = castle_holding # 筑後国府 + 1333.07.04 = { + holding = church_holding # Kōra, 高良大社 + } } 2316 = { # Kamutsuma_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2317 = { # Kamutsuma_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2318 = { # Kamutsuma_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2319 = { # Kamutsuma_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2320 = { # Shimotsuma_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2321 = { # Minuma_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2322 = { # Minuma_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2323 = { # Minuma_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2324 = { # Minuma_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2325 = { # Minuma_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2326 = { # Minuma_6 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2327 = { # Minuma_7 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2328 = { # Minuma_8 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2329 = { # Minuma_9 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2330 = { # Yamato_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2331 = { # Yamato_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2332 = { # Yamato_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2333 = { # Yamato_4 - culture = central_kyushu - religion = shinto - holding = castle_holding -# 1470.01.01 = { -# holding = castle_holding # Yanagawa -# } + culture = central_kyushu + religion = shinto + holding = castle_holding +# 1470.01.01 = { +# holding = castle_holding # Yanagawa +# } } 2334 = { # Yamato_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2335 = { # Mike_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2336 = { # Mike_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2337 = { # Mike_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2338 = { # Mike_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2339 = { # Kiku_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2340 = { # Kiku_2 - culture = northern_kyushu - religion = shinto - holding = none - 1550.01.01 = { - holding = castle_holding # 小三岳城 - } - 1568.09.05 = { - holding = none - } + culture = northern_kyushu + religion = shinto + holding = none + 1550.01.01 = { + holding = castle_holding # 小三岳城 + } + 1568.09.05 = { + holding = none + } } 2341 = { # Kiku_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2342 = { # Kiku_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2343 = { # Buzen_Takawa_1 - culture = northern_kyushu - religion = shinto - holding = church_holding # Hikosan, 英彦山 + culture = northern_kyushu + religion = shinto + holding = church_holding # Hikosan, 英彦山 } 2344 = { # Buzen_Takawa_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2345 = { # Buzen_Takawa_3 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2346 = { # Buzen_Takawa_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2347 = { # Miyako_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2348 = { # Miyako_2 - culture = northern_kyushu - religion = shinto - holding = castle_holding # 馬ヶ岳城 - 942.01.01={ - holding = castle_holding # 馬ヶ岳城 - } + culture = northern_kyushu + religion = shinto + holding = castle_holding # 馬ヶ岳城 + 942.01.01={ + holding = castle_holding # 馬ヶ岳城 + } } 2349 = { # Nakatsu_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding # 豊前国府 - 1333.07.04 = { - holding = none # Saigawa, 犀川 - } + culture = northern_kyushu + religion = shinto + holding = castle_holding # 豊前国府 + 1333.07.04 = { + holding = none # Saigawa, 犀川 + } } 2350 = { # Nakatsu_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2351 = { # Nakatsu_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2352 = { # Tsuiki_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2353 = { # Tsuiki_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2354 = { # Tsuiki_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2355 = { # Kamutsumike_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2356 = { # Kamutsumike_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2357 = { # Kamutsumike_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2358 = { # Shimotsumike_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2359 = { # Shimotsumike_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2360 = { # Shimotsumike_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2361 = { # Shimotsumike_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2362 = { # Shimotsumike_5 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2363 = { # Usa_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2364 = { # Usa_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2365 = { # Usa_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none + 1499.01.01={ + holding=castle_holding # Myōkendake,妙見嶽城 + } } 2366 = { # Usa_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2367 = { # Usa_5 - culture = northern_kyushu - religion = shinto - holding = church_holding + culture = northern_kyushu + religion = shinto + holding = church_holding } 2368 = { # Usa_6 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2369 = { # Kunsaki_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2370 = { # Kunsaki_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2371 = { # Kunsaki_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2372 = { # Kunsaki_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2373 = { # Kunsaki_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2374 = { # Kunsaki_6 - culture = central_kyushu - religion = shinto - holding = none - 1394.01.01 = { - holding = castle_holding # Aki - } + culture = central_kyushu + religion = shinto + holding = none + 1394.01.01 = { + holding = castle_holding # Aki + } } 2375 = { # Kunsaki_7 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2376 = { # Kunsaki_8 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2377 = { # Hayami_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2378 = { # Hayami_2 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2379 = { # Hayami_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2380 = { # Hayami_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2381 = { # Hayami_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2382 = { # Oita_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2383 = { # Oita_2 - culture = central_kyushu - religion = shinto - holding = church_holding + culture = central_kyushu + religion = shinto + holding = church_holding } 2384 = { # Oita_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2385 = { # Oita_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2386 = { # Oita_5 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2387 = { # Oita_6 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2388 = { # Bungo_Ama_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2389 = { # Bungo_Ama_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2390 = { # Bungo_Ama_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2391 = { # Bungo_Ama_4 - culture = central_kyushu - religion = shinto - holding = none - 1521.01.01 = { - holding = castle_holding # Togamure - } + culture = central_kyushu + religion = shinto + holding = none + 1521.01.01 = { + holding = castle_holding # Togamure + } } 2392 = { # Bungo_Ama_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2393 = { # Bungo_Ama_6 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2394 = { # Bungo_Ono_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2395 = { # Bungo_Ono_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2396 = { # Bungo_Ono_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2397 = { # Bungo_Ono_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2398 = { # Bungo_Ono_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2399 = { # Bungo_Ono_6 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2400 = { # Bungo_Ono_7 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2401 = { # Naori_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2402 = { # Naori_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2403 = { # Naori_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2404 = { # Naori_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2405 = { # Kusu_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2406 = { # Kusu_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2407 = { # Hita_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2408 = { # Hita_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2409 = { # Hita_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2410 = { # Hita_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2411 = { # Hizen_Kii_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2412 = { # Hizen_Yafu_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2413 = { # Hizen_Yafu_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2414 = { # Hizen_Mine_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2415 = { # Hizen_Mine_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2416 = { # Hizen_Mine_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2417 = { # Kamusaki_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2418 = { # Kamusaki_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2419 = { # Kamusaki_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2420 = { # Kamusaki_4 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2421 = { # Kamusaki_5 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2422 = { # Saka_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2423 = { # Saka_2 - culture = northern_kyushu - religion = shinto - holding = church_holding + culture = northern_kyushu + religion = shinto + holding = church_holding } 2424 = { # Saka_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2425 = { # Saka_4 - culture = northern_kyushu - religion = shinto - holding = castle_holding # 肥前国府 - 1333.07.04 = { - holding = none # Chifu, 千布 - } + culture = northern_kyushu + religion = shinto + holding = castle_holding # 肥前国府 + 1333.07.04 = { + holding = none # Chifu, 千布 + } } 2426 = { # Saka_5 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2427 = { # Saka_6 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2428 = { # Saka_7 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2429 = { # Saka_8 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2430 = { # Saka_9 - culture = northern_kyushu - religion = shinto - holding = none - 1469.01.01 = { - holding = castle_holding # Mizugae - } + culture = northern_kyushu + religion = shinto + holding = none + 1469.01.01 = { + holding = castle_holding # Mizugae + } } 2431 = { # Oki_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2432 = { # Oki_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none + 1290.01.01={ + holding=castle_holding # Haruke,晴気城 + } + 1499.01.01={ + holding=none # 晴気城落城、千葉胤資自害 + } } 2433 = { # Oki_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2434 = { # Oki_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2435 = { # Oki_5 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2436 = { # Higashi_Matsura_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2437 = { # Higashi_Matsura_2 - culture = northern_kyushu - religion = shinto - holding = none - 1110.01.01 = { - holding = castle_holding # 波多城 - } - 1593.01.01 = { - holding = none - } + culture = northern_kyushu + religion = shinto + holding = none + 1110.01.01 = { + holding = castle_holding # 波多城 + } + 1593.01.01 = { + holding = none + } } 2438 = { # Higashi_Matsura_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2439 = { # Higashi_Matsura_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2440 = { # Nishi_Matsura_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2441 = { # Nishi_Matsura_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2442 = { # Nishi_Matsura_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2443 = { # Kita_Matsura_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2444 = { # Kita_Matsura_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2445 = { # Kita_Matsura_3 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2446 = { # Kita_Matsura_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2447 = { # Kita_Matsura_5 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2448 = { # Minami_Matsura_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding - 1521.01.01 = { - holding = castle_holding # Egawa[江川] - } - 1614.01.01 = { - holding = none - } + culture = northern_kyushu + religion = shinto + holding = castle_holding + 1521.01.01 = { + holding = castle_holding # Egawa[江川] + } + 1614.01.01 = { + holding = none + } } 2449 = { # Kishima_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2450 = { # Kishima_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2451 = { # Kishima_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2452 = { # Kishima_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2453 = { # Kishima_5 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2454 = { # Kishima_6 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2455 = { # Kishima_7 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2456 = { # Fujitsu_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2457 = { # Fujitsu_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2458 = { # Fujitsu_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2459 = { # Sonoki_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2460 = { # Sonoki_2 - culture = northern_kyushu - religion = shinto - holding = castle_holding -# 1551.07.18 = { -# holding = castle_holding # Yoshitake -# } + culture = northern_kyushu + religion = shinto + holding = castle_holding +# 1551.07.18 = { +# holding = castle_holding # Yoshitake +# } } 2461 = { # Sonoki_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2462 = { # Sonoki_4 - culture = northern_kyushu - religion = shinto - holding = none - 1571.04.27 = { - holding = city_holding # Nagasaki, 長崎港 - } + culture = northern_kyushu + religion = shinto + holding = none + 1571.04.27 = { + holding = city_holding # Nagasaki, 長崎港 + } } 2463 = { # Kita_Takaku_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2464 = { # Kita_Takaku_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2465 = { # Kita_Takaku_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2466 = { # Kita_Takaku_4 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2467 = { # Minami_Takaku_1 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2468 = { # Minami_Takaku_2 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2469 = { # Minami_Takaku_3 - culture = northern_kyushu - religion = shinto - holding = none + culture = northern_kyushu + religion = shinto + holding = none } 2470 = { # Minami_Takaku_4 - culture = northern_kyushu - religion = shinto - holding = castle_holding -# 1213.01.01 = { -# holding = castle_holding # Hinoe -# } + culture = northern_kyushu + religion = shinto + holding = castle_holding +# 1213.01.01 = { +# holding = castle_holding # Hinoe +# } } 2622 = { # Iki_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2623 = { # Ishita_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2624 = { # Kamutsuakata_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } 2625 = { # Shimotsuakata_1 - culture = northern_kyushu - religion = shinto - holding = castle_holding + culture = northern_kyushu + religion = shinto + holding = castle_holding } diff --git a/history/provinces/k_shgnt_shikoku.txt b/history/provinces/k_shgnt_shikoku.txt index 7abfb27..1d028c9 100644 --- a/history/provinces/k_shgnt_shikoku.txt +++ b/history/provinces/k_shgnt_shikoku.txt @@ -1,703 +1,706 @@ #k_shgnt_shikoku 2110 = { # Tsuna_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2111 = { # Tsuna_2 - culture = shikoku - religion = shinto - holding = none - 1526.01.01 = { - holding = castle_holding # Sumoto - } + culture = shikoku + religion = shinto + holding = none + 1526.01.01 = { + holding = castle_holding # Sumoto + } } 2112 = { # Tsuna_3 - culture = shikoku - religion = shinto - holding = church_holding + culture = shikoku + religion = shinto + holding = church_holding } 2113 = { # Tsuna_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2114 = { # Awaji_Mihara_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2115 = { # Awaji_Mihara_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2116 = { # Awaji_Mihara_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2117 = { # Awaji_Mihara_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2118 = { # Awa_Miyoshi_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2119 = { # Awa_Miyoshi_2 - culture = shikoku - religion = shinto - holding = none - 1221.01.01 = { - holding = castle_holding # Hakuchi - } + culture = shikoku + religion = shinto + holding = none + 1221.01.01 = { + holding = castle_holding # Hakuchi + } } 2120 = { # Mima_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2121 = { # Mima_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2122 = { # Mima_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2123 = { # Awa_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2124 = { # Bansei_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2125 = { # Bansei_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2126 = { # Bando_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2127 = { # Bando_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2128 = { # Oe_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2129 = { # Oe_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2130 = { # Nakatanonishi_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2131 = { # Nakatanonishi_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2132 = { # Nakatanohigashi_1 - culture = shikoku - religion = shinto - holding = castle_holding # 阿波国府 - 1333.07.04 = { - holding = none # Inozu, 渭津 - } - 1585.01.01 = { - holding = castle_holding # Tokushima, 徳島 - } + culture = shikoku + religion = shinto + holding = castle_holding # 阿波国府 + 1333.07.04 = { + holding = none # Inozu, 渭津 + } + 1585.01.01 = { + holding = castle_holding # Tokushima, 徳島 + } } 2133 = { # Nakatanohigashi_2 - culture = shikoku - religion = shinto - holding = church_holding + culture = shikoku + religion = shinto + holding = church_holding } 2134 = { # Katsura_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2135 = { # Katsura_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2136 = { # Awa_Naka_1 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2137 = { # Awa_Naka_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2138 = { # Awa_Naka_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2139 = { # Awa_Naka_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2140 = { # Awa_Naka_5 - culture = shikoku - religion = shinto - holding = none - 1394.01.01 = { - holding = castle_holding # Ushiki - } + culture = shikoku + religion = shinto + holding = none + 1394.01.01 = { + holding = castle_holding # Ushiki + } } 2141 = { # Awa_Ama_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2142 = { # Awa_Ama_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2143 = { # Awa_Ama_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2144 = { # Awa_Ama_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2145 = { # Ouchi_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2146 = { # Ouchi_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2147 = { # Sanuki_Samukawa_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2148 = { # Sanuki_Samukawa_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2149 = { # Sanuki_Samukawa_3 - culture = shikoku - religion = shinto - holding = none - 1457.01.01 = { - holding = castle_holding # Ametaki - } + culture = shikoku + religion = shinto + holding = none + 1457.01.01 = { + holding = castle_holding # Ametaki + } } 2150 = { # Sanuki_Samukawa_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2151 = { # Sanuki_Samukawa_5 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2152 = { # Miki_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2153 = { # Miki_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2154 = { # Sanuki_Yamata_1 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2155 = { # Sanuki_Yamata_2 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2156 = { # Kakawa_1 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2157 = { # Kakawa_2 - culture = shikoku - religion = shinto - holding = church_holding - 1219.01.01 = { - holding = castle_holding # Katsuga, Fujio - } + culture = shikoku + religion = shinto + holding = church_holding + 1219.01.01 = { + holding = castle_holding # Katsuga, Fujio + } } 2158 = { # Aya_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2159 = { # Aya_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2160 = { # Aya_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2161 = { # Utari_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2162 = { # Utari_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2163 = { # Tado_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2164 = { # Tado_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2165 = { # Sanuki_Naka_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2166 = { # Sanuki_Naka_2 - culture = shikoku - religion = shinto - holding = church_holding + culture = shikoku + religion = shinto + holding = church_holding } 2167 = { # Sanuki_Mino_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2168 = { # Sanuki_Mino_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2169 = { # Sanuki_Toyota_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2170 = { # Sanuki_Toyota_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2172 = { # Uma_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2173 = { # Uma_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2174 = { # Nii_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2175 = { # Nii_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2176 = { # Sufu_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2177 = { # Sufu_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2178 = { # Kuwamura_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2179 = { # Kuwamura_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2180 = { # Ochi_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2181 = { # Ochi_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2182 = { # Ochi_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2183 = { # Noma_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2184 = { # Noma_2 - culture = shikoku - religion = shinto - holding = church_holding + culture = shikoku + religion = shinto + holding = church_holding } 2185 = { # Kazahaya_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2186 = { # Kazahaya_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2187 = { # Kazahaya_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2188 = { # Iyo_Wake_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2189 = { # Iyo_Wake_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2190 = { # Yu_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2191 = { # Yu_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2192 = { # Iyo_Kume_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2193 = { # Iyo_Kume_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2194 = { # Iyo_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2195 = { # Iyo_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2196 = { # Iyo_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2197 = { # Iyo_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2198 = { # Ukena_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2199 = { # Ukena_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2200 = { # Ukena_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2201 = { # Ukena_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2202 = { # Ukena_5 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2203 = { # Iyo_Kita_1 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2204 = { # Iyo_Kita_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2205 = { # Iyo_Kita_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2206 = { # Iyo_Kita_4 - culture = shikoku - religion = shinto - holding = castle_holding -# 1331.01.01 = { -# holding = castle_holding # Ōzu -# } + culture = shikoku + religion = shinto + holding = castle_holding +# 1331.01.01 = { +# holding = castle_holding # Ōzu +# } } 2207 = { # Iyo_Kita_5 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2208 = { # Kita_Uwa_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2209 = { # Kita_Uwa_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2210 = { # Kita_Uwa_3 - culture = shikoku - religion = shinto - holding = none - 1394.01.01 = { - holding = castle_holding # Matsuba - } + culture = shikoku + religion = shinto + holding = none + 1394.01.01 = { + holding = castle_holding # Matsuba + } } 2211 = { # Kita_Uwa_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2212 = { # Kita_Uwa_5 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2213 = { # Minami_Uwa_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2214 = { # Minami_Uwa_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2215 = { # Minami_Uwa_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2216 = { # Minami_Uwa_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2217 = { # Minami_Uwa_5 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2218 = { # Minami_Uwa_6 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2219 = { # Aki_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2220 = { # Aki_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2221 = { # Kagami_1 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2222 = { # Kagami_2 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2223 = { # Kagami_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2224 = { # Nagaoka_1 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2225 = { # Nagaoka_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2226 = { # Nagaoka_3 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2227 = { # Nagaoka_4 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2228 = { # Tosa_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2229 = { # Tosa_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2230 = { # Tosa_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2231 = { # Agawa_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2232 = { # Agawa_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2233 = { # Agawa_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2234 = { # Takaoka_1 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2235 = { # Takaoka_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2236 = { # Takaoka_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2237 = { # Takaoka_4 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2238 = { # Takaoka_5 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2239 = { # Takaoka_6 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none + 1333.07.04={ + holding=castle_holding # Himenono,姫野々城 + } } 2240 = { # Hata_1 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2241 = { # Hata_2 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2242 = { # Hata_3 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2243 = { # Hata_4 - culture = shikoku - religion = shinto - holding = castle_holding + culture = shikoku + religion = shinto + holding = castle_holding } 2244 = { # Hata_5 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } 2245 = { # Hata_6 - culture = shikoku - religion = shinto - holding = none + culture = shikoku + religion = shinto + holding = none } diff --git a/history/provinces/k_shgnt_southern_kinai.txt b/history/provinces/k_shgnt_southern_kinai.txt index fde9240..2a4e544 100644 --- a/history/provinces/k_shgnt_southern_kinai.txt +++ b/history/provinces/k_shgnt_southern_kinai.txt @@ -1,860 +1,869 @@ #k_shgnt_southern_kinai 32 = { # Sonokami_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 33 = { # Sonokami_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 34 = { # Sonokami_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 35 = { # Sonokami_4 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 36 = { # Sonokami_5 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 37 = { # Sonokami_6 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 38 = { # Sonokami_7 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 39 = { # Nara_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 40 = { # Nara_2 - culture = southern_kinai - religion = shinto - holding = church_holding - 1560.01.01 = { - holding = castle_holding # Tamonyama - } + culture = southern_kinai + religion = shinto + holding = church_holding + 1560.01.01 = { + holding = castle_holding # Tamonyama + } } 41 = { # Sounoshimo_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 42 = { # Sounoshimo_2 - culture = southern_kinai - religion = shinto - holding = church_holding + culture = southern_kinai + religion = shinto + holding = church_holding } 43 = { # Sounoshimo_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 44 = { # Sounoshimo_4 - culture = southern_kinai - religion = shinto - holding = none - 1394.01.01 = { - holding = castle_holding # Tsutsui, Kōriyama - } + culture = southern_kinai + religion = shinto + holding = none + 1394.01.01 = { + holding = castle_holding # Tsutsui, Kōriyama + } } 45 = { # Heguri_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 46 = { # Heguri_2 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 47 = { # Heguri_3 - culture = southern_kinai - religion = shinto - holding = church_holding + culture = southern_kinai + religion = shinto + holding = church_holding } 48 = { # Yamanobe_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 49 = { # Yamanobe_2 - culture = southern_kinai - religion = shinto - holding = castle_holding # Kishida,岸田 + culture = southern_kinai + religion = shinto + holding = castle_holding # Kishida,岸田 } 50 = { # Yamanobe_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 51 = { # Yamanobe_4 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 52 = { # Yamanobe_5 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 53 = { # Uda_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 54 = { # Uda_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 55 = { # Uda_3 - culture = southern_kinai - religion = shinto - holding = castle_holding - 1573.01.01 = { - holding = none - } + culture = southern_kinai + religion = shinto + holding = castle_holding + 1573.01.01 = { + holding = none + } } 56 = { # Shikinokami_1 - culture = southern_kinai - religion = shinto - holding = church_holding + culture = southern_kinai + religion = shinto + holding = church_holding } 57 = { # Shikinokami_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 58 = { # Shikinoshimo_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 59 = { # Shikinoshimo_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 60 = { # Tochi_1 - culture = southern_kinai - religion = shinto - holding = none - 1200.01.01 = { - holding = castle_holding # Tōichi - } - 1578.02.23 = { - holding = none - } + culture = southern_kinai + religion = shinto + holding = none + 1200.01.01 = { + holding = castle_holding # Tōichi + } + 1578.02.23 = { + holding = none + } } 61 = { # Tochi_2 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 62 = { # Tochi_3 - culture = southern_kinai - religion = shinto - holding = church_holding + culture = southern_kinai + religion = shinto + holding = church_holding } 63 = { # Hirose_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 64 = { # Hirose_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 65 = { # Kazuraknokami_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 66 = { # Kazuraknokami_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 67 = { # Kazurakinoshimo_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 68 = { # Kazurakinoshimo_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 69 = { # Kazurakinoshimo_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 70 = { # Kazurakinoshimo_4 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 71 = { # Takechi_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 72 = { # Takechi_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 73 = { # Takechi_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 74 = { # Takechi_4 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 75 = { # Uchi_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 76 = { # Uchi_2 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 77 = { # Oshinomi_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 78 = { # Yoshino_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 79 = { # Yoshino_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 80 = { # Yoshino_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 81 = { # Yoshino_4 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 82 = { # Yoshino_5 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 83 = { # Yoshino_6 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 84 = { # Manda_1 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 85 = { # Manda_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 86 = { # Manda_3 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 87 = { # Manda_4 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 88 = { # Katano_1 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 89 = { # Katano_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 90 = { # Sarara_1 - culture = central_kinai - religion = shinto - holding = none - 1532.01.01 = { - holding = castle_holding # Iimoriyama - } + culture = central_kinai + religion = shinto + holding = none + 1532.01.01 = { + holding = castle_holding # Iimoriyama + } } 91 = { # Sarara_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 92 = { # Kawachi_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 93 = { # Kawachi_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 94 = { # Wakae_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 95 = { # Wakae_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none + 1382.02.01={ + holding=castle_holding # Wakae,若江城 + } + 1581.01.01={ + holding=none + } } 96 = { # Wakae_3 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 97 = { # Takayasu_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 98 = { # Takayasu_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 99 = { # Shibukawa_1 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 100 = { # Shibukawa_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 101 = { # Oagata_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 102 = { # Oagata_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 103 = { # Shiki_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 104 = { # Shiki_2 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding + 1333.07.04={ + holding=church_holding # Dōmyōji,道明寺 + } } 105 = { # Tanbo_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 106 = { # Tanbo_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 107 = { # Tannan_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 108 = { # Tannan_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 109 = { # Yakami_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 110 = { # Yakami_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 111 = { # Furuichi_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 112 = { # Furuichi_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 113 = { # Asukabe_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 114 = { # Asukabe_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 115 = { # Ishikawa_1 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 116 = { # Ishikawa_2 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 117 = { # Nishigori_1 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 118 = { # Nishigori_2 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 119 = { # Sakai_1 - culture = central_kinai - religion = shinto - holding = castle_holding - 1419.01.01 = { - holding = city_holding - } + culture = central_kinai + religion = shinto + holding = castle_holding + 1419.01.01 = { + holding = city_holding + } } 120 = { # Otori_1 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 121 = { # Otori_2 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 122 = { # Otori_3 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 123 = { # Otori_4 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 124 = { # Izumi_1 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 125 = { # Izumi_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 126 = { # Izumi_3 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 127 = { # Minami_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 128 = { # Minami_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 129 = { # Minami_3 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 130 = { # Hine_1 - culture = central_kinai - religion = shinto - holding = castle_holding + culture = central_kinai + religion = shinto + holding = castle_holding } 131 = { # Hine_2 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 132 = { # Hine_3 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 133 = { # Hine_4 - culture = central_kinai - religion = shinto - holding = none + culture = central_kinai + religion = shinto + holding = none } 179 = { # Ae_1 - culture = western_chubu - religion = shinto - holding = none + culture = western_chubu + religion = shinto + holding = none } 180 = { # Ae_2 - culture = western_chubu - religion = shinto - holding = none + culture = western_chubu + religion = shinto + holding = none } 181 = { # Ae_3 - culture = western_chubu - religion = shinto - holding = castle_holding + culture = western_chubu + religion = shinto + holding = castle_holding } 182 = { # Ae_4 - culture = western_chubu - religion = shinto - holding = none + culture = western_chubu + religion = shinto + holding = none } 183 = { # Yamada_1 - culture = western_chubu - religion = shinto - holding = none + culture = western_chubu + religion = shinto + holding = none } 184 = { # Yamada_2 - culture = western_chubu - religion = shinto - holding = castle_holding + culture = western_chubu + religion = shinto + holding = castle_holding } 185 = { # Iga_1 - culture = western_chubu - religion = shinto - holding = castle_holding + culture = western_chubu + religion = shinto + holding = castle_holding } 186 = { # Iga_2 - culture = western_chubu - religion = shinto - holding = none + culture = western_chubu + religion = shinto + holding = none } 187 = { # Iga_3 - culture = western_chubu - religion = shinto - holding = none + culture = western_chubu + religion = shinto + holding = none } 188 = { # Nabari_1 - culture = western_chubu - religion = shinto - holding = none + culture = western_chubu + religion = shinto + holding = none } 189 = { # Nabari_2 - culture = western_chubu - religion = shinto - holding = castle_holding + culture = western_chubu + religion = shinto + holding = castle_holding } 2051 = { # Ito_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2052 = { # Ito_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2053 = { # Ito_3 - culture = southern_kinai - religion = shinto - holding = church_holding # # Kongōbuji, 高野山金剛峯寺 + culture = southern_kinai + religion = shinto + holding = church_holding # # Kongōbuji, 高野山金剛峯寺 } 2054 = { # Naga_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 2055 = { # Naga_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2056 = { # Naga_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2057 = { # Naga_4 - culture = southern_kinai - religion = shinto - holding = none - 1550.01.01 = { - holding = castle_holding # Hanzak - } - 1585.01.01 = { - holding = none - } + culture = southern_kinai + religion = shinto + holding = none + 1550.01.01 = { + holding = castle_holding # Hanzak + } + 1585.01.01 = { + holding = none + } } 2058 = { # Naga_5 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2059 = { # Naga_6 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2060 = { # Naga_7 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2061 = { # Naga_8 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2062 = { # Nakusa_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2063 = { # Nakusa_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2064 = { # Nakusa_3 - culture = southern_kinai - religion = shinto - holding = church_holding + culture = southern_kinai + religion = shinto + holding = church_holding } 2065 = { # Nakusa_4 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 2066 = { # Nakusa_5 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2067 = { # Nakusa_6 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2068 = { # Nakusa_7 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2069 = { # Nakusa_8 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2070 = { # Ama_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 2071 = { # Ama_2 - culture = southern_kinai - religion = shinto - holding = none - 1550.01.01 = { - holding = castle_holding # Saika - } - 1585.01.01 = { - holding = none - } + culture = southern_kinai + religion = shinto + holding = none + 1550.01.01 = { + holding = castle_holding # Saika + } + 1585.01.01 = { + holding = none + } } 2072 = { # Ama_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2073 = { # Arita_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2074 = { # Arita_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2075 = { # Arita_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2076 = { # Arita_4 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2077 = { # Arita_5 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 2079 = { # Hidaka_1 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2080 = { # Hidaka_2 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 2081 = { # Hidaka_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2082 = { # Hidaka_4 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2083 = { # Hidaka_5 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2084 = { # Hidaka_6 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2085 = { # Muro_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 2086 = { # Muro_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2087 = { # Muro_3 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 2088 = { # Muro_4 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2089 = { # Muro_5 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2090 = { # Muro_6 - culture = southern_kinai - religion = shinto - holding = church_holding - 1573.01.01 = { - holding = castle_holding - } + culture = southern_kinai + religion = shinto + holding = church_holding + 1573.01.01 = { + holding = castle_holding + } } 2091 = { # Muro_7 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2092 = { # Muro_8 - culture = southern_kinai - religion = shinto - holding = church_holding + culture = southern_kinai + religion = shinto + holding = church_holding } 2093 = { # Muro_9 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2094 = { # Muro_10 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2095 = { # Kita_Muro_1 - culture = southern_kinai - religion = shinto - holding = castle_holding + culture = southern_kinai + religion = shinto + holding = castle_holding } 2096 = { # Kita_Muro_2 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2097 = { # Kita_Muro_3 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2098 = { # Kita_Muro_4 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2099 = { # Kita_Muro_5 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2100 = { # Kita_Muro_6 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } 2101 = { # Kita_Muro_7 - culture = southern_kinai - religion = shinto - holding = none - 1450.01.01 = { - holding = castle_holding # Kuki[九鬼] - } + culture = southern_kinai + religion = shinto + holding = none + 1450.01.01 = { + holding = castle_holding # Kuki[九鬼] + } } 2102 = { # Kita_Muro_8 - culture = southern_kinai - religion = shinto - holding = none + culture = southern_kinai + religion = shinto + holding = none } diff --git a/history/provinces/k_shgnt_southern_kyushu.txt b/history/provinces/k_shgnt_southern_kyushu.txt index cffb7aa..de472d7 100644 --- a/history/provinces/k_shgnt_southern_kyushu.txt +++ b/history/provinces/k_shgnt_southern_kyushu.txt @@ -1,779 +1,797 @@ #k_shgnt_southern_kyushu 2471 = { # Amakusa_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2472 = { # Amakusa_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2473 = { # Amakusa_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2474 = { # Ashikita_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2475 = { # Ashikita_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2476 = { # Kuma_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2477 = { # Kuma_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2478 = { # Kuma_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2479 = { # Kuma_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2480 = { # Kuma_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2481 = { # Higo_Yatsushiro_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2482 = { # Higo_Yatsushiro_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2483 = { # Higo_Yatsushiro_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2484 = { # Higo_Yatsushiro_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2485 = { # Higo_Yatsushiro_5 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2486 = { # Kami_Mashiki_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2487 = { # Kami_Mashiki_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2488 = { # Kami_Mashiki_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2489 = { # Kami_Mashiki_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2490 = { # Kami_Mashiki_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2491 = { # Kami_Mashiki_6 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none + 1207.01.01={ + holding=castle_holding # Iwao,岩尾城 + } } 2492 = { # Kami_Mashiki_7 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2493 = { # Shimo_Mashiki_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2494 = { # Shimo_Mashiki_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2495 = { # Shimo_Mashiki_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2496 = { # Shimo_Mashiki_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2497 = { # Shimo_Mashiki_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none + 1543.01.01={ + holding=castle_holding # Katashida,堅志田城 + } } 2498 = { # Uto_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2499 = { # Uto_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2500 = { # Akita_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2501 = { # Akita_2 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2502 = { # Akita_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2503 = { # Akita_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2504 = { # Akita_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2505 = { # Akita_6 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2506 = { # Akita_7 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2507 = { # Takuma_1 - culture = central_kyushu - religion = shinto - holding = castle_holding # 肥後国府 - 1333.07.04 = { - holding = none # Suizenji, 水前寺 - } + culture = central_kyushu + religion = shinto + holding = castle_holding # 肥後国府 + 1333.07.04 = { + holding = none # Suizenji, 水前寺 + } } 2508 = { # Takuma_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2509 = { # Kahashi_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2510 = { # Kahashi_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2511 = { # Kahashi_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2512 = { # Kahashi_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2513 = { # Kukuchi_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2514 = { # Kukuchi_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2515 = { # Kukuchi_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2516 = { # Higo_Yamamoto_1 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2517 = { # Higo_Yamamoto_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2518 = { # Yamaga_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2519 = { # Yamaga_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2520 = { # Yamaga_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2521 = { # Yamaga_4 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2522 = { # Yamaga_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2523 = { # Tamaina_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2524 = { # Tamaina_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2525 = { # Tamaina_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2526 = { # Tamaina_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2527 = { # Tamaina_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2528 = { # Tamaina_6 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2529 = { # Tamaina_7 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2530 = { # Tamaina_8 - culture = central_kyushu - religion = shinto - holding = castle_holding + culture = central_kyushu + religion = shinto + holding = castle_holding } 2531 = { # Tamaina_9 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2532 = { # Tamaina_10 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2533 = { # Aso_1 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2534 = { # Aso_2 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2535 = { # Aso_3 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2536 = { # Aso_4 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2537 = { # Aso_5 - culture = central_kyushu - religion = shinto - holding = none + culture = central_kyushu + religion = shinto + holding = none } 2538 = { # Aso_6 - culture = central_kyushu - religion = shinto - holding = church_holding + culture = central_kyushu + religion = shinto + holding = church_holding } 2539 = { # Usuki_1 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2540 = { # Usuki_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2541 = { # Usuki_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2542 = { # Usuki_4 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2543 = { # Usuki_5 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2544 = { # Usuki_6 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2545 = { # Morokata_1 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2546 = { # Morokata_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2547 = { # Morokata_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none + 1521.01.01={ + holding=castle_holding # Nonomidani,野々美谷城 + } } 2548 = { # Morokata_4 - culture = southern_kyushu - religion = shinto - holding = castle_holding # Shimazu In, 島津院 - 1375.01.01 = { - holding = none - } + culture = southern_kyushu + religion = shinto + holding = castle_holding # Shimazu In, 島津院 + 1375.01.01 = { + holding = none + } } 2549 = { # Morokata_5 - culture = southern_kyushu - religion = shinto - holding = none - 1375.01.01 = { - holding = castle_holding # Miyakonojō, 都城 - } + culture = southern_kyushu + religion = shinto + holding = none + 1375.01.01 = { + holding = castle_holding # Miyakonojō, 都城 + } } 2550 = { # Morokata_6 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none + 1333.07.04={ + holding=castle_holding # Tokumitsu,徳満城 + } } 2551 = { # Morokata_7 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2552 = { # Morokata_8 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2553 = { # Minami_Morokata_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding + 1333.07.04={ + holding=castle_holding # Shibushi,志布志城 + } } 2554 = { # Minami_Morokata_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2555 = { # Minami_Morokata_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2556 = { # Miyazaki_1 - culture = southern_kyushu - religion = shinto - holding = none - 1446.01.01 = { - holding = castle_holding # Sadowara - } + culture = southern_kyushu + religion = shinto + holding = none + 1446.01.01 = { + holding = castle_holding # Sadowara + } } 2557 = { # Miyazaki_2 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2558 = { # Miyazaki_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2559 = { # Hyuga_Naka_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2560 = { # Hyuga_Naka_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2561 = { # Hyuga_Naka_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2562 = { # Hyuga_Naka_4 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none + 1333.07.04={ + holding=castle_holding # Kushima,櫛間城 + } } 2563 = { # Hyuga_Naka_5 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2564 = { # Hyuga_Naka_6 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2565 = { # Koyu_1 - culture = southern_kyushu - religion = shinto - holding = church_holding + culture = southern_kyushu + religion = shinto + holding = church_holding } 2566 = { # Koyu_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2567 = { # Koyu_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2568 = { # Koyu_4 - culture = southern_kyushu - religion = shinto - holding = castle_holding # Hyuga Kokufu -> Tonogōri + culture = southern_kyushu + religion = shinto + holding = castle_holding # Hyuga Kokufu -> Tonogōri } 2569 = { # Koyu_5 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2570 = { # Hishikari_1 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2571 = { # Kuwahara_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2572 = { # Kuwahara_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2573 = { # Kuwahara_3 - culture = southern_kyushu - religion = shinto - holding = castle_holding # 大隅国府 - 1333.07.04 = { - holding = church_holding # Kagoshima, 鹿児嶋神社 - } + culture = southern_kyushu + religion = shinto + holding = castle_holding # 大隅国府 + 1333.07.04 = { + holding = church_holding # Kagoshima, 鹿児嶋神社 + } } 2574 = { # So_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2575 = { # So_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2576 = { # So_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2577 = { # So_4 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2578 = { # Aira_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2579 = { # Aira_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2580 = { # Aira_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2581 = { # Kimotsuki_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding # Takayama + culture = southern_kyushu + religion = shinto + holding = castle_holding # Takayama } 2582 = { # Kimotsuki_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2583 = { # Osumi_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2584 = { # Osumi_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2585 = { # Kumake_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2586 = { # Kumake_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2587 = { # Gomu_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2588 = { # Gomu_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2589 = { # Kagoshima_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2590 = { # Kagoshima_2 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2591 = { # Kagoshima_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2592 = { # Taniyama_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2593 = { # Kiire_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2594 = { # Chiran_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2595 = { # Ibusuki_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2596 = { # Ibusuki_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2597 = { # Eno_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2598 = { # Kawanohe_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding # Beppu, 別府城 + culture = southern_kyushu + religion = shinto + holding = castle_holding # Beppu, 別府城 } 2599 = { # Kawanohe_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2600 = { # Kawanohe_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2601 = { # Kawanohe_4 - culture = southern_kyushu - religion = shinto - holding = city_holding # Bōnotsu, 坊津 + culture = southern_kyushu + religion = shinto + holding = city_holding # Bōnotsu, 坊津 } 2602 = { # Ata_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2603 = { # Ata_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2604 = { # Hioki_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2605 = { # Hioki_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2606 = { # Hioki_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2607 = { # Hioki_4 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2608 = { # Hioki_5 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2609 = { # Satsuma_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2610 = { # Satsuma_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2611 = { # Satsuma_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2612 = { # Satsuma_4 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2613 = { # Isaku_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2614 = { # Isaku_2 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2615 = { # Isaku_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2616 = { # Isaku_4 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2617 = { # Satsuma_Izumi_1 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2618 = { # Satsuma_Izumi_2 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2619 = { # Satsuma_Izumi_3 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } 2620 = { # Takaki_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding # 薩摩国府 - 1333.07.04 = { - holding = church_holding # Nitta, 新田神社 - } + culture = southern_kyushu + religion = shinto + holding = castle_holding # 薩摩国府 + 1333.07.04 = { + holding = church_holding # Nitta, 新田神社 + } } 2621 = { # Koshikishima_1 - culture = southern_kyushu - religion = shinto - holding = castle_holding + culture = southern_kyushu + religion = shinto + holding = castle_holding } 2626 = { # Tokara_Islands_1 - culture = southern_kyushu - religion = shinto - holding = none + culture = southern_kyushu + religion = shinto + holding = none } \ No newline at end of file diff --git a/history/titles/k_shgnt_hokuriku.txt b/history/titles/k_shgnt_hokuriku.txt index b87bec5..2c1b7a1 100644 --- a/history/titles/k_shgnt_hokuriku.txt +++ b/history/titles/k_shgnt_hokuriku.txt @@ -19,16 +19,16 @@ 1372.06.03 = { holder = 10030003 # Asakura Ujikage } - 1394.01.01 = { - effect = { - title:b_shgnt_asuha_7 = { - set_title_name = b_shgnt_asuha_7_1 # Kitanoshō,北之庄 - } - title:b_shgnt_asuha_6 = { - set_title_name = b_shgnt_asuha_6_1 # Ago,安居城 - } - } - } + 1394.01.01 = { + effect = { + title:b_shgnt_asuha_7 = { + set_title_name = b_shgnt_asuha_7_1 # Kitanoshō,北之庄 + } + title:b_shgnt_asuha_6 = { + set_title_name = b_shgnt_asuha_6_1 # Ago,安居城 + } + } + } 1405.01.28 = { liege = d_shgnt_echizen # holder = 10030004 # Asakura Sadakage @@ -42,13 +42,13 @@ 1463.09.02 = { holder = 10030007 # Asakura Takakage } - 1471.01.01 = { - effect = { - title:b_shgnt_asuha_2 = { - set_title_name = b_shgnt_asuha_2_1 # Ichijodani,一乗谷城 - } - } - } + 1471.01.01 = { + effect = { + title:b_shgnt_asuha_2 = { + set_title_name = b_shgnt_asuha_2_1 # Ichijodani,一乗谷城 + } + } + } 1481.08.21 = { holder = 10030008 # Asakura Ujikage } @@ -63,11 +63,11 @@ } 1573.09.16 = { holder = 10029120 # Oda Nobunaga - effect = { - title:b_shgnt_asuha_2 = { - set_title_name = b_shgnt_asuha_2_2 # Togōmakiyama,東郷槇山城 - } - } + effect = { + title:b_shgnt_asuha_2 = { + set_title_name = b_shgnt_asuha_2_2 # Togōmakiyama,東郷槇山城 + } + } } 1573.09.24 = { liege = d_shgnt_echizen # 30100 Maeba Yoshitsugu @@ -130,13 +130,13 @@ c_shgnt_enuma = { 1320.01.01 = { holder = 12310515 # Kano Yorihiro } - 1333.07.04 = { - effect = { - title:b_shgnt_enuma_4 = { - set_title_name = b_shgnt_enuma_4_1 # Matsuyama, 松山 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_enuma_4 = { + set_title_name = b_shgnt_enuma_4_1 # Matsuyama, 松山 + } + } + } 1340.01.01 = { liege = d_shgnt_kaga # holder = 12310530 # Kano Yoshimochi @@ -221,11 +221,11 @@ c_shgnt_fugeshi = { } 1218.11.16 = { holder = 12305100 # Cho Tomotsura - effect = { - title:b_shgnt_fugeshi_4 = { - set_title_name = b_shgnt_fugeshi_4_1 # Anamizu - } - } + effect = { + title:b_shgnt_fugeshi_4 = { + set_title_name = b_shgnt_fugeshi_4_1 # Anamizu + } + } } 1250.01.01 = { holder = 12305110 # Cho Masatsura @@ -275,11 +275,11 @@ c_shgnt_fugeshi = { holder = 10031112 # Nukui Kagetaka } 1581.03.28 = { - liege = d_shgnt_noto + liege = d_shgnt_noto holder = 10029241 # Sugaya Nagayori } 1581.10.29 = { - liege = d_shgnt_noto # Maeda Toshiie + liege = d_shgnt_noto # Maeda Toshiie holder = 10031050 # Cho Tsuratatsu } } @@ -467,21 +467,21 @@ c_shgnt_higashi_tonami = { 1481.01.01 = { change_development_level = 30 } 1581.09.08 = { change_development_level = 30 } 0702.10.14={ - liege="d_shgnt_etchu" - } + liege="d_shgnt_etchu" + } 1180.01.01 = { liege = 0 # holder = 12280100 # Ishiguro Mitsuhiro } - 1183.6.22={ - liege="k_shgnt_hokuriku" # Battle of Shinohara - } - 1183.8.17={ - liege="e_shgnt_japan" # Taira's escape to the west - } - 1184.3.4={ - liege=0 # Battle of Awazu - } + 1183.6.22={ + liege="k_shgnt_hokuriku" # Battle of Shinohara + } + 1183.8.17={ + liege="e_shgnt_japan" # Taira's escape to the west + } + 1184.3.4={ + liege=0 # Battle of Awazu + } 1190.01.01 = { liege = 0 holder = 0 @@ -512,9 +512,9 @@ c_shgnt_higashi_tonami = { 1570.01.01 = { holder = 12331021 # Zuisenji Kenshu } - 1580.9.20={ - liege=0 - } + 1580.9.20={ + liege=0 + } 1581.09.08 = { liege = d_shgnt_etchu # 29350 Sassa Narimasa holder = 10029350 # Sassa Narimasa @@ -593,13 +593,13 @@ c_shgnt_imatachi = { 1383.01.01 = { holder = 12320000 # Kai Norimitsu } - 1394.01.01 = { - effect = { - title:b_shgnt_imatachi_2 = { - set_title_name = b_shgnt_imatachi_2_1 # Kuratani - } - } - } + 1394.01.01 = { + effect = { + title:b_shgnt_imatachi_2 = { + set_title_name = b_shgnt_imatachi_2_1 # Kuratani + } + } + } 1395.01.01 = { holder = 12320001 # Kai Yukinori } @@ -643,13 +643,13 @@ c_shgnt_imatachi = { liege = d_shgnt_kaga # 42324 Shimotsuma Raisho holder = 10042324 # Shimotsuma Raisho } - 1575.01.01 = { - effect = { - title:b_shgnt_imatachi_2 = { - set_title_name = b_shgnt_imatachi_2_2 # Komaru - } - } - } + 1575.01.01 = { + effect = { + title:b_shgnt_imatachi_2 = { + set_title_name = b_shgnt_imatachi_2_2 # Komaru + } + } + } 1575.09.25 = { liege = 0 # holder = 10029120 # Oda Nobunaga @@ -679,13 +679,13 @@ c_shgnt_imizu = { liege = 0 # holder = 0 # Battle of Awazu } - 1300.01.01 = { - effect = { - title:b_shgnt_imizu_2 = { - set_title_name = b_shgnt_imizu_2_1 # Hōjōzu, 放生津城 - } - } - } + 1300.01.01 = { + effect = { + title:b_shgnt_imizu_2 = { + set_title_name = b_shgnt_imizu_2_1 # Hōjōzu, 放生津城 + } + } + } 1380.07.01 = { liege = d_shgnt_etchu # holder = 10031205 # Jinbo Kunihisa @@ -784,11 +784,11 @@ c_shgnt_kaga_ishikawa = { 1570.07.01 = { liege = d_shgnt_kaga # holder = 10042350 # Shichiri Yorichika - effect = { - title:b_shgnt_kaga_ishikawa_4 = { - set_title_name = b_shgnt_kaga_ishikawa_4_1 # Nonoichi, 野々市 - } - } + effect = { + title:b_shgnt_kaga_ishikawa_4 = { + set_title_name = b_shgnt_kaga_ishikawa_4_1 # Nonoichi, 野々市 + } + } } 1576.01.01 = { liege = d_shgnt_kaga # @@ -925,13 +925,18 @@ c_shgnt_iwafune = { 1480.01.01 = { holder = 10032406 # Honjo Akinaga } - 1500.01.01 = { - effect = { - title:b_shgnt_iwafune_3 = { - set_title_name = b_shgnt_iwafune_3_1 # Murakami - } - } - } + 1500.01.01 = { + effect = { + title:b_shgnt_iwafune_3 = { + set_title_name = b_shgnt_iwafune_3_1 # Murakami + } + } + effect = { + title:b_shgnt_iwafune_4 = { + set_title_name = b_shgnt_iwafune_4_1 # Hirabayashi,平林城 + } + } + } 1502.01.01 = { holder = 10032408 # Honjo Nagakazu } @@ -1106,11 +1111,11 @@ c_shgnt_kambara = { 1360.01.01 = { liege = d_shgnt_echigo # holder = 12215326 # Nagao Kagetsune - effect = { - title:b_shgnt_kambara_6 = { - set_title_name = b_shgnt_kambara_6_1 # Sanjō - } - } + effect = { + title:b_shgnt_kambara_6 = { + set_title_name = b_shgnt_kambara_6_1 # Sanjō + } + } } 1367.01.01 = { holder = 10032003 # Nagao Takakage @@ -1158,13 +1163,13 @@ c_shgnt_mishima = { liege = 0 holder = 0 } - 1332.1.1={ - effect = { - title:b_shgnt_mishima_2 = { - set_title_name = b_shgnt_mishima_2_1 # Kitajō - } - } - } + 1332.1.1={ + effect = { + title:b_shgnt_mishima_2 = { + set_title_name = b_shgnt_mishima_2_1 # Kitajō + } + } + } 1368.10.31 = { holder = 10032801 # Uesugi Noriyoshi } @@ -1268,26 +1273,26 @@ c_shgnt_koshi = { liege = 0 holder = 0 } - 1337.01.01 = { - effect = { - title:b_shgnt_koshi_1 = { - set_title_name = b_shgnt_koshi_1_1 # Zaōdō - } - } - } + 1337.01.01 = { + effect = { + title:b_shgnt_koshi_1 = { + set_title_name = b_shgnt_koshi_1_1 # Zaōdō + } + } + } 1360.01.01 = { holder = 10032012 # Nagao Kageharu } 1384.01.01 = { holder = 10032013 # Nagao Munekage } - 1392.01.01 = { - effect = { - title:b_shgnt_koshi_2 = { - set_title_name = b_shgnt_koshi_2_1 # Tochio - } - } - } + 1392.01.01 = { + effect = { + title:b_shgnt_koshi_2 = { + set_title_name = b_shgnt_koshi_2_1 # Tochio + } + } + } 1411.01.01 = { holder = 10032014 # Nagao Hidekage } @@ -1301,13 +1306,13 @@ c_shgnt_koshi = { liege = d_shgnt_echigo # holder = 10032017 # Nagao Fusakage } - 1504.01.01 = { - effect = { - title:b_shgnt_koshi_3 = { - set_title_name = b_shgnt_koshi_3_1 # Suyoshi - } - } - } + 1504.01.01 = { + effect = { + title:b_shgnt_koshi_3 = { + set_title_name = b_shgnt_koshi_3_1 # Suyoshi + } + } + } 1531.01.01 = { holder = 10032018 # Nagao Kagenobu } @@ -1337,13 +1342,13 @@ c_shgnt_iwonuma = { 1378.01.01 = { holder = 10032021 # Nagao Fusakage } - 1392.01.01 = { - effect = { - title:b_shgnt_iwonuma_5 = { - set_title_name = b_shgnt_iwonuma_5_1 # Sakado - } - } - } + 1392.01.01 = { + effect = { + title:b_shgnt_iwonuma_5 = { + set_title_name = b_shgnt_iwonuma_5_1 # Sakado + } + } + } 1415.01.01 = { holder = 10032022 # Nagao Norikage } @@ -1586,9 +1591,9 @@ c_shgnt_nishi_kubiki = { liege = 0 holder = 0 } - 1300.1.1={ - liege="d_shgnt_echigo" - } + 1300.1.1={ + liege="d_shgnt_echigo" + } 1360.01.01 = { holder = 12215326 # Nagao Kagetsune } @@ -1621,11 +1626,11 @@ c_shgnt_nishi_kubiki = { } 1573.02.03 = { holder = 10032011 # Uesugi Kenshin - effect = { - title:b_shgnt_nishi_kubiki_2 = { - set_title_name = b_shgnt_nishi_kubiki_2_1 # Nechi - } - } + effect = { + title:b_shgnt_nishi_kubiki_2 = { + set_title_name = b_shgnt_nishi_kubiki_2_1 # Nechi + } + } } 1578.04.19 = { liege = d_shgnt_kozuke # 16020 Uesugi Kagetora @@ -1671,13 +1676,13 @@ c_shgnt_nishi_tonami = { liege = k_nmih_honganji # holder = 10042207 # Kokyoji Rensei } - 1519.01.01 = { - effect = { - title:b_shgnt_nishi_tonami_3 = { - set_title_name = b_shgnt_nishi_tonami_3_1 # Shōkōji - } - } - } + 1519.01.01 = { + effect = { + title:b_shgnt_nishi_tonami_3 = { + set_title_name = b_shgnt_nishi_tonami_3_1 # Shōkōji + } + } + } 1521.09.07 = { holder = 10042231 # Shokoji Jitsugen } @@ -1861,13 +1866,13 @@ c_shgnt_nomi = { liege = e_shgnt_japan # 29120 Oda Nobunaga holder = 10029270 # Yanada Hiromasa } - 1576.01.01={ - effect = { - title:b_shgnt_nomi_6 = { - set_title_name = b_shgnt_nomi_6_1 # Komatsu,小松城 - } - } - } + 1576.01.01={ + effect = { + title:b_shgnt_nomi_6 = { + set_title_name = b_shgnt_nomi_6_1 # Komatsu,小松城 + } + } + } 1576.10.01 = { holder = 10029280 # Shibata Katsuie } @@ -1889,13 +1894,13 @@ c_shgnt_noto = { liege = 0 # holder = 0 # Battle of Awazu } - 1333.07.04 = { - effect = { - title:b_shgnt_noto_3 = { - set_title_name = b_shgnt_noto_3_2 # Nanao, 七尾 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_noto_3 = { + set_title_name = b_shgnt_noto_3_2 # Nanao, 七尾 + } + } + } 1391.12.01 = { liege = d_shgnt_noto # holder = 10048110 # Hatakeyama Motokuni @@ -1914,11 +1919,11 @@ c_shgnt_noto = { } 1500.01.01 = { holder = 10031006 # Hatakeyama Yoshimune - effect = { - title:b_shgnt_noto_3 = { - set_title_name = b_shgnt_noto_3_1 # Nanao, 七尾城 - } - } + effect = { + title:b_shgnt_noto_3 = { + set_title_name = b_shgnt_noto_3_1 # Nanao, 七尾城 + } + } } 1506.01.01 = { holder = 10031005 # Hatakeyama Yoshimoto @@ -1985,14 +1990,14 @@ c_shgnt_nutari = { } 1201.03.28 = { holder = 10120086 # Minamoto Yoriie - effect = { - title:b_shgnt_nutari_4 = { - set_title_name = b_shgnt_nutari_4_1 # Shibata - } - title:b_shgnt_nutari_7 = { - set_title_name = b_shgnt_nutari_7_1 # Suibara, 水原 - } - } + effect = { + title:b_shgnt_nutari_4 = { + set_title_name = b_shgnt_nutari_4_1 # Shibata + } + title:b_shgnt_nutari_7 = { + set_title_name = b_shgnt_nutari_7_1 # Suibara, 水原 + } + } } 1201.04.01 = { holder = 12211502 # Wada Yoshimochi @@ -2112,11 +2117,11 @@ c_shgnt_echizen_ono = { 1575.10.06 = { liege = d_shgnt_echizen # 29280 Shibata Katsuie holder = 10025930 # Kanamori Nagachika - effect = { - title:b_shgnt_echizen_ono_7 = { - set_title_name = b_shgnt_echizen_ono_7_1 # Ōno - } - } + effect = { + title:b_shgnt_echizen_ono_7 = { + set_title_name = b_shgnt_echizen_ono_7_1 # Ōno + } + } } } c_shgnt_echizen_sakai = { @@ -2135,13 +2140,13 @@ c_shgnt_echizen_sakai = { liege = 0 # holder = 0 # Battle of Shinohara } - 1394.01.01={ - effect = { - title:b_shgnt_echizen_sakai_2 = { - set_title_name = b_shgnt_echizen_sakai_2_1 # 溝江郷 → Kanazu,金津城 - } - } - } + 1394.01.01={ + effect = { + title:b_shgnt_echizen_sakai_2 = { + set_title_name = b_shgnt_echizen_sakai_2_1 # 溝江郷 → Kanazu,金津城 + } + } + } 1459.09.07 = { liege = d_shgnt_yamato # holder = 11000774 # Kujo Kyokaku @@ -2178,13 +2183,13 @@ c_shgnt_echizen_sakai = { liege = d_shgnt_echizen # 29280 Shibata Katsuie holder = 10029280 # Shibata Katsuie } - 1576.01.01={ - effect = { - title:b_shgnt_echizen_sakai_9 = { - set_title_name = b_shgnt_echizen_sakai_9_1 # Maruoka,丸岡城 - } - } - } + 1576.01.01={ + effect = { + title:b_shgnt_echizen_sakai_9 = { + set_title_name = b_shgnt_echizen_sakai_9_1 # Maruoka,丸岡城 + } + } + } } c_shgnt_santo = { 0001.01.01 = { change_development_level = 20 } @@ -2233,13 +2238,13 @@ c_shgnt_santo = { 1539.01.01 = { holder = 10032652 # Naoe Kagetsuna } - 1550.01.01 = { - effect = { - title:b_shgnt_santo_2 = { - set_title_name = b_shgnt_santo_2_1 # Yoita - } - } - } + 1550.01.01 = { + effect = { + title:b_shgnt_santo_2 = { + set_title_name = b_shgnt_santo_2_1 # Yoita + } + } + } 1577.03.24 = { holder = 10017344 # Naoe Nobutsuna } @@ -2346,13 +2351,13 @@ c_shgnt_shimo_niikawa = { 1310.01.01 = { holder = 12281001 # Shiina Yoritane } - 1335.01.01 = { - effect = { - title:b_shgnt_shimo_niikawa_6 = { - set_title_name = b_shgnt_shimo_niikawa_6_1 # - } - } - } + 1335.01.01 = { + effect = { + title:b_shgnt_shimo_niikawa_6 = { + set_title_name = b_shgnt_shimo_niikawa_6_1 # + } + } + } 1358.07.03 = { holder = 12281002 # Shiina Jiro } @@ -2444,7 +2449,7 @@ c_shgnt_suzu = { holder = 10031150 # Yusa Tsugumitsu } 1581.03.28 = { - liege = d_shgnt_noto + liege = d_shgnt_noto holder = 10029241 # Sugaya Nagayori } 1581.10.29 = { @@ -2543,13 +2548,13 @@ c_shgnt_yoshida = { liege = 0 # holder = 0 # Battle of Shinohara } - 1244.01.01={ - effect = { - title:b_shgnt_yoshida_4 = { - set_title_name = b_shgnt_yoshida_4_1 # Eiheiji,永平寺 - } - } - } + 1244.01.01={ + effect = { + title:b_shgnt_yoshida_4 = { + set_title_name = b_shgnt_yoshida_4_1 # Eiheiji,永平寺 + } + } + } 1340.01.01 = { holder = 10030001 # Asakura Hirokage } @@ -2893,19 +2898,19 @@ d_shgnt_echizen = { liege = e_shgnt_japan # holder = 10057621 # Shiba Yoshikado } - 1467.6.27={ # Onin War - liege="k_shgnt_sanin" - } + 1467.6.27={ # Onin War + liege="k_shgnt_sanin" + } 1471.06.09 = { liege = e_shgnt_japan # holder = 10030007 # Asakura Takakage - effect = { - set_capital_county = title:c_shgnt_asuha - } + effect = { + set_capital_county = title:c_shgnt_asuha + } + } + 1477.12.16={ # End of Onin war + liege = 0 } - 1477.12.16={ # End of Onin war - liege = 0 - } 1481.08.21 = { holder = 10030008 # Asakura Ujikage } @@ -2940,8 +2945,8 @@ d_shgnt_echizen = { } d_shgnt_etchu = { 0702.10.14={ - liege="e_shgnt_tenno" - } + liege="e_shgnt_tenno" + } 0791.07.15 = { holder = 11005020 # Fujiwara Takakai {Etchu no Kami} } @@ -3033,17 +3038,17 @@ d_shgnt_etchu = { holder = 10048121 # Hatakeyama Masanaga } 1467.6.27={ # Onin war - liege = "e_shgnt_japan" # Onin War - } + liege = "e_shgnt_japan" # Onin War + } 1493.5.8={ # Meiou Coup - liege=0 - } + liege=0 + } 1493.06.09 = { holder = 10048123 # Hatakeyama Hisanobu } 1508.7.28={ - liege="e_shgnt_japan" - } + liege="e_shgnt_japan" + } 1522.09.07 = { liege = 0 # holder = 0 # Hatakeyama Clan lost the control of Etchu @@ -3053,8 +3058,8 @@ d_shgnt_etchu = { holder = 10029350 # Sassa Narimasa } 1582.6.21={ # Honno-ji Incident - liege="k_shgnt_hokuriku" - } + liege="k_shgnt_hokuriku" + } } d_shgnt_kaga = { 0831.01.22 = { @@ -3364,13 +3369,13 @@ c_shgnt_naka_kubiki = { liege = 0 # holder = 0 # Battle of Awazu } - 1333.07.04 = { - effect = { - title:b_shgnt_naka_kubiki_3 = { - set_title_name = b_shgnt_naka_kubiki_3_2 # Fuchū, 府中 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_naka_kubiki_3 = { + set_title_name = b_shgnt_naka_kubiki_3_2 # Fuchū, 府中 + } + } + } 1360.01.01 = { holder = 12215326 # Nagao Kagetsune } @@ -3379,11 +3384,11 @@ c_shgnt_naka_kubiki = { } 1389.03.26 = { holder = 10032004 # Nagao Kunikage - effect = { - title:b_shgnt_naka_kubiki_3 = { - set_title_name = b_shgnt_naka_kubiki_3_1 # Echigo Kokufu -> Kasugayama - } - } + effect = { + title:b_shgnt_naka_kubiki_3 = { + set_title_name = b_shgnt_naka_kubiki_3_1 # Echigo Kokufu -> Kasugayama + } + } } 1450.12.16 = { holder = 10032006 # Nagao Yorikage @@ -3397,26 +3402,26 @@ c_shgnt_naka_kubiki = { 1506.10.05 = { holder = 10032000 # Nagao Tamekage } - 1532.01.01={ - effect = { - title:b_shgnt_naka_kubiki_7 = { - set_title_name = b_shgnt_naka_kubiki_7_1 # Samegao,鮫ヶ尾城 - } - } - } + 1532.01.01={ + effect = { + title:b_shgnt_naka_kubiki_7 = { + set_title_name = b_shgnt_naka_kubiki_7_1 # Samegao,鮫ヶ尾城 + } + } + } 1543.01.29 = { holder = 10032009 # Nagao Harukage } 1548.12.30 = { holder = 10032011 # Uesugi Kenshin } - 1578.01.01={ - effect = { - title:b_shgnt_naka_kubiki_7 = { - set_title_name = b_shgnt_naka_kubiki_7_2 # Hida,斐太 - } - } - } + 1578.01.01={ + effect = { + title:b_shgnt_naka_kubiki_7 = { + set_title_name = b_shgnt_naka_kubiki_7_2 # Hida,斐太 + } + } + } 1578.04.19 = { holder = 10032032 # Uesugi Kagekatsu } diff --git a/history/titles/k_shgnt_northern_kyushu.txt b/history/titles/k_shgnt_northern_kyushu.txt index 844bff4..677a23e 100644 --- a/history/titles/k_shgnt_northern_kyushu.txt +++ b/history/titles/k_shgnt_northern_kyushu.txt @@ -34,13 +34,13 @@ 1490.01.01 = { holder = 10064301 # Usuki Nagakage } - 1521.01.01 = { - effect = { - title:b_shgnt_bungo_ama_4 = { - set_title_name = b_shgnt_bungo_ama_4_1 # Togamure - } - } - } + 1521.01.01 = { + effect = { + title:b_shgnt_bungo_ama_4 = { + set_title_name = b_shgnt_bungo_ama_4_1 # Togamure + } + } + } 1528.01.01 = { holder = 10064300 # Usuki Akitsugu } @@ -181,11 +181,11 @@ c_shgnt_minami_matsura = { } 1521.01.01 = { holder = 10068800 # Uku Morisada - effect = { - title:b_shgnt_minami_matsura_1 = { - set_title_name = b_shgnt_minami_matsura_1_1 # Egawa[江川] - } - } + effect = { + title:b_shgnt_minami_matsura_1 = { + set_title_name = b_shgnt_minami_matsura_1_1 # Egawa[江川] + } + } } 1548.01.01 = { holder = 10068802 # Uku Sumisada @@ -385,11 +385,11 @@ c_shgnt_ikuha = { } 1313.01.01 = { holder = 10064616 # Monchusho Yasutsura - effect = { - title:b_shgnt_ikuha_1 = { - set_title_name = b_shgnt_ikuha_1_1 - } - } + effect = { + title:b_shgnt_ikuha_1 = { + set_title_name = b_shgnt_ikuha_1_1 + } + } } 1340.01.01 = { holder = 10064615 # Monchusho Ujiyasu @@ -463,13 +463,13 @@ c_shgnt_chikuzen_ito = { liege = 0 holder = 0 } - 1249.01.01 = { - effect = { - title:b_shgnt_chikuzen_ito_2 = { - set_title_name = b_shgnt_chikuzen_ito_2_1 # Takasu - } - } - } + 1249.01.01 = { + effect = { + title:b_shgnt_chikuzen_ito_2 = { + set_title_name = b_shgnt_chikuzen_ito_2_1 # Takasu + } + } + } 1350.01.01 = { holder = 10067616 # Harada Taneharu } @@ -576,13 +576,13 @@ c_shgnt_kasuya = { liege = 0 # holder = 0 # Battle of Ashiya-no-ura } - 1334.01.01 = { - effect = { - title:b_shgnt_kasuya_3 = { - set_title_name = b_shgnt_kasuya_3_1 # 立花山城 - } - } - } + 1334.01.01 = { + effect = { + title:b_shgnt_kasuya_3 = { + set_title_name = b_shgnt_kasuya_3_1 # 立花山城 + } + } + } 1387.01.01 = { liege = d_shgnt_chikuzen # holder = 10068013 # Shoni Sadayori @@ -682,24 +682,24 @@ c_shgnt_kiku = { 1532.01.01 = { holder = 10067100 # Nagano Fusamori } - 1550.01.01 = { - effect = { - title:b_shgnt_kiku_2 = { - set_title_name = b_shgnt_kiku_2_1 # 小三岳城 - } - } - } + 1550.01.01 = { + effect = { + title:b_shgnt_kiku_2 = { + set_title_name = b_shgnt_kiku_2_1 # 小三岳城 + } + } + } 1562.01.01 = { holder = 10067102 # Nagano Tanemori } 1568.09.05 = { liege = k_shgnt_western_chugoku # holder = 10056004 # Mori Motonari - effect = { - title:b_shgnt_kiku_2 = { - set_title_name = b_shgnt_kiku_2 # 企救 - } - } + effect = { + title:b_shgnt_kiku_2 = { + set_title_name = b_shgnt_kiku_2 # 企救 + } + } } 1569.08.01 = { liege = d_shgnt_bungo # @@ -1014,13 +1014,13 @@ c_shgnt_mii = { 1330.01.01 = { holder = 10064832 # Takahashi Mitsutane } - 1333.07.04 = { - effect = { - title:b_shgnt_mii_3 = { - set_title_name = b_shgnt_mii_3_1 # Kōra, 高良大社 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_mii_3 = { + set_title_name = b_shgnt_mii_3_1 # Kōra, 高良大社 + } + } + } 1360.01.01 = { holder = 10064831 # Takahashi Yoshitane } @@ -1091,34 +1091,34 @@ c_shgnt_mikasa = { 1529.01.01 = { holder = 10067600 # Harada Takatane } - 1532.01.01 = { - effect = { - title:b_shgnt_mikasa_1 = { - set_title_name = b_shgnt_mikasa_1_1 # 岩屋城 - } - } - } - 1533.01.01={ - effect = { - title:b_shgnt_mikasa_2 = { - set_title_name = b_shgnt_mikasa_2_1 # Hōmanzan, 宝満山城 - } - } - } - 1586.01.01={ - effect = { - title:b_shgnt_mikasa_2 = { - set_title_name = b_shgnt_mikasa_2 # Mikasa, 御笠 - } - } - } - 1597.1.15 = { - effect = { - title:b_shgnt_mikasa_1 = { - set_title_name = b_shgnt_mikasa_1 # 太宰府 - } - } - } + 1532.01.01 = { + effect = { + title:b_shgnt_mikasa_1 = { + set_title_name = b_shgnt_mikasa_1_1 # 岩屋城 + } + } + } + 1533.01.01={ + effect = { + title:b_shgnt_mikasa_2 = { + set_title_name = b_shgnt_mikasa_2_1 # Hōmanzan, 宝満山城 + } + } + } + 1586.01.01={ + effect = { + title:b_shgnt_mikasa_2 = { + set_title_name = b_shgnt_mikasa_2 # Mikasa, 御笠 + } + } + } + 1597.1.15 = { + effect = { + title:b_shgnt_mikasa_1 = { + set_title_name = b_shgnt_mikasa_1 # 太宰府 + } + } + } } c_shgnt_mike = { 0001.01.01 = { change_development_level = 30 } @@ -1446,11 +1446,11 @@ c_shgnt_munakata = { } 1445.01.01 = { holder = 10067307 # Munakata Ujitoshi - effect = { - title:b_shgnt_munakata_2 = { - set_title_name = b_shgnt_munakata_2_1 # Tsutadake, 蘿岳城 - } - } + effect = { + title:b_shgnt_munakata_2 = { + set_title_name = b_shgnt_munakata_2_1 # Tsutadake, 蘿岳城 + } + } } 1470.01.01 = { holder = 10067304 # Munakata Ujikuni @@ -1479,13 +1479,13 @@ c_shgnt_munakata = { liege = d_shgnt_chikuzen # holder = 10067345 # Munakata Ujisada } - 1588.01.01={ - effect = { - title:b_shgnt_munakata_2 = { - set_title_name = b_shgnt_munakata_2 # Akama, 赤間 - } - } - } + 1588.01.01={ + effect = { + title:b_shgnt_munakata_2 = { + set_title_name = b_shgnt_munakata_2 # Akama, 赤間 + } + } + } } c_shgnt_naori = { 0001.01.01 = { change_development_level = 30 } @@ -1680,13 +1680,13 @@ c_shgnt_oita = { 1369.01.01 = { holder = 10064016 # Otomo Chikayo, northern side } - 1394.01.01 = { - effect = { - title:b_shgnt_oita_5 = { - set_title_name = b_shgnt_oita_5_1 # Ōtomo Yakata - } - } - } + 1394.01.01 = { + effect = { + title:b_shgnt_oita_5 = { + set_title_name = b_shgnt_oita_5_1 # Ōtomo Yakata + } + } + } 1401.01.01 = { holder = 10064017 # Otomo Chikaaki } @@ -1768,13 +1768,13 @@ c_shgnt_saka = { 1294.02.12 = { holder = 12150155 # Chiba Tanesada } - 1333.07.04 = { - effect = { - title:b_shgnt_saka_4 = { - set_title_name = b_shgnt_saka_4_1 # Chifu, 千布 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_saka_4 = { + set_title_name = b_shgnt_saka_4_1 # Chifu, 千布 + } + } + } 1336.12.22 = { holder = 12150156 # Chiba Taneyasu } @@ -1804,13 +1804,13 @@ c_shgnt_saka = { liege = d_shgnt_chikuzen # holder = 10068001 # Shoni Masasuke } - 1469.01.01 = { - effect = { - title:b_shgnt_saka_9 = { - set_title_name = b_shgnt_saka_9_1 # Mizugae - } - } - } + 1469.01.01 = { + effect = { + title:b_shgnt_saka_9 = { + set_title_name = b_shgnt_saka_9_1 # Mizugae + } + } + } 1497.05.21 = { liege = d_shgnt_hizen # holder = 10068000 # Shoni Sukemoto @@ -1870,19 +1870,19 @@ c_shgnt_sonoki = { } 1551.07.18 = { holder = 10068603 # Omura Sumitada - effect = { - title:b_shgnt_sonoki_2 = { - set_title_name = b_shgnt_sonoki_2_1 # Yoshitake - } - } - } - 1571.04.27 = { - effect = { - title:b_shgnt_sonoki_4 = { - set_title_name = b_shgnt_sonoki_4_1 # Nagasaki, 長崎港 - } - } - } + effect = { + title:b_shgnt_sonoki_2 = { + set_title_name = b_shgnt_sonoki_2_1 # Yoshitake + } + } + } + 1571.04.27 = { + effect = { + title:b_shgnt_sonoki_4 = { + set_title_name = b_shgnt_sonoki_4_1 # Nagasaki, 長崎港 + } + } + } } c_shgnt_kita_takaku = { 0001.01.01 = { change_development_level = 10 } @@ -2025,13 +2025,13 @@ c_shgnt_tsuiki = { 1450.01.01 = { holder = 10067013 # Utsunomiya Morinao } - 1460.01.01 = { - effect = { - title:b_shgnt_tsuiki_1 = { - set_title_name = b_shgnt_tsuiki_1_1 # Ōhira - } - } - } + 1460.01.01 = { + effect = { + title:b_shgnt_tsuiki_1 = { + set_title_name = b_shgnt_tsuiki_1_1 # Ōhira + } + } + } 1470.01.01 = { holder = 10067003 # Utsunomiya Hidefusa } @@ -2191,6 +2191,13 @@ c_shgnt_usa = { 1490.01.01 = { holder = 10067001 # Utsunomiya Okifusa } + 1499.01.01={ + effect = { + title:b_shgnt_usa_3 = { + set_title_name = b_shgnt_usa_3_1 # Myōkendake,妙見嶽城 + } + } + } 1517.01.01 = { holder = 10067000 # Utsunomiya Masafusa } @@ -2308,11 +2315,11 @@ c_shgnt_yamato = { holder = 10064704 # Kusano Shigenaga } 1470.01.01 = { - effect = { - title:b_shgnt_yamato_4 = { - set_title_name = b_shgnt_yamato_4_1 # Yanagawa - } - } + effect = { + title:b_shgnt_yamato_4 = { + set_title_name = b_shgnt_yamato_4_1 # Yanagawa + } + } } 1490.01.01 = { liege = k_shgnt_western_chugoku # @@ -2373,9 +2380,9 @@ d_shgnt_bungo = { } 1416.01.01 = { holder = 10064017 # Otomo Chikaaki - effect = { - set_capital_county = title:c_shgnt_oita - } + effect = { + set_capital_county = title:c_shgnt_oita + } } 1427.01.01 = { holder = 10064018 # Otomo Mochinao @@ -2848,9 +2855,9 @@ d_shgnt_tsushima = { 0764.11.06 = { holder = 10041023 # Empress Koken/Shotoku } - 1020.01.01 = { - holder = 12780600 # 藤原蔵規(菊池政則)『少右記』『御堂関白記』 - } + 1020.01.01 = { + holder = 12780600 # 藤原蔵規(菊池政則)『少右記』『御堂関白記』 + } 1180.01.01 = { liege = 0 # De facto holder = 11004037 # Hino Chikamitsu @@ -2949,13 +2956,13 @@ c_shgnt_onga = { 1190.01.01 = { holder = 10068500 # Aso Iemasa } - 1194.01.01 = { - effect = { - title:b_shgnt_onga_3 = { - set_title_name = b_shgnt_onga_3_1 # 花尾城 - } - } - } + 1194.01.01 = { + effect = { + title:b_shgnt_onga_3 = { + set_title_name = b_shgnt_onga_3_1 # 花尾城 + } + } + } 1230.01.01 = { holder = 10068501 # Aso Tokiie } @@ -2984,13 +2991,13 @@ c_shgnt_onga = { 1436.06.01 = { holder = 10068524 # Aso Hiroie } - 1469.01.01={ - effect = { - title:b_shgnt_onga_2 = { - set_title_name = b_shgnt_onga_2_1 # Oka, 岡城 - } - } - } + 1469.01.01={ + effect = { + title:b_shgnt_onga_2 = { + set_title_name = b_shgnt_onga_2_1 # Oka, 岡城 + } + } + } 1480.01.01 = { holder = 10068525 # Aso Hirokuni } @@ -3003,20 +3010,20 @@ c_shgnt_onga = { 1540.01.01 = { holder = 10068528 # Aso Okimasu } - 1569.01.01 = { - effect = { - title:b_shgnt_onga_3 = { - set_title_name = b_shgnt_onga_3 # 花尾 - } - } - } + 1569.01.01 = { + effect = { + title:b_shgnt_onga_3 = { + set_title_name = b_shgnt_onga_3 # 花尾 + } + } + } 1570.01.01 = { holder = 10068530 # Aso Takasane - effect = { - title:b_shgnt_onga_2 = { - set_title_name = b_shgnt_onga_2_2 # Oka, 岡 - } - } + effect = { + title:b_shgnt_onga_2 = { + set_title_name = b_shgnt_onga_2_2 # Oka, 岡 + } + } } } c_shgnt_honami = { @@ -3092,7 +3099,7 @@ c_shgnt_shimotsuasakura = { } } c_shgnt_chikuzen_yasu = { - 0001.01.01 = { change_development_level = 10 } + 0001.01.01 = { change_development_level = 10 } 1100.01.01 = { change_development_level = 10 } 1331.01.01 = { change_development_level = 20 } @@ -3106,13 +3113,13 @@ c_shgnt_chikuzen_yasu = { 1185.03.04 = { holder = 12750300 # Akizuki Tanekatsu } - 1203.01.01 = { - effect = { - title:b_shgnt_chikuzen_yasu_2 = { - set_title_name = b_shgnt_chikuzen_yasu_2_1 # 古処山城 - } - } - } + 1203.01.01 = { + effect = { + title:b_shgnt_chikuzen_yasu_2 = { + set_title_name = b_shgnt_chikuzen_yasu_2_1 # 古処山城 + } + } + } 1210.01.01 = { holder = 12750305 # Akizuki Taneaki } @@ -3155,13 +3162,13 @@ c_shgnt_chikuzen_yasu = { liege = k_shgnt_western_chugoku # holder = 10067505 # Akizuki Tanesane } - 1587.01.01 = { - effect = { - title:b_shgnt_chikuzen_yasu_2 = { - set_title_name = b_shgnt_chikuzen_yasu_2 # 古処山 - } - } - } + 1587.01.01 = { + effect = { + title:b_shgnt_chikuzen_yasu_2 = { + set_title_name = b_shgnt_chikuzen_yasu_2 # 古処山 + } + } + } } c_shgnt_mushirota = { 0001.01.01 = { change_development_level = 20 } @@ -3246,6 +3253,13 @@ c_shgnt_chikuzen_naka = { liege = 0 holder = 0 } + 1284.01.01={ + effect = { + title:b_shgnt_chikuzen_naka_4 = { + set_title_name = b_shgnt_chikuzen_naka_4_1 # Iwato,岩門城 + } + } + } 1410.01.01 = { holder = 10067863 # Fujiwara Sokin: Hakata } @@ -3401,12 +3415,12 @@ c_shgnt_takano = { liege = 0 # holder = 0 # Battle of Ashiya-no-ura } - 1460.01.01 = { - holder = 10064605 # Monchusho Shigeyasu - } - 1475.01.01 = { - holder = 10064604 # Monchusho Chikanori - } + 1460.01.01 = { + holder = 10064605 # Monchusho Shigeyasu + } + 1475.01.01 = { + holder = 10064604 # Monchusho Chikanori + } 1480.01.01 = { holder = 10064603 # Monchusho Chikayasu } @@ -3451,12 +3465,12 @@ c_shgnt_chikugo_yamamoto = { liege = 0 # holder = 0 # Battle of Ashiya-no-ura } - 1460.01.01 = { - holder = 10064605 # Monchusho Shigeyasu - } - 1475.01.01 = { - holder = 10064604 # Monchusho Chikanori - } + 1460.01.01 = { + holder = 10064605 # Monchusho Shigeyasu + } + 1475.01.01 = { + holder = 10064604 # Monchusho Chikanori + } 1480.01.01 = { holder = 10064603 # Monchusho Chikayasu } @@ -3472,13 +3486,13 @@ c_shgnt_chikugo_yamamoto = { 1575.01.01 = { holder = 10064621 # Monchusho Munekage } - 1578.01.01 = { - effect = { - title:b_shgnt_chikugo_yamamoto_1 = { - set_title_name = b_shgnt_chikugo_yamamoto_1_1 # Hosshin[発心城] - } - } - } + 1578.01.01 = { + effect = { + title:b_shgnt_chikugo_yamamoto_1 = { + set_title_name = b_shgnt_chikugo_yamamoto_1_1 # Hosshin[発心城] + } + } + } } c_shgnt_mihara = { 0001.01.01 = { change_development_level = 20 } @@ -3508,9 +3522,9 @@ c_shgnt_mihara = { liege = 0 holder = 0 } - 1420.01.01= { - holder = 10064804 # Takahashi Noritane - } + 1420.01.01= { + holder = 10064804 # Takahashi Noritane + } 1450.01.01 = { holder = 10064803 # Takahashi Masatane } @@ -3557,12 +3571,12 @@ c_shgnt_kamutsuma = { liege = 0 # holder = 0 # Battle of Ashiya-no-ura } - 1460.01.01 = { - holder = 10064605 # Monchusho Shigeyasu - } - 1475.01.01 = { - holder = 10064604 # Monchusho Chikanori - } + 1460.01.01 = { + holder = 10064605 # Monchusho Shigeyasu + } + 1475.01.01 = { + holder = 10064604 # Monchusho Chikanori + } 1480.01.01 = { holder = 10064603 # Monchusho Chikayasu } @@ -3607,9 +3621,9 @@ c_shgnt_shimotsuma = { liege = 0 # holder = 0 # Battle of Ashiya-no-ura } - 1460.01.01 = { - holder = 10064505 # Kamachi Tadahisa - } + 1460.01.01 = { + holder = 10064505 # Kamachi Tadahisa + } 1470.01.01 = { holder = 10064502 # Kamachi Takehisa } @@ -3672,13 +3686,13 @@ c_shgnt_nakatsu = { liege = 0 # holder = 0 # Battle of Dan-no-ura } - 1333.07.04 = { - effect = { - title:b_shgnt_nakatsu_1 = { - set_title_name = b_shgnt_nakatsu_1_1 # Saigawa, 犀川 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_nakatsu_1 = { + set_title_name = b_shgnt_nakatsu_1_1 # Saigawa, 犀川 + } + } + } 1480.01.01 = { holder = 10067103 # Nagano Yoshifusa } @@ -4056,12 +4070,26 @@ c_shgnt_oki = { liege = 0 holder = 0 } + 1290.01.01={ + effect = { + title:b_shgnt_oki_2 = { + set_title_name = b_shgnt_oki_2_1 # Haruke,晴気城 + } + } + } 1468.01.01 = { holder = 10068001 # Shoni Masasuke } 1497.05.21 = { holder = 10068000 # Shoni Sukemoto } + 1499.01.01={ + effect = { + title:b_shgnt_oki_2 = { + set_title_name = b_shgnt_oki_2 # Haruke,晴気、晴気城落城、千葉胤資自害 + } + } + } 1536.09.19 = { holder = 10057002 # Ouchi Yoshitaka } @@ -4231,13 +4259,13 @@ c_shgnt_minami_takaku = { 1200.01.01 = { holder = 10068622 # Arima Tsunezumi } - 1213.01.01 = { - effect = { - title:b_shgnt_minami_takaku_4 = { - set_title_name = b_shgnt_minami_takaku_4_1 # Hinoe - } - } - } + 1213.01.01 = { + effect = { + title:b_shgnt_minami_takaku_4 = { + set_title_name = b_shgnt_minami_takaku_4_1 # Hinoe + } + } + } 1230.01.01 = { holder = 10068621 # Arima Tomozumi } diff --git a/history/titles/k_shgnt_shikoku.txt b/history/titles/k_shgnt_shikoku.txt index c237db8..df845ea 100644 --- a/history/titles/k_shgnt_shikoku.txt +++ b/history/titles/k_shgnt_shikoku.txt @@ -3,8 +3,7 @@ 1100.01.01 = { change_development_level = 10 } 1400.01.01 = { change_development_level = 20 } 1546.01.01 = { change_development_level = 20 } - 0100.01.01 = { - } + 1180.01.01 = { liege = d_shgnt_awa # holder = 12690900 # Hasuike Ietsuna @@ -56,8 +55,7 @@ c_shgnt_hata = { 0001.01.01 = { change_development_level = 10 } 1100.01.01 = { change_development_level = 10 } 1331.01.01 = { change_development_level = 10 } - 0100.01.01 = { - } + 1180.01.01 = { liege = d_shgnt_awa # holder = 12690800 # Hirata Toshito @@ -79,11 +77,11 @@ c_shgnt_hata = { 1468.01.01 = { liege = 0 # holder = 10058101 # Ichijo Norifusa - effect = { - title:b_shgnt_hata_4 = { - set_title_name = b_shgnt_hata_4_1 # Nakamura - } - } + effect = { + title:b_shgnt_hata_4 = { + set_title_name = b_shgnt_hata_4_1 # Nakamura + } + } } 1480.11.06 = { holder = 10058100 # Ichijo Fusaie @@ -173,8 +171,7 @@ c_shgnt_iyo = { 0001.01.01 = { change_development_level = 10 } 1100.01.01 = { change_development_level = 10 } 1471.01.01 = { change_development_level = 20 } - 0100.01.01 = { - } + 0335.01.01 = { holder = 10041362 # Takeshirikami } @@ -251,8 +248,7 @@ c_shgnt_kagami = { 0001.01.01 = { change_development_level = 10 } 1100.01.01 = { change_development_level = 10 } 1308.01.01 = { change_development_level = 10 } - 0100.01.01 = { - } + 1180.01.01 = { liege = d_shgnt_tosa # holder = 10120077 # Minamoto Mareyoshi @@ -265,13 +261,13 @@ c_shgnt_kagami = { liege = 0 holder = 0 } - 1309.01.01 = { - effect = { - title:b_shgnt_aki_1 = { - set_title_name = b_shgnt_aki_1_1 # Aki - } - } - } + 1309.01.01 = { + effect = { + title:b_shgnt_aki_1 = { + set_title_name = b_shgnt_aki_1_1 # Aki + } + } + } 1380.01.01 = { liege = d_shgnt_tosa # holder = 10040586 # Hosokawa Yorimasa @@ -307,7 +303,7 @@ c_shgnt_kita_uwa = { 0001.01.01 = { change_development_level = 10 } 1100.01.01 = { change_development_level = 10 } 1331.01.01 = { change_development_level = 30 } - 1180.01.01 = { + 1180.01.01 = { liege = 0 # holder = 12690607 # Tachibana Kiminaga } @@ -319,13 +315,13 @@ c_shgnt_kita_uwa = { liege = 0 holder = 0 } - 1394.01.01 = { - effect = { - title:b_shgnt_kita_uwa_3 = { - set_title_name = b_shgnt_kita_uwa_3_1 # Matsuba - } - } - } + 1394.01.01 = { + effect = { + title:b_shgnt_kita_uwa_3 = { + set_title_name = b_shgnt_kita_uwa_3_1 # Matsuba + } + } + } 1440.01.01 = { holder = 10058707 # Saionji Kintoshi } @@ -335,13 +331,13 @@ c_shgnt_kita_uwa = { 1504.01.01 = { holder = 10058700 # Saionji Kinie } - 1533.01.01 = { - effect = { - title:b_shgnt_kita_uwa_3 = { - set_title_name = b_shgnt_kita_uwa_3_2 # Kurose - } - } - } + 1533.01.01 = { + effect = { + title:b_shgnt_kita_uwa_3 = { + set_title_name = b_shgnt_kita_uwa_3_2 # Kurose + } + } + } 1544.01.01 = { holder = 10058702 # Saionji Sanemitsu } @@ -400,13 +396,13 @@ c_shgnt_awaji_mihara = { liege = 0 # holder = 0 # Taira's escape to the west } - 1333.07.04 = { - effect = { - title:b_shgnt_awaji_mihara_4 = { - set_title_name = b_shgnt_awaji_mihara_4_1 # Kashiyū, 賀集 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_awaji_mihara_4 = { + set_title_name = b_shgnt_awaji_mihara_4_1 # Kashiyū, 賀集 + } + } + } 1336.01.01 = { holder = 10040511 # Hosokawa Morouji } @@ -601,13 +597,13 @@ c_shgnt_yu = { liege = 0 # holder = 0 # Jokyu War } - 1335.01.01 = { - effect = { - title:b_shgnt_yu_1 = { - set_title_name = b_shgnt_yu_1_1 # Yuzuki - } - } - } + 1335.01.01 = { + effect = { + title:b_shgnt_yu_1 = { + set_title_name = b_shgnt_yu_1_1 # Yuzuki + } + } + } 1379.12.23 = { liege = d_shgnt_iyo # holder = 10058616 # Kono Michiyoshi @@ -688,8 +684,7 @@ c_shgnt_tosa = { 0001.01.01 = { change_development_level = 20 } 1100.01.01 = { change_development_level = 20 } 1555.02.24 = { change_development_level = 20 } - 0100.01.01 = { - } + 1180.01.01 = { liege = d_shgnt_tosa # holder = 10120077 # Minamoto Mareyoshi @@ -808,13 +803,13 @@ c_shgnt_tsuna = { 1506.01.01 = { holder = 10058513 # Atagi Haruoki } - 1526.01.01 = { - effect = { - title:b_shgnt_tsuna_2 = { - set_title_name = b_shgnt_tsuna_2_1 # Sumoto - } - } - } + 1526.01.01 = { + effect = { + title:b_shgnt_tsuna_2 = { + set_title_name = b_shgnt_tsuna_2_1 # Sumoto + } + } + } 1545.01.01 = { holder = 10059010 # Atagi(Miyoshi) Fuyuyasu } @@ -872,8 +867,7 @@ c_shgnt_minami_uwa = { 0001.01.01 = { change_development_level = 20 } 1100.01.01 = { change_development_level = 20 } 1483.01.01 = { change_development_level = 30 } - 0100.01.01 = { - } + 1180.01.01 = { liege = 0 # holder = 12690607 # Tachibana Kiminaga @@ -911,26 +905,26 @@ d_shgnt_awa = { liege = 0 # holder = 0 # Battle of Dan-no-ura } - 1221.08.01 = { - liege = e_shgnt_japan - holder = 12360501 # Ogasawara Nagakiyo - } - 1223.01.01 = { - liege = e_shgnt_japan - holder = 12360600 # Ogasawara Nagatsune - } - 1237.01.01={ # 仮定 - liege = e_shgnt_japan - holder = 12360680 # Ogasawara Nagafusa - } - 1247.1.1={ # 仮定 - liege = e_shgnt_japan - holder = 10055742 # Ogasawara Nagahisa - } - 1250.1.1={ - liege = e_shgnt_japan - holder = 0 - } + 1221.08.01 = { + liege = e_shgnt_japan + holder = 12360501 # Ogasawara Nagakiyo + } + 1223.01.01 = { + liege = e_shgnt_japan + holder = 12360600 # Ogasawara Nagatsune + } + 1237.01.01={ # 仮定 + liege = e_shgnt_japan + holder = 12360680 # Ogasawara Nagafusa + } + 1247.1.1={ # 仮定 + liege = e_shgnt_japan + holder = 10055742 # Ogasawara Nagahisa + } + 1250.1.1={ + liege = e_shgnt_japan + holder = 0 + } 1392.03.25 = { holder = 10040524 # Hosokawa Yoshiyuki } @@ -1166,9 +1160,9 @@ d_shgnt_tosa = { 1569.09.21 = { liege = 0 # holder = 10059104 # Chosokabe Motochika - effect = { - set_capital_county = title:c_shgnt_nagaoka - } + effect = { + set_capital_county = title:c_shgnt_nagaoka + } } } c_shgnt_awa_miyoshi = { @@ -1182,27 +1176,27 @@ c_shgnt_awa_miyoshi = { liege = 0 # holder = 0 # Battle of Dan-no-ura } - 1221.01.01 = { - effect = { - title:b_shgnt_awa_miyoshi_1 = { - set_title_name = b_shgnt_awa_miyoshi_1_1 # Ōnishi - } - title:b_shgnt_awa_miyoshi_2 = { - set_title_name = b_shgnt_awa_miyoshi_2_1 # Hakuchi - } - } - } + 1221.01.01 = { + effect = { + title:b_shgnt_awa_miyoshi_1 = { + set_title_name = b_shgnt_awa_miyoshi_1_1 # Ōnishi + } + title:b_shgnt_awa_miyoshi_2 = { + set_title_name = b_shgnt_awa_miyoshi_2_1 # Hakuchi + } + } + } 1420.01.01 = { liege = d_shgnt_awa # holder = 12360790 # Miyoshi Yoshinaga } 1460.01.01 = { holder = 10059000 # Miyoshi Nagayuki - effect = { - title:b_shgnt_awa_miyoshi_2 = { - set_title_name = b_shgnt_awa_miyoshi_2_2 # Shibō - } - } + effect = { + title:b_shgnt_awa_miyoshi_2 = { + set_title_name = b_shgnt_awa_miyoshi_2_2 # Shibō + } + } } 1500.01.01 = { holder = 10059001 # Miyoshi Yukinaga @@ -1295,11 +1289,11 @@ c_shgnt_bando = { } 1392.03.25 = { holder = 10040524 # Hosokawa Yoshiyuki - effect = { - title:b_shgnt_bando_1 = { - set_title_name = b_shgnt_bando_1_1 # Shōzui - } - } + effect = { + title:b_shgnt_bando_1 = { + set_title_name = b_shgnt_bando_1_1 # Shōzui + } + } } 1402.01.01 = { holder = 10040525 # Hosokawa Mitsuhisa @@ -1383,11 +1377,11 @@ c_shgnt_oe = { } 1553.08.01 = { holder = 10045451 # Shinonara Nagafusa - effect = { - title:b_shgnt_oe_1 = { - set_title_name = b_shgnt_oe_1_1 # Uezakura - } - } + effect = { + title:b_shgnt_oe_1 = { + set_title_name = b_shgnt_oe_1_1 # Uezakura + } + } } 1573.08.13 = { holder = 10059018 # Miyoshi Nagaharu @@ -1411,13 +1405,13 @@ c_shgnt_nakatanohigashi = { liege = 0 # holder = 0 # Battle of Dan-no-ura } - 1333.07.04 = { - effect = { - title:b_shgnt_nakatanohigashi_1 = { - set_title_name = b_shgnt_nakatanohigashi_1_1 # Inozu, 渭津 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_nakatanohigashi_1 = { + set_title_name = b_shgnt_nakatanohigashi_1_1 # Inozu, 渭津 + } + } + } 1392.03.25 = { holder = 10040524 # Hosokawa Yoshiyuki } @@ -1459,13 +1453,13 @@ c_shgnt_nakatanohigashi = { liege = d_shgnt_tosa # holder = 10059104 # Chosokabe Motochika } - 1585.01.01 = { - effect = { - title:b_shgnt_nakatanohigashi_1 = { - set_title_name = b_shgnt_nakatanohigashi_1_2 # Tokushima, 徳島 - } - } - } + 1585.01.01 = { + effect = { + title:b_shgnt_nakatanohigashi_1 = { + set_title_name = b_shgnt_nakatanohigashi_1_2 # Tokushima, 徳島 + } + } + } } c_shgnt_katsura = { 0001.01.01 = { change_development_level = 10 } @@ -1508,13 +1502,13 @@ c_shgnt_awa_naka = { liege = 0 # holder = 0 # Battle of Dan-no-ura } - 1394.01.01 = { - effect = { - title:b_shgnt_awa_naka_5 = { - set_title_name = b_shgnt_awa_naka_5_1 # Ushiki - } - } - } + 1394.01.01 = { + effect = { + title:b_shgnt_awa_naka_5 = { + set_title_name = b_shgnt_awa_naka_5_1 # Ushiki + } + } + } 1450.01.01 = { holder = 10058430 # Shingai Mochizane } @@ -1563,13 +1557,13 @@ c_shgnt_sanuki_samukawa = { 1440.01.01 = { holder = 10058307 # Yasutomi Morinaga } - 1457.01.01 = { - effect = { - title:b_shgnt_sanuki_samukawa_3 = { - set_title_name = b_shgnt_sanuki_samukawa_3_1 # Ametaki - } - } - } + 1457.01.01 = { + effect = { + title:b_shgnt_sanuki_samukawa_3 = { + set_title_name = b_shgnt_sanuki_samukawa_3_1 # Ametaki + } + } + } 1460.01.01 = { holder = 10058306 # Yasutomi Mototsuna } @@ -1665,13 +1659,13 @@ c_shgnt_kakawa = { liege = 0 holder = 0 } - 1219.01.01 = { - effect = { - title:b_shgnt_kakawa_2 = { - set_title_name = b_shgnt_kakawa_2_1 # Katsuga - } - } - } + 1219.01.01 = { + effect = { + title:b_shgnt_kakawa_2 = { + set_title_name = b_shgnt_kakawa_2_1 # Katsuga + } + } + } 1337.01.01 = { holder = 10040579 # Hosokawa Akiuji } @@ -1705,13 +1699,13 @@ c_shgnt_kakawa = { 1560.01.01 = { holder = 10040741 # Kozai Motonori } - 1575.01.01 = { - effect = { - title:b_shgnt_kakawa_2 = { - set_title_name = b_shgnt_kakawa_2_2 # Fujio - } - } - } + 1575.01.01 = { + effect = { + title:b_shgnt_kakawa_2 = { + set_title_name = b_shgnt_kakawa_2_2 # Fujio + } + } + } 1571.05.01 = { holder = 10040742 # Kozai Yoshikiyo } @@ -1732,13 +1726,13 @@ c_shgnt_aya = { liege = 0 holder = 0 } - 1333.07.04 = { - effect = { - title:b_shgnt_aya_1 = { - set_title_name = b_shgnt_aya_1_1 # Ayakita, 綾北 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_aya_1 = { + set_title_name = b_shgnt_aya_1_1 # Ayakita, 綾北 + } + } + } 1337.01.01 = { holder = 10040579 # Hosokawa Akiuji } @@ -1893,13 +1887,13 @@ c_shgnt_tado = { 1352.01.01 = { holder = 10040580 # Hosokawa Shigeuji } - 1364.01.01 = { - effect = { - title:b_shgnt_tado_1 = { - set_title_name = b_shgnt_tado_1_1 # Amagiri - } - } - } + 1364.01.01 = { + effect = { + title:b_shgnt_tado_1 = { + set_title_name = b_shgnt_tado_1_1 # Amagiri + } + } + } 1359.01.01 = { holder = 10040535 # Hosokawa Yoriyuki } @@ -2295,13 +2289,13 @@ c_shgnt_iyo_kita = { liege = 0 holder = 0 } - 1331.01.01 = { - effect = { - title:b_shgnt_iyo_kita_4 = { - set_title_name = b_shgnt_iyo_kita_4_1 # Ōzu - } - } - } + 1331.01.01 = { + effect = { + title:b_shgnt_iyo_kita_4 = { + set_title_name = b_shgnt_iyo_kita_4_1 # Ōzu + } + } + } 1369.09.19 = { holder = 10058806 # Utsunomiya Muneyasu } @@ -2402,8 +2396,7 @@ c_shgnt_nagaoka = { 0001.01.01 = { change_development_level = 20 } 1100.01.01 = { change_development_level = 20 } 1555.02.24 = { change_development_level = 20 } - 0100.01.01 = { - } + 1180.01.01 = { liege = d_shgnt_tosa # holder = 10120077 # Minamoto Mareyoshi @@ -2416,13 +2409,13 @@ c_shgnt_nagaoka = { liege = 0 holder = 0 } - 1336.01.01 = { - effect = { - title:b_shgnt_nagaoka_3 = { - set_title_name = b_shgnt_nagaoka_3_1 # Okō - } - } - } + 1336.01.01 = { + effect = { + title:b_shgnt_nagaoka_3 = { + set_title_name = b_shgnt_nagaoka_3_1 # Okō + } + } + } 1380.01.01 = { liege = d_shgnt_tosa # holder = 10040586 # Hosokawa Yorimasa @@ -2459,8 +2452,7 @@ c_shgnt_takaoka = { 1100.01.01 = { change_development_level = 10 } 1400.01.01 = { change_development_level = 20 } 1546.01.01 = { change_development_level = 20 } - 0100.01.01 = { - } + 1180.01.01 = { liege = d_shgnt_awa # holder = 12690900 # Hasuike Ietsuna @@ -2469,6 +2461,13 @@ c_shgnt_takaoka = { liege = 0 holder = 0 } + 1333.07.04={ + effect = { + title:b_shgnt_takaoka_6 = { + set_title_name = b_shgnt_takaoka_6_1 # Himenono,姫野々城 + } + } + } 1400.01.01 = { liege = 0 # holder = 10058050 # Tsuno Michishige diff --git a/history/titles/k_shgnt_southern_kinai.txt b/history/titles/k_shgnt_southern_kinai.txt index 2675c88..d4538b7 100644 --- a/history/titles/k_shgnt_southern_kinai.txt +++ b/history/titles/k_shgnt_southern_kinai.txt @@ -10,13 +10,13 @@ liege = 0 # holder = 0 # Failure of Taira's Three-day rebellion } - 1333.07.04 = { - effect = { - title:b_shgnt_ae_3 = { - set_title_name = b_shgnt_ae_3_1 # Ueno, 上野 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_ae_3 = { + set_title_name = b_shgnt_ae_3_1 # Ueno, 上野 + } + } + } 1370.01.01 = { liege = d_shgnt_iga # holder = 12396030 # Nikki Kiyotada @@ -514,11 +514,11 @@ c_shgnt_kita_muro = { 1450.01.01 = { liege = 0 # holder = 10048503 # Horiuchi Ujitada - effect = { - title:b_shgnt_kita_muro_7 = { - set_title_name = b_shgnt_kita_muro_7_1 # Kuki[九鬼] - } - } + effect = { + title:b_shgnt_kita_muro_7 = { + set_title_name = b_shgnt_kita_muro_7_1 # Kuki[九鬼] + } + } } 1480.01.01 = { holder = 10048502 # Horiuchi Ujisada @@ -634,13 +634,13 @@ c_shgnt_minami = { liege = 0 # holder = 0 # Failure of Yoshitsune's rebellion } - 1334.01.01 = { - effect = { - title:b_shgnt_minami_1 = { - set_title_name = b_shgnt_minami_1_1 # Kishiwada - } - } - } + 1334.01.01 = { + effect = { + title:b_shgnt_minami_1 = { + set_title_name = b_shgnt_minami_1_1 # Kishiwada + } + } + } 1410.09.01 = { liege = d_shgnt_izumi # holder = 10040514 # Hosokawa Mochiari @@ -726,13 +726,13 @@ c_shgnt_muro = { 1566.01.01 = { holder = 10048649 # Yamamoto Yasutada } - 1573.01.01 = { - effect = { - title:b_shgnt_muro_6 = { - set_title_name = b_shgnt_muro_6_1 # Shingū - } - } - } + 1573.01.01 = { + effect = { + title:b_shgnt_muro_6 = { + set_title_name = b_shgnt_muro_6_1 # Shingū + } + } + } } c_shgnt_nabari = { 0001.01.01 = { change_development_level = 10 } @@ -810,13 +810,13 @@ c_shgnt_naga = { liege = 0 # holder = 10048686 # Tsuda Kazunaga } - 1550.01.01 = { - effect = { - title:b_shgnt_naga_4 = { - set_title_name = b_shgnt_naga_4_1 # Hanzaki - } - } - } + 1550.01.01 = { + effect = { + title:b_shgnt_naga_4 = { + set_title_name = b_shgnt_naga_4_1 # Hanzaki + } + } + } 1568.01.22 = { holder = 10048689 # Tsuda Kazumasa } @@ -840,13 +840,13 @@ c_shgnt_nakusa = { liege = 0 # holder = 0 # Battle of Awazu } - 1333.07.04 = { - effect = { - title:b_shgnt_nakusa_4 = { - set_title_name = b_shgnt_nakusa_4_1 # Kitano, 北野 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_nakusa_4 = { + set_title_name = b_shgnt_nakusa_4_1 # Kitano, 北野 + } + } + } 1400.01.17 = { liege = d_shgnt_kii # holder = 10048110 # Hatakeyama Motokuni @@ -1094,13 +1094,13 @@ c_shgnt_sounoshimo = { liege = d_shgnt_yamato # holder = 10048407 # Tsutsui Junkaku } - 1394.01.01 = { - effect = { - title:b_shgnt_sounoshimo_4 = { - set_title_name = b_shgnt_sounoshimo_4_1 # Tsutsui - } - } - } + 1394.01.01 = { + effect = { + title:b_shgnt_sounoshimo_4 = { + set_title_name = b_shgnt_sounoshimo_4_1 # Tsutsui + } + } + } 1434.01.01 = { holder = 10048408 # Tsutsui Junko } @@ -1139,13 +1139,13 @@ c_shgnt_sounoshimo = { liege = 0 # holder = 10048413 # Tsutsui Junkei } - 1580.08.17 = { - effect = { - title:b_shgnt_sounoshimo_4 = { - set_title_name = b_shgnt_sounoshimo_4_2 # Kōriyama - } - } - } + 1580.08.17 = { + effect = { + title:b_shgnt_sounoshimo_4 = { + set_title_name = b_shgnt_sounoshimo_4_2 # Kōriyama + } + } + } } c_shgnt_sonokami = { 0001.01.01 = { change_development_level = 10 } @@ -1244,13 +1244,13 @@ c_shgnt_takechi = { 1370.01.01 = { holder = 10048213 # Ochi Ienari } - 1394.01.01 = { - effect = { - title:b_shgnt_takechi_4 = { - set_title_name = b_shgnt_takechi_4_1 # Ōchi - } - } - } + 1394.01.01 = { + effect = { + title:b_shgnt_takechi_4 = { + set_title_name = b_shgnt_takechi_4_1 # Ōchi + } + } + } 1400.01.01 = { liege = d_shgnt_yamato # holder = 10048215 # Ochi Ietsune @@ -1301,13 +1301,13 @@ c_shgnt_uda = { liege = 0 holder = 0 } - 1346.01.01 = { - effect = { - title:b_shgnt_uda_3 = { - set_title_name = b_shgnt_uda_3_1 # Sawa - } - } - } + 1346.01.01 = { + effect = { + title:b_shgnt_uda_3 = { + set_title_name = b_shgnt_uda_3_1 # Sawa + } + } + } 1383.07.01 = { liege = d_shgnt_shima # holder = 10026050 # Kitabatake Akiyasu @@ -1368,6 +1368,11 @@ c_shgnt_wakae = { 1382.02.01 = { liege = d_shgnt_kawachi # holder = 10048110 # Hatakeyama Motokuni + effect = { + title:b_shgnt_wakae_2 = { + set_title_name = b_shgnt_wakae_2_1 # Wakae,若江城 + } + } } 1406.02.05 = { holder = 10031001 # Hatakeyama Mitsunori @@ -1431,6 +1436,13 @@ c_shgnt_wakae = { liege = d_shgnt_kawachi # holder = 10045605 # Ikeda Norimasa } + 1581.01.01={ + effect = { + title:b_shgnt_wakae_2 = { + set_title_name = b_shgnt_wakae_2 # Wakae,若江 + } + } + } 1582.07.02 = { liege = k_shgnt_northern_kinai # holder = 10029411 # Hashiba Hidetsugu @@ -1459,13 +1471,13 @@ c_shgnt_yamanobe = { 1400.01.01 = { holder = 10048906 # Furuichi Inken } - 1404.01.01={ - effect = { - title:b_shgnt_yamanobe_2 = { - set_title_name = b_shgnt_yamanobe_2_1 # Kishida,岸田 - } - } - } + 1404.01.01={ + effect = { + title:b_shgnt_yamanobe_2 = { + set_title_name = b_shgnt_yamanobe_2_1 # Kishida,岸田 + } + } + } 1430.01.01 = { holder = 10048900 # Furuichi Insen } @@ -1928,9 +1940,9 @@ d_shgnt_kawachi = { } } d_shgnt_kii = { - 0701.1.1={ - liege="e_shgnt_tenno" - } + 0701.1.1={ + liege="e_shgnt_tenno" + } 1179.12.18 = { liege = k_shgnt_southern_kinai # holder = 10110033 # Taira Yorimori @@ -2001,24 +2013,24 @@ d_shgnt_kii = { 1460.10.04 = { holder = 10048121 # Hatakeyama Masanaga } - 1467.6.27={ # Onin war - liege = "e_shgnt_japan" # Onin War - } - 1493.05.08 = { # Meiou Coup - liege=0 - } + 1467.6.27={ # Onin war + liege = "e_shgnt_japan" # Onin War + } + 1493.05.08 = { # Meiou Coup + liege=0 + } 1493.06.09 = { holder = 10048123 # Hatakeyama Hisanobu } - 1508.7.28={ - liege="e_shgnt_japan" - } + 1508.7.28={ + liege="e_shgnt_japan" + } 1517.06.01 = { holder = 10048100 # Hatakeyama Tanenaga } - 1543.1.1={ - liege="k_shgnt_northern_kinai" - } + 1543.1.1={ + liege="k_shgnt_northern_kinai" + } 1545.06.23 = { holder = 10048125 # Hatakeyama Masakuni } @@ -2144,9 +2156,9 @@ d_shgnt_yamato = { } 1576.06.06 = { holder = 10048413 # Tsutsui Junkei - effect = { - set_capital_county = title:c_shgnt_sounoshimo # Kōriyama - } + effect = { + set_capital_county = title:c_shgnt_sounoshimo # Kōriyama + } } } c_shgnt_nara = { @@ -2219,13 +2231,13 @@ c_shgnt_nara = { 1553.10.13 = { holder = 11000298 # [202] Kakuyo } - 1560.01.01 = { - effect = { - title:b_shgnt_nara_2 = { - set_title_name = b_shgnt_nara_2_1 # Tamonyama - } - } - } + 1560.01.01 = { + effect = { + title:b_shgnt_nara_2 = { + set_title_name = b_shgnt_nara_2_1 # Tamonyama + } + } + } 1562.05.17 = { holder = 11000836 # [203] Jinen } @@ -2289,13 +2301,13 @@ c_shgnt_tochi = { liege = k_nmih_yamashiro # holder = 12540118 # Ochi Chikaie } - 1200.01.01 = { - effect = { - title:b_shgnt_tochi_1 = { - set_title_name = b_shgnt_tochi_1_1 # Tōichi - } - } - } + 1200.01.01 = { + effect = { + title:b_shgnt_tochi_1 = { + set_title_name = b_shgnt_tochi_1_1 # Tōichi + } + } + } 1205.01.01 = { holder = 0 } @@ -2604,13 +2616,13 @@ c_shgnt_sarara = { liege = k_nmih_kanrei # holder = 10040831 # Kizawa Nagamasa } - 1532.01.01 = { - effect = { - title:b_shgnt_sarara_1 = { - set_title_name = b_shgnt_sarara_1_1 # Iimoriyama - } - } - } + 1532.01.01 = { + effect = { + title:b_shgnt_sarara_1 = { + set_title_name = b_shgnt_sarara_1_1 # Iimoriyama + } + } + } 1532.07.17 = { liege = d_shgnt_kawachi # # holder = 10040831 # Kizawa Nagamasa @@ -2653,13 +2665,13 @@ c_shgnt_kawachi = { 1210.01.01 = { holder = 0 } - 1333.07.04 = { - effect = { - title:b_shgnt_kawachi_1 = { - set_title_name = b_shgnt_kawachi_1_1 # Hiraoka, 枚岡神社 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_kawachi_1 = { + set_title_name = b_shgnt_kawachi_1_1 # Hiraoka, 枚岡神社 + } + } + } 1382.02.01 = { liege = d_shgnt_kawachi # holder = 10048110 # Hatakeyama Motokuni @@ -3082,13 +3094,13 @@ c_shgnt_shiki = { liege = 0 # holder = 0 # Failure of Yoshitsune's rebellion } - 1333.07.04 = { - effect = { - title:b_shgnt_shiki_2 = { - set_title_name = b_shgnt_shiki_2_1 # Dōmyōji, 道明寺 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_shiki_2 = { + set_title_name = b_shgnt_shiki_2_1 # Dōmyōji, 道明寺 + } + } + } 1382.02.01 = { liege = d_shgnt_kawachi # holder = 10048110 # Hatakeyama Motokuni @@ -3612,13 +3624,13 @@ c_shgnt_furuichi = { liege = d_shgnt_kawachi # holder = 10048110 # Hatakeyama Motokuni } - 1394.01.01 = { - effect = { - title:b_shgnt_furuichi_1 = { - set_title_name = b_shgnt_furuichi_1_1 # Takaya - } - } - } + 1394.01.01 = { + effect = { + title:b_shgnt_furuichi_1 = { + set_title_name = b_shgnt_furuichi_1_1 # Takaya + } + } + } 1406.02.05 = { holder = 10031001 # Hatakeyama Mitsunori } @@ -3818,13 +3830,13 @@ c_shgnt_sakai = { liege = 0 # holder = 0 # Failure of Yoshitsune's rebellion } - 1336.01.01 = { - effect = { - title:b_shgnt_sakai_1 = { - set_title_name = b_shgnt_sakai_1_1 # Sakaiura - } - } - } + 1336.01.01 = { + effect = { + title:b_shgnt_sakai_1 = { + set_title_name = b_shgnt_sakai_1_1 # Sakaiura + } + } + } 1440.01.01 = { liege = d_nmih_sakai # holder = 10042860 # Yukawa Sena @@ -3864,13 +3876,13 @@ c_shgnt_izumi = { liege = 0 # holder = 0 # Failure of Yoshitsune's rebellion } - 1333.07.04 = { - effect = { - title:b_shgnt_izumi_3 = { - set_title_name = b_shgnt_izumi_3_1 # Fuchū, 府中 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_izumi_3 = { + set_title_name = b_shgnt_izumi_3_1 # Fuchū, 府中 + } + } + } 1410.09.01 = { liege = d_shgnt_izumi # holder = 10040514 # Hosokawa Mochiari @@ -4090,13 +4102,13 @@ c_shgnt_ama = { liege = 0 # Saika-shu holder = 10048551 # Suzuki Sadayu } - 1550.01.01 = { - effect = { - title:b_shgnt_ama_2 = { - set_title_name = b_shgnt_ama_2_1 # Saika - } - } - } + 1550.01.01 = { + effect = { + title:b_shgnt_ama_2 = { + set_title_name = b_shgnt_ama_2_1 # Saika + } + } + } 1557.01.01 = { holder = 10048550 # Suzuki Magoichi } diff --git a/history/titles/k_shgnt_southern_kyushu.txt b/history/titles/k_shgnt_southern_kyushu.txt index 5c6fb8c..a8f6128 100644 --- a/history/titles/k_shgnt_southern_kyushu.txt +++ b/history/titles/k_shgnt_southern_kyushu.txt @@ -559,11 +559,11 @@ c_shgnt_kagoshima = { } 1411.08.25 = { holder = 10060004 # Shimazu Hisatoyo - effect = { - title:b_shgnt_kagoshima_2 = { - set_title_name = b_shgnt_kagoshima_2_1 # Shimizu - } - } + effect = { + title:b_shgnt_kagoshima_2 = { + set_title_name = b_shgnt_kagoshima_2_1 # Shimizu + } + } } 1425.02.09 = { holder = 10060005 # Shimazu Tadakuni @@ -592,13 +592,13 @@ c_shgnt_kagoshima = { 1539.01.01 = { holder = 10060000 # Shimazu Takahisa } - 1550.01.01 = { - effect = { - title:b_shgnt_kagoshima_2 = { - set_title_name = b_shgnt_kagoshima_2_2 # Uchi - } - } - } + 1550.01.01 = { + effect = { + title:b_shgnt_kagoshima_2 = { + set_title_name = b_shgnt_kagoshima_2_2 # Uchi + } + } + } 1566.01.01 = { holder = 10060024 # Shimazu Yoshihisa } @@ -759,13 +759,13 @@ c_shgnt_kukuchi = { 1343.01.01 = { holder = 10066022 # Kikuchi Takemitsu } - 1346.01.01 = { - effect = { - title:b_shgnt_kukuchi_1 = { - set_title_name = b_shgnt_kukuchi_1_1 # Kikuchi, 菊池城 a.k.a. 隈府城 - } - } - } + 1346.01.01 = { + effect = { + title:b_shgnt_kukuchi_1 = { + set_title_name = b_shgnt_kukuchi_1_1 # Kikuchi, 菊池城 a.k.a. 隈府城 + } + } + } 1373.12.29 = { holder = 10066021 # Kikuchi Takemasa } @@ -827,13 +827,13 @@ c_shgnt_koyu = { liege = 0 holder = 0 } - 1335.01.01 = { - effect = { - title:b_shgnt_koyu_4 = { - set_title_name = b_shgnt_koyu_4_1 # Tonogōri - } - } - } + 1335.01.01 = { + effect = { + title:b_shgnt_koyu_4 = { + set_title_name = b_shgnt_koyu_4_1 # Tonogōri + } + } + } 1380.08.01 = { holder = 10060509 # Ito Sukeyasu } @@ -916,11 +916,11 @@ c_shgnt_kuma = { } 1448.05.01 = { holder = 10066406 # Sagara Nagatsugu - effect = { - title:b_shgnt_kuma_1 = { - set_title_name = b_shgnt_kuma_1_1 # Hitoyoshi - } - } + effect = { + title:b_shgnt_kuma_1 = { + set_title_name = b_shgnt_kuma_1_1 # Hitoyoshi + } + } } 1468.03.09 = { holder = 10066405 # Sagara Tametsugu @@ -976,13 +976,13 @@ c_shgnt_kuwahara = { liege = 0 holder = 0 } - 1333.07.04 = { - effect = { - title:b_shgnt_kuwahara_3 = { - set_title_name = b_shgnt_kuwahara_3_1 # Kagoshima, 鹿児嶋神社 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_kuwahara_3 = { + set_title_name = b_shgnt_kuwahara_3_1 # Kagoshima, 鹿児嶋神社 + } + } + } 1380.01.01 = { holder = 10060207 # Gamo Kiyoaki } @@ -1033,6 +1033,13 @@ c_shgnt_kami_mashiki = { liege = 0 # holder = 0 # Battle of Dan-no-ura } + 1207.01.01={ + effect = { + title:b_shgnt_kami_mashiki_6 = { + set_title_name = b_shgnt_kami_mashiki_6_1 # Iwao,岩尾城 + } + } + } 1210.01.01 = { holder = 10041449 # Aso Koretsugu } @@ -1085,6 +1092,13 @@ c_shgnt_kami_mashiki = { 1517.01.01 = { holder = 10066201 # Aso Koretoyo } + 1543.01.01={ + effect = { + title:b_shgnt_shimo_mashiki_5 = { + set_title_name = b_shgnt_shimo_mashiki_5_1 # Katashida,堅志田城 + } + } + } 1559.12.05 = { holder = 10066204 # Aso Koremasa } @@ -1112,11 +1126,11 @@ c_shgnt_miyazaki = { 1446.01.01 = { liege = 0 # holder = 10060507 # Ito Suketaka - effect = { - title:b_shgnt_miyazaki_1 = { - set_title_name = b_shgnt_miyazaki_1_1 # Sadowara - } - } + effect = { + title:b_shgnt_miyazaki_1 = { + set_title_name = b_shgnt_miyazaki_1_1 # Sadowara + } + } } 1485.06.10 = { holder = 10060501 # Ito Tadasuke @@ -1154,6 +1168,13 @@ c_shgnt_morokata = { liege = 0 # holder = 0 # Battle of Dan-no-ura } + 1333.07.04={ + effect = { + title:b_shgnt_morokata_6 = { + set_title_name = b_shgnt_morokata_6_1 # Tokumitsu,徳満城 + } + } + } 1352.01.01 = { liege = d_shgnt_satsuma # holder = 10060258 # Hongo Suketada @@ -1164,13 +1185,13 @@ c_shgnt_morokata = { 1402.01.01 = { holder = 10060256 # Hongo Tomohisa } - 1375.01.01 = { - effect = { - title:b_shgnt_morokata_5 = { - set_title_name = b_shgnt_morokata_5_1 # Miyakonojō - } - } - } + 1375.01.01 = { + effect = { + title:b_shgnt_morokata_5 = { + set_title_name = b_shgnt_morokata_5_1 # Miyakonojō + } + } + } 1420.01.01 = { holder = 10060255 # Hongo Mochihisa } @@ -1189,6 +1210,11 @@ c_shgnt_morokata = { } 1521.01.01 = { holder = 10060250 # Hongo Tadasuke + effect = { + title:b_shgnt_morokata_3 = { + set_title_name = b_shgnt_morokata_3_1 # Nonomidani,野々美谷城 + } + } } 1559.12.14 = { liege = d_shgnt_satsuma # @@ -1440,13 +1466,13 @@ c_shgnt_takuma = { liege = 0 # holder = 0 # Battle of Dan-no-ura } - 1333.07.04 = { - effect = { - title:b_shgnt_takuma_1 = { - set_title_name = b_shgnt_takuma_1_1 # Suizenji, 水前寺 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_takuma_1 = { + set_title_name = b_shgnt_takuma_1_1 # Suizenji, 水前寺 + } + } + } 1407.04.25 = { liege = d_shgnt_higo # holder = 10066019 # Kikuchi Kanetomo @@ -1564,13 +1590,13 @@ c_shgnt_kumake = { 1185.04.25 = { holder = 12810310 # Kozuma Iezane } - 1200.01.01 = { - effect = { - title:b_shgnt_kumake_2 = { - set_title_name = b_shgnt_kumake_2_1 # Akaogi, 赤尾木城 - } - } - } + 1200.01.01 = { + effect = { + title:b_shgnt_kumake_2 = { + set_title_name = b_shgnt_kumake_2_1 # Akaogi, 赤尾木城 + } + } + } 1210.01.01 = { holder = 10060172 # Higo Tokinobu } @@ -1639,13 +1665,13 @@ c_shgnt_usuki = { 1440.01.01 = { holder = 10060754 # Tsuchimochi Kaneshige } - 1441.01.01 = { - effect = { - title:b_shgnt_usuki_5 = { - set_title_name = b_shgnt_usuki_5_1 # Matsuo - } - } - } + 1441.01.01 = { + effect = { + title:b_shgnt_usuki_5 = { + set_title_name = b_shgnt_usuki_5_1 # Matsuo + } + } + } 1470.01.01 = { holder = 10060753 # Tsuchimochi Tsunetsuna } @@ -1720,13 +1746,13 @@ c_shgnt_uto = { liege = 0 # holder = 10066301 # Nawa Akitada } - 1504.01.01 = { - effect = { - title:b_shgnt_uto_1 = { - set_title_name = b_shgnt_uto_1_1 # Uto - } - } - } + 1504.01.01 = { + effect = { + title:b_shgnt_uto_1 = { + set_title_name = b_shgnt_uto_1_1 # Uto + } + } + } 1520.01.01 = { holder = 10066300 # Nawa Takeaki } @@ -2070,9 +2096,9 @@ d_shgnt_satsuma = { } 1519.05.12 = { holder = 10060002 # Shimazu Katsuhisa - effect = { - set_capital_county = title:c_shgnt_kagoshima - } + effect = { + set_capital_county = title:c_shgnt_kagoshima + } } 1527.01.01 = { holder = 10060000 # Shimazu Takahisa @@ -2105,13 +2131,13 @@ c_shgnt_higo_yatsushiro = { liege = 0 holder = 0 } - 1335.01.01 = { - effect = { - title:b_shgnt_higo_yatsushiro_5 = { - set_title_name = b_shgnt_higo_yatsushiro_5_1 # Furumoto - } - } - } + 1335.01.01 = { + effect = { + title:b_shgnt_higo_yatsushiro_5 = { + set_title_name = b_shgnt_higo_yatsushiro_5_1 # Furumoto + } + } + } 1390.01.01 = { holder = 10066452 # Sagara Yoritada } @@ -2596,6 +2622,13 @@ c_shgnt_minami_morokata = { liege = 0 # holder = 0 # Battle of Dan-no-ura } + 1333.07.04={ + effect = { + title:b_shgnt_minami_morokata_1 = { + set_title_name = b_shgnt_minami_morokata_1_1 # Shibushi,志布志城 + } + } + } 1352.01.01 = { holder = 10060258 # Hongo Suketada } @@ -2640,6 +2673,13 @@ c_shgnt_hyuga_naka = { liege = 0 # holder = 0 # Battle of Dan-no-ura } + 1333.07.04={ + effect = { + title:b_shgnt_hyuga_naka_4 = { + set_title_name = b_shgnt_hyuga_naka_4_1 # Kushima,櫛間城 + } + } + } 1352.01.01 = { holder = 10060258 # Hongo Suketada } @@ -3152,16 +3192,16 @@ c_shgnt_ata = { holder = 10060005 # Shimazu Tadakuni } 1460.01.01 = { - liege = d_shgnt_satsuma # Satsuma Tadakuni + liege = d_shgnt_satsuma # Satsuma Tadakuni holder = 10060009 # Shimazu Tomohisa - effect = { - title:b_shgnt_ata_1 = { - set_title_name = b_shgnt_ata_1_1 # Tabuse - } - } + effect = { + title:b_shgnt_ata_1 = { + set_title_name = b_shgnt_ata_1_1 # Tabuse + } + } } 1493.03.27 = { - liege = d_shgnt_satsuma + liege = d_shgnt_satsuma holder = 10060021 # Shimazu Yukihisa } 1512.1.1={ @@ -3264,13 +3304,13 @@ c_shgnt_takaki = { liege = 0 # holder = 0 # Battle of Dan-no-ura } - 1333.07.04 = { - effect = { - title:b_shgnt_takaki_1 = { - set_title_name = b_shgnt_takaki_1_1 # Nitta, 新田神社 - } - } - } + 1333.07.04 = { + effect = { + title:b_shgnt_takaki_1 = { + set_title_name = b_shgnt_takaki_1_1 # Nitta, 新田神社 + } + } + } 1422.01.01 = { holder = 10060004 # Shimazu Hisatoyo } diff --git a/localization/english/shgnt_titles_l_english.yml b/localization/english/shgnt_titles_l_english.yml index 9b69d9f..eaef6da 100644 --- a/localization/english/shgnt_titles_l_english.yml +++ b/localization/english/shgnt_titles_l_english.yml @@ -47,6 +47,7 @@ b_shgnt_heguri_3:0 "Hōryū Ji" b_shgnt_yamanobe_1:0 "Idodo" b_shgnt_yamanobe_2:0 "Yamabe" + b_shgnt_yamanobe_2_1:0 "Kishida" b_shgnt_yamanobe_3:0 "Tsuge" b_shgnt_yamanobe_4:0 "Murō" b_shgnt_yamanobe_5:0 "Iwaya" @@ -1610,7 +1611,7 @@ b_shgnt_nishi_kubiki_3:0 "Imai" b_shgnt_iwafune_1:0 "Okawadani" b_shgnt_iwafune_2:0 "Sarusawa" - b_shgnt_iwafune_3:0 "Murakami" + b_shgnt_iwafune_3:0 "Koizumi Honjō" b_shgnt_iwafune_4:0 "Arakawa" b_shgnt_nutari_1:0 "Okuyama" b_shgnt_nutari_2:0 "Kurokawa" @@ -4202,3 +4203,20 @@ b_shgnt_suruga_1_1:0 "Fukasawa" b_shgnt_suruga_4_1:0 "Ōhira" b_shgnt_katsushika_1_1:0 "Kasai" + b_shgnt_usa_3_1:0 "Myōkendake" + b_shgnt_hyuga_naka_4_1:0 "Kushima" + b_shgnt_minami_morokata_1_1:0 "Shibushi" + b_shgnt_morokata_6_1:0 "Tokumitsu" + b_shgnt_morokata_3_1:0 "Nonomidani" + b_shgnt_kami_mashiki_6_1:0 "Iwao" + b_shgnt_shimo_mashiki_5_1:0 "Katashida" + b_shgnt_takaoka_6_1:0 "Himenono" + b_shgnt_wakae_2_1:0 "Wakae" + b_shgnt_shiki_2_1:0 "Dōmyōji" + b_shgnt_iwafune_4_1:0 "Hirabayashi" + b_shgnt_chikuzen_naka_4_1:0 "Iwato" + b_shgnt_oki_2_1:0 "Haruke" + b_shgnt_sonoki_4_1:0 "Nagasaki" + b_shgnt_ishizu_3:0 "Komano" + c_shgnt_horokotan:0 "Horokotan" + b_shgnt_horokotan:0 "Horokotan" \ No newline at end of file diff --git a/localization/japanese/shgnt_titles_l_english.yml b/localization/japanese/shgnt_titles_l_english.yml index a3a3130..770c96a 100644 --- a/localization/japanese/shgnt_titles_l_english.yml +++ b/localization/japanese/shgnt_titles_l_english.yml @@ -47,6 +47,7 @@ b_shgnt_heguri_3:0 "法隆寺" b_shgnt_yamanobe_1:0 "井戸堂" b_shgnt_yamanobe_2:0 "山辺荘" + b_shgnt_yamanobe_2_1:0 "岸田" b_shgnt_yamanobe_3:0 "都祁" b_shgnt_yamanobe_4:0 "室生" b_shgnt_yamanobe_5:0 "岩屋" @@ -1610,8 +1611,8 @@ b_shgnt_nishi_kubiki_3:0 "今井" b_shgnt_iwafune_1:0 "大川谷" b_shgnt_iwafune_2:0 "猿沢" - b_shgnt_iwafune_3:0 "村上" - b_shgnt_iwafune_4:0 "荒河" + b_shgnt_iwafune_3:0 "小泉本庄" + b_shgnt_iwafune_4:0 "荒河保" b_shgnt_nutari_1:0 "奥山荘" b_shgnt_nutari_2:0 "黒川" b_shgnt_nutari_3:0 "加治" @@ -4205,3 +4206,20 @@ b_shgnt_suruga_1_1:0 "深沢城" b_shgnt_suruga_4_1:0 "大平新城" b_shgnt_katsushika_1_1:0 "葛西城" + b_shgnt_usa_3_1:0 "妙見嶽城" + b_shgnt_hyuga_naka_4_1:0 "櫛間城" + b_shgnt_minami_morokata_1_1:0 "志布志城" + b_shgnt_morokata_6_1:0 "徳満城" + b_shgnt_morokata_3_1:0 "野々美谷城" + b_shgnt_kami_mashiki_6_1:0 "岩尾城" + b_shgnt_shimo_mashiki_5_1:0 "堅志田城" + b_shgnt_takaoka_6_1:0 "姫野々城" + b_shgnt_wakae_2_1:0 "若江城" + b_shgnt_shiki_2_1:0 "道明寺" + b_shgnt_iwafune_4_1:0 "平林城" + b_shgnt_chikuzen_naka_4_1:0 "岩門城" + b_shgnt_oki_2_1:0 "晴気城" + b_shgnt_sonoki_4_1:0 "長崎港" + b_shgnt_ishizu_3:0 "駒野" + c_shgnt_horokotan:0 "ホロコタン" + b_shgnt_horokotan:0 "ホロコタン" \ No newline at end of file From 404a3a3bfbae114ee71ec165f8e74eb038336c34 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sat, 6 Nov 2021 19:02:51 +0900 Subject: [PATCH 15/19] =?UTF-8?q?=F0=9F=92=A5=20change=20county=20capital?= =?UTF-8?q?=20barony?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Issue #329 --- common/landed_titles/shgnt_landed_titles.txt | 30 +++++++++---------- history/provinces/k_shgnt_northern_kyushu.txt | 4 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/common/landed_titles/shgnt_landed_titles.txt b/common/landed_titles/shgnt_landed_titles.txt index b9e1ea4..111f169 100644 --- a/common/landed_titles/shgnt_landed_titles.txt +++ b/common/landed_titles/shgnt_landed_titles.txt @@ -9044,6 +9044,9 @@ c_shgnt_kurate = { color = {112 235 203} color2 = {255 255 255} + b_shgnt_kurate_5 = { + province = 2263 # Kaita, 粥田荘 + } b_shgnt_kurate_1 = { province = 2259 } @@ -9056,9 +9059,6 @@ b_shgnt_kurate_4 = { province = 2262 } - b_shgnt_kurate_5 = { - province = 2263 - } } c_shgnt_honami = { b_shgnt_honami_1 = { @@ -9433,6 +9433,9 @@ } } c_shgnt_shimotsumike = { + b_shgnt_shimotsumike_5 = { + province = 2362 # Nakatsu,中津 + } b_shgnt_shimotsumike_1 = { province = 2358 } @@ -9445,13 +9448,13 @@ b_shgnt_shimotsumike_4 = { province = 2361 } - b_shgnt_shimotsumike_5 = { - province = 2362 - } } c_shgnt_usa = { color = {202 185 203} color2 = {255 255 255} + b_shgnt_usa_5 = { + province = 2367 # 宇佐神宮 + } b_shgnt_usa_1 = { province = 2363 } @@ -9464,9 +9467,6 @@ b_shgnt_usa_4 = { province = 2366 } - b_shgnt_usa_5 = { - province = 2367 - } b_shgnt_usa_6 = { province = 2368 } @@ -9569,6 +9569,9 @@ } } c_shgnt_bungo_ono = { + b_shgnt_bungo_ono_7 = { + province = 2400 # 緒方荘 + } b_shgnt_bungo_ono_1 = { province = 2394 } @@ -9587,9 +9590,6 @@ b_shgnt_bungo_ono_6 = { province = 2399 } - b_shgnt_bungo_ono_7 = { - province = 2400 - } } c_shgnt_naori = { color = {132 155 203} @@ -9664,6 +9664,9 @@ } } c_shgnt_kamusaki = { + b_shgnt_kamusaki_4 = { + province = 2420 # Kanzaki, 神崎荘 + } b_shgnt_kamusaki_1 = { province = 2417 } @@ -9673,9 +9676,6 @@ b_shgnt_kamusaki_3 = { province = 2419 } - b_shgnt_kamusaki_4 = { - province = 2420 - } b_shgnt_kamusaki_5 = { province = 2421 } diff --git a/history/provinces/k_shgnt_northern_kyushu.txt b/history/provinces/k_shgnt_northern_kyushu.txt index 6e27fa5..0e8b337 100644 --- a/history/provinces/k_shgnt_northern_kyushu.txt +++ b/history/provinces/k_shgnt_northern_kyushu.txt @@ -617,7 +617,7 @@ 2358 = { # Shimotsumike_1 culture = northern_kyushu religion = shinto - holding = castle_holding + holding = none } 2359 = { # Shimotsumike_2 culture = northern_kyushu @@ -806,7 +806,7 @@ 2394 = { # Bungo_Ono_1 culture = central_kyushu religion = shinto - holding = castle_holding + holding = none } 2395 = { # Bungo_Ono_2 culture = central_kyushu From d0134d6663dc6c9508fcfaa8bb4fc791e799ff4a Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sat, 6 Nov 2021 19:50:03 +0900 Subject: [PATCH 16/19] Ground textures have been updated. --- gfx/map/terrain/beach_02_mask.png | 4 ++-- gfx/map/terrain/detail_index.tga | 2 +- gfx/map/terrain/detail_intensity.tga | 2 +- gfx/map/terrain/farmland_01_mask.png | 4 ++-- gfx/map/terrain/hills_01_mask.png | 4 ++-- gfx/map/terrain/hills_01_rocks_mask.png | 4 ++-- gfx/map/terrain/india_farmlands_mask.png | 4 ++-- gfx/map/terrain/plains_01_dry_mask.png | 4 ++-- gfx/map/terrain/plains_01_mask.png | 4 ++-- gfx/map/terrain/plains_01_rough_mask.png | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gfx/map/terrain/beach_02_mask.png b/gfx/map/terrain/beach_02_mask.png index bdf8336..d95db97 100644 --- a/gfx/map/terrain/beach_02_mask.png +++ b/gfx/map/terrain/beach_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae2f9f4c79c86248380cc03d6877d610162971b0ba3652f85116466070cf84a1 -size 7830015 +oid sha256:18ade0592a54f6430e9e6c5c021fce13b2cd55ffe7ccc3827accbe3320b289a0 +size 7830100 diff --git a/gfx/map/terrain/detail_index.tga b/gfx/map/terrain/detail_index.tga index 030b869..7c4667f 100644 --- a/gfx/map/terrain/detail_index.tga +++ b/gfx/map/terrain/detail_index.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afb031894d1c11a72251518041e06ecd0e6fdd9ec47f6cc0f9c7f5fbfb3f7de9 +oid sha256:bc97f73d92781bbab4ef0f34f1ed6b492816d703d162e8835c542878aab60925 size 134217772 diff --git a/gfx/map/terrain/detail_intensity.tga b/gfx/map/terrain/detail_intensity.tga index 5766131..7f659e0 100644 --- a/gfx/map/terrain/detail_intensity.tga +++ b/gfx/map/terrain/detail_intensity.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e47c7ddba72b2822be597a4d8b5940a2ed1905165fb2acbfb5b4572bf479b7f6 +oid sha256:71b066de093293e92fde6ba1d18a6e4c98698e1dab55ac646e042508a4471089 size 134217772 diff --git a/gfx/map/terrain/farmland_01_mask.png b/gfx/map/terrain/farmland_01_mask.png index e0a2ba5..17d5c5e 100644 --- a/gfx/map/terrain/farmland_01_mask.png +++ b/gfx/map/terrain/farmland_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02f23ba853ea2c0755f13fec7540c19efedbbf49aaf4f52a8f2609cc5158fb4b -size 4847287 +oid sha256:d9f8fbb7cc7704a427d702e10f8d4301381e70c24305f8740e9c0e1519fb4ef2 +size 4847329 diff --git a/gfx/map/terrain/hills_01_mask.png b/gfx/map/terrain/hills_01_mask.png index d385fc3..330377b 100644 --- a/gfx/map/terrain/hills_01_mask.png +++ b/gfx/map/terrain/hills_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:009945d9678742b3ebdfb1a1aaa7a9862470f5b5ce499cd04f6aab9c73af9263 -size 4833863 +oid sha256:650a1e9a57e43c62c5860e6d20ae4680e6a1f96edd07ecbdba761151772330ef +size 4834181 diff --git a/gfx/map/terrain/hills_01_rocks_mask.png b/gfx/map/terrain/hills_01_rocks_mask.png index a7c1b8b..2b5ee4c 100644 --- a/gfx/map/terrain/hills_01_rocks_mask.png +++ b/gfx/map/terrain/hills_01_rocks_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05ecd22b013e7383bc840e97c4a7073b7ee759aa16c885d147caa4204d935240 -size 147639 +oid sha256:ec022894805fdcf0f799cac6223c8f1b59afacf9f1e22980971361999ea7a72a +size 147644 diff --git a/gfx/map/terrain/india_farmlands_mask.png b/gfx/map/terrain/india_farmlands_mask.png index b28e773..9076b02 100644 --- a/gfx/map/terrain/india_farmlands_mask.png +++ b/gfx/map/terrain/india_farmlands_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42adcb488f5ce837b9c427defb9eea34cd8723a422a1fbd149f49caa501842e9 -size 2676319 +oid sha256:4dda884f4b9a61239e85fb4eee727a984f929807fa29db890f7c84856204c6ee +size 2676309 diff --git a/gfx/map/terrain/plains_01_dry_mask.png b/gfx/map/terrain/plains_01_dry_mask.png index de2afcf..be5f80a 100644 --- a/gfx/map/terrain/plains_01_dry_mask.png +++ b/gfx/map/terrain/plains_01_dry_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a09fae408ab711ebfd1996dec86884e058d642b8b0eca319b9cc22f1a674404 -size 148018 +oid sha256:b7dc85917ecb304a97d46c3239fa689fe46438827c838939c4517e7e9faeedc8 +size 148053 diff --git a/gfx/map/terrain/plains_01_mask.png b/gfx/map/terrain/plains_01_mask.png index a3aac9a..b6278bf 100644 --- a/gfx/map/terrain/plains_01_mask.png +++ b/gfx/map/terrain/plains_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f555aaf7b3ad94aefc6d3d1fd7b63ed25f7de11d59fb2e28d2b1b84377307a8 -size 4647240 +oid sha256:66751603087e3b6223e5ec8ee662b50a4371493c8bff608768dc09df4e5d51c2 +size 4647373 diff --git a/gfx/map/terrain/plains_01_rough_mask.png b/gfx/map/terrain/plains_01_rough_mask.png index a3f1dc9..413c13a 100644 --- a/gfx/map/terrain/plains_01_rough_mask.png +++ b/gfx/map/terrain/plains_01_rough_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c44a7e576e80aad957fdbf8f58e87272c1d1f36afcfa20699d3ff46505a64cb -size 326206 +oid sha256:ed24be0537b5d92bcb03a8794173e6ed2c2107ff4b66ce9303de7153e9dcb78a +size 326209 From d170e4fe95d46e25972d0d9024c15aa833e1e01b Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sat, 6 Nov 2021 19:50:16 +0900 Subject: [PATCH 17/19] Some map object locators have been adjusted. --- gfx/map/map_object_data/building_locators.txt | 8 ++++---- gfx/map/map_object_data/combat_locators.txt | 4 ++-- gfx/map/map_object_data/player_stack_locators.txt | 2 +- gfx/map/map_object_data/siege_locators.txt | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index fef1d4a..c5d565c 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -13951,8 +13951,8 @@ } { id=2341 - position={ 3817.974609 0.000000 2872.456543 } - rotation={ -0.000000 -0.305928 -0.000000 0.952055 } + position={ 3809.845947 0.000000 2870.928223 } + rotation={ -0.000000 -0.902872 -0.000000 0.429910 } scale={ 0.760718 0.760718 0.760718 } } { @@ -13987,7 +13987,7 @@ } { id=2347 - position={ 3820.076416 0.000000 2845.822510 } + position={ 3820.927490 0.000000 2860.031738 } rotation={ -0.000000 0.712305 -0.000000 -0.701870 } scale={ 0.654272 0.654272 0.654272 } } @@ -14077,7 +14077,7 @@ } { id=2362 - position={ 3860.228516 0.000000 2761.850098 } + position={ 3857.300537 0.000000 2760.676025 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 0.705249 0.705249 0.705249 } } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index c387bda..7231ff2 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -14011,8 +14011,8 @@ } { id=2347 - position={ 3823.056152 0.000000 2856.909912 } - rotation={ -0.000000 -0.738560 -0.000000 0.674187 } + position={ 3803.215088 0.000000 2846.596436 } + rotation={ -0.000000 -0.758728 -0.000000 0.651407 } scale={ 0.750000 0.750000 0.750000 } } { diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index f9d8051..b3e8a1d 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -14011,7 +14011,7 @@ } { id=2347 - position={ 3818.891846 0.000000 2851.029541 } + position={ 3811.168945 0.000000 2842.814941 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 0.750000 0.750000 0.750000 } } diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt index 493d64e..7c93caf 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -13963,8 +13963,8 @@ } { id=2341 - position={ 3812.237793 0.000000 2875.046875 } - rotation={ -0.000000 0.562142 -0.000000 0.827040 } + position={ 3813.124756 0.000000 2876.637207 } + rotation={ -0.000000 -0.216782 -0.000000 0.976219 } scale={ 0.760718 0.760718 0.760718 } } { @@ -13999,7 +13999,7 @@ } { id=2347 - position={ 3816.496094 0.000000 2841.335693 } + position={ 3817.347168 0.000000 2855.544922 } rotation={ -0.000000 -0.950018 -0.000000 -0.312196 } scale={ 0.654272 0.654272 0.654272 } } @@ -14089,7 +14089,7 @@ } { id=2362 - position={ 3863.000000 0.000000 2757.000000 } + position={ 3860.072021 0.000000 2755.825928 } rotation={ 0.000000 0.966500 0.000000 -0.256668 } scale={ 0.705249 0.705249 0.705249 } } From ba63f1d5a4caf16f986c269fa3ac9b29f3aee052 Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sat, 6 Nov 2021 19:51:27 +0900 Subject: [PATCH 18/19] Update watercolor_rgb_waterspec_a.dds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 海岸線後退に伴い海の色を広げた。 --- gfx/map/water/watercolor_rgb_waterspec_a.dds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/map/water/watercolor_rgb_waterspec_a.dds b/gfx/map/water/watercolor_rgb_waterspec_a.dds index 7d27b0d..17e1457 100644 --- a/gfx/map/water/watercolor_rgb_waterspec_a.dds +++ b/gfx/map/water/watercolor_rgb_waterspec_a.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:464e9793b30fcf69ea25e76c72ce9542c3ca87049975aefe268a220e9ac92b88 +oid sha256:8dd52b4ecc604d18b0e1153890ad67a9a847eefd86e2cf02f1581d8ca6cbea69 size 100663424 From c15d7ed3bebde960248b9846edb8c947344834dc Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sat, 6 Nov 2021 19:53:12 +0900 Subject: [PATCH 19/19] =?UTF-8?q?=F0=9F=8D=B1=20=E6=98=94=E3=81=AE?= =?UTF-8?q?=E6=B5=B7=E5=B2=B8=E7=B7=9A=E3=82=92=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Issue #334 --- map_data/heightmap.png | 4 ++-- map_data/packed_heightmap.png | 4 ++-- map_data/provinces.png | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/map_data/heightmap.png b/map_data/heightmap.png index 96c90ff..ad9909a 100644 --- a/map_data/heightmap.png +++ b/map_data/heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d953a2bc4a32ffb315ec2e6ac421d38b9b23b8761cc2ff4dfea7eaf67797460 -size 48064671 +oid sha256:3ded8116a085b84a2fd77622f43c6e2448be876002af431e0b8e3e492850d208 +size 48065110 diff --git a/map_data/packed_heightmap.png b/map_data/packed_heightmap.png index 5359eeb..fbe6d18 100644 --- a/map_data/packed_heightmap.png +++ b/map_data/packed_heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70422b56a063e5d9d6ab7824b93163081ea1fe5fa8a8e1d4cbc2d7b4e995e944 -size 33141171 +oid sha256:b927c9e031be11a15fb8cd12ec3d5132247fadba097ca7459fbf7c9f6536528b +size 33141503 diff --git a/map_data/provinces.png b/map_data/provinces.png index 4e18a25..d2f49fc 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d41018c81d5647420392a20e91c605e45a51558c6b5af138b12a925c0cb73c1 -size 1567588 +oid sha256:6ea16cd200d819a0d6fb77452cfc372414ffb827dea6ed6125d6a794732e2772 +size 1567018