From fc7c4c542f81bd43da618fe5bc4ed8fd506a293e Mon Sep 17 00:00:00 2001 From: almandite1 <76205021+almandite1@users.noreply.github.com> Date: Sat, 28 Aug 2021 16:42:18 +0900 Subject: [PATCH] Updated MOD version 0.5.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 15・16世紀に男爵領名が変化すること、holding に城が出現するように設定しました。（closed #262） - b_shgnt_buzen_takawa_1のデフォルト名を英彦山に変更しました。 - 九州地方の一部のプロヴィンスで province_terrain 設定を変更しました。 - 北海道地方の一部の場所で文化別タイトル名を設定しました。 - heightmap を更新しました。 - 地面テクスチャを更新しました。 - 木のマップオブジェクトを追加しました。 rivers.png の更新 - 九州地方の河川を再実装しました。（closed #268） dynasty house - 信濃村上氏に分家を設定しました。（closed #252 ） - 佐竹氏に分家を設定しました。（closed #253 ） 首都設定 - 一部の伯爵領の第1 holding を変更しました。（closed #270） - 葛西氏の首都伯爵領を牡鹿郡に変更しました。（closed #272） - 難波田氏の首都伯爵領を松山城のある横見郡に変更しました。（closed #273） キャラクターデータ更新 - 一部の常陸佐竹氏キャラクターのデータで、ニックネーム追加、婚約設定に変更、特質追加方法変更を行いました。 Fixed - エラーログ出力を減らすためにダミーファイルを追加しました。 - 一部マップオブジェクトロケーターを調整しました。 --- .../coat_of_arms/shgnt_dynasties.txt | 184 +++++++++- .../dynasty_houses/shgnt_dynasty_houses.txt | 102 ++++++ common/landed_titles/shgnt_landed_titles.txt | 316 +++++++++++------- common/named_colors/shgnt_colors.txt | 1 + .../province_terrain/00_province_terrain.txt | 58 ++-- .../map_objects/masks/tree_leaf_01_mask.png | 4 +- gfx/map/map_object_data/building_locators.txt | 12 +- gfx/map/map_object_data/combat_locators.txt | 2 +- .../generated/tree_leaf_high_generator_1.txt | 81 +++-- .../map_object_data/player_stack_locators.txt | 4 +- gfx/map/map_object_data/siege_locators.txt | 12 +- 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/india_farmlands_mask.png | 4 +- gfx/map/terrain/plains_01_mask.png | 4 +- .../12C-05_northern_kanto_characters.txt | 268 +++++++++++---- .../characters/12C-13_koshin_characters.txt | 3 +- .../characters/eastern_kanto_characters.txt | 145 ++++---- history/characters/koshin_characters.txt | 22 +- .../characters/southern_oshu_characters.txt | 45 ++- .../characters/western_kanto_characters.txt | 10 + history/provinces/k_shgnt_chubu.txt | 6 + history/provinces/k_shgnt_dewa.txt | 12 +- history/provinces/k_shgnt_eastern_kanto.txt | 15 +- history/provinces/k_shgnt_northern_kyushu.txt | 20 +- history/provinces/k_shgnt_northern_oshu.txt | 3 + history/provinces/k_shgnt_southern_kinai.txt | 2 +- history/provinces/k_shgnt_southern_kyushu.txt | 2 +- history/provinces/k_shgnt_southern_oshu.txt | 8 +- history/provinces/k_shgnt_western_kanto.txt | 3 + history/titles/k_shgnt_chubu.txt | 12 + history/titles/k_shgnt_dewa.txt | 7 + history/titles/k_shgnt_eastern_kanto.txt | 47 +++ history/titles/k_shgnt_hokuriku.txt | 3 + history/titles/k_shgnt_northern_kinai.txt | 12 + history/titles/k_shgnt_northern_kyushu.txt | 38 +++ history/titles/k_shgnt_northern_oshu.txt | 9 +- history/titles/k_shgnt_southern_oshu.txt | 19 ++ history/titles/k_shgnt_western_kanto.txt | 14 + .../shgnt_dynasty_names_l_english.yml | 21 +- .../english/shgnt_titles_l_english.yml | 34 +- .../shgnt_dynasty_names_l_english.yml | 21 +- .../japanese/shgnt_titles_l_english.yml | 30 +- map_data/default.map | 1 + map_data/heightmap.png | 4 +- map_data/packed_heightmap.png | 4 +- 49 files changed, 1270 insertions(+), 370 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 757210e..270fe09 100644 --- a/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt +++ b/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt @@ -3584,4 +3584,186 @@ house_shgnt_takeda_mochizuki={ #九曜 instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } } } -10006161=house_shgnt_takeda_mochizuki \ No newline at end of file +10006161=house_shgnt_takeda_mochizuki +house_shgnt_murakami_yashiro={ #丸に上文字 + pattern = "pattern_solid.dds" + color1 = "aka_iro" + colored_emblem = { + texture = "ce_h_murakami.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +10000229=house_shgnt_murakami_yashiro +house_shgnt_murakami_muroga={ #丸に上文字 + pattern = "pattern_solid.dds" + color1 = "midori_iro" + colored_emblem = { + texture = "ce_h_murakami.dds" + color1 = "kuro" + instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 } } + } +} +house_shgnt_murakami_muroga=10000227 +house_shgnt_satake_yamairi={ #Satake + pattern = "pattern_solid.dds" + color1 = "shiro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "aka_iro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_okada={ #Satake + pattern = "pattern_solid.dds" + color1 = "aomidori_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_minamisakaide={ #Satake + pattern = "pattern_solid.dds" + color1 = "azuki_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_kitasakaide={ #Satake + pattern = "pattern_solid.dds" + color1 = "ebi_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "shiro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_nukata={ #Satake + pattern = "pattern_solid.dds" + color1 = "hanarokusho_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_toyoma={ #Satake + pattern = "pattern_solid.dds" + color1 = "kakitsubata_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_takabe={ #Satake + pattern = "pattern_solid.dds" + color1 = "kihada_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_nagakura={ #Satake + pattern = "pattern_solid.dds" + color1 = "koiai" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "shiraai" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_ouchi={ #Satake + pattern = "pattern_solid.dds" + color1 = "kozome" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_mabuchi={ #Satake + pattern = "pattern_solid.dds" + color1 = "kyomurasaki" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_minami={ #Satake + pattern = "pattern_solid.dds" + color1 = "mizu_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_ono={ #Satake + pattern = "pattern_solid.dds" + color1 = "nadeshiko" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_kume={ #Satake + pattern = "pattern_solid.dds" + color1 = "niji_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_kita={ #Satake + pattern = "pattern_solid.dds" + color1 = "ruri_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_higashi={ #Satake + pattern = "pattern_solid.dds" + color1 = "shikoku" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "shiro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_hetare={ #Satake + pattern = "pattern_solid.dds" + color1 = "shobu_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_koba={ #Satake + pattern = "pattern_solid.dds" + color1 = "tokinezu" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } scale = { 0.9 0.9 } } + } +} +house_shgnt_satake_inamoto={ #Satake + pattern = "pattern_solid.dds" + color1 = "usuai_iro" + colored_emblem = { + texture = "ce_ougi_cc_3.dds" + color1 = "kuro" + instance = { position = { 0.50 0.50 } 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 bb12179..0cbf252 100644 --- a/common/dynasty_houses/shgnt_dynasty_houses.txt +++ b/common/dynasty_houses/shgnt_dynasty_houses.txt @@ -1815,4 +1815,106 @@ house_shgnt_takeda_mochizuki={ name="dynn_Mochizuki" # 望月 dynasty=10000200 # Takeda motto="kojiI_MO02_motto" +} +# Shinano-Murakami, 村上 +house_shgnt_murakami_yashiro={ + name="dynn_Yashiro" # 屋代 + dynasty=10000215 # Murakami + motto="kojiI_MO03_motto" +} +house_shgnt_murakami_muroga={ + name="dynn_Muroga" # 室賀 + dynasty=10000215 # Murakami + motto="kojiI_MO04_motto" +} +# Satake, 佐竹 +house_shgnt_satake_yamairi={ # 佐竹山入家 + name="dynn_Satake" # 佐竹 + dynasty=10000108 # Satake + motto="kojiI_MO05_motto" +} +house_shgnt_satake_okada={ + name="dynn_Okada" # 岡田 + dynasty=10000108 # Satake + motto="kojiI_MO06_motto" +} +house_shgnt_satake_minamisakaide={ + name="dynn_Minamisakaide" # 南酒出 + dynasty=10000108 # Satake + motto="kojiI_MO07_motto" +} +house_shgnt_satake_kitasakaide={ + name="dynn_Kitasakaide" # 北酒出 + dynasty=10000108 # Satake + motto="kojiI_YA01_motto" +} +house_shgnt_satake_nukata={ + name="dynn_Nukata" # 額田 + dynasty=10000108 # Satake + motto="kojiI_YA02_motto" +} +house_shgnt_satake_toyoma={ + name="dynn_Toyoma" # 豊間 + dynasty=10000108 # Satake + motto="kojiI_YA03_motto" +} +house_shgnt_satake_takabe={ + name="dynn_Takabe" # 高部 + dynasty=10000108 # Satake + motto="kojiI_YA04_motto" +} +house_shgnt_satake_nagakura={ + name="dynn_Nagakura" # 長倉 + dynasty=10000108 # Satake + motto="kojiI_YA05_motto" +} +house_shgnt_satake_ouchi={ + name="dynn_Ouchi" # 大内 + dynasty=10000108 # Satake + motto="kojiI_YA06_motto" +} +house_shgnt_satake_mabuchi={ + name="dynn_Mabuchi" # 馬淵 + dynasty=10000108 # Satake + motto="kojiI_YA07_motto" +} +house_shgnt_satake_minami={ # 佐竹南家 + name="dynn_Satake" # 佐竹 + dynasty=10000108 # Satake + motto="kojiI_YA08_motto" +} +house_shgnt_satake_ono={ + name="dynn_Ono" # 小野 + dynasty=10000108 # Satake + motto="kojiI_YA09_motto" +} +house_shgnt_satake_kume={ + name="dynn_Kume" # 久米 + dynasty=10000108 # Satake + motto="kojiI_YA10_motto" +} +house_shgnt_satake_kita={ # 佐竹北家 + name="dynn_Satake" # 佐竹 + dynasty=10000108 # Satake + motto="kojiI_YU01_motto" +} +house_shgnt_satake_higashi={ # 佐竹東家 + name="dynn_Satake" # 佐竹 + dynasty=10000108 # Satake + motto="kojiI_YU02_motto" +} +house_shgnt_satake_hetare={ + name="dynn_Hetare" # 部垂 + dynasty=10000108 # Satake + motto="kojiI_YU03_motto" +} +house_shgnt_satake_koba={ + name="dynn_Koba" # 小場 + dynasty=10000108 # Satake + motto="kojiI_YU04_motto" +} +house_shgnt_satake_inamoto={ + name="dynn_Inamoto" # 稲本 + dynasty=10000108 # Satake + motto="kojiI_YU05_motto" } \ No newline at end of file diff --git a/common/landed_titles/shgnt_landed_titles.txt b/common/landed_titles/shgnt_landed_titles.txt index b830f7a..9ac53db 100644 --- a/common/landed_titles/shgnt_landed_titles.txt +++ b/common/landed_titles/shgnt_landed_titles.txt @@ -19,10 +19,10 @@ c_shgnt_kyoto = { b_shgnt_kyoto_2 = { - province = 2 + province = 2 # 六波羅→下京 } b_shgnt_kyoto_1 = { - province = 1 + province = 1 #　上京→室町御所→二条城 } } c_shgnt_kadono = { @@ -1354,15 +1354,15 @@ c_shgnt_ito = { color = {122 225 203} color2 = {255 255 255} + b_shgnt_ito_3 = { + province = 2053 # Kongōbuji, 金剛峯寺 + } b_shgnt_ito_1 = { province = 2051 } b_shgnt_ito_2 = { province = 2052 } - b_shgnt_ito_3 = { - province = 2053 - } } c_shgnt_naga = { color = {197 75 62} @@ -3605,6 +3605,9 @@ c_shgnt_nifuta = { color = {193 125 76} color2 = {255 255 255} + b_shgnt_nifuta_6 = { + province = 966 # 新田館 + } b_shgnt_nifuta_1 = { province = 961 } @@ -3620,9 +3623,6 @@ b_shgnt_nifuta_5 = { province = 965 } - b_shgnt_nifuta_6 = { - province = 966 - } } c_shgnt_yamata = { b_shgnt_yamata_1 = { @@ -4007,8 +4007,11 @@ } } d_shgnt_shimousa = { - color = {157 137 108} - color2 = {255 255 255} + color = {157 137 108} + color2 = {255 255 255} + + capital=c_shgnt_katsushika # Shimousa Kokufu, 下総国府 + c_shgnt_katsushika = { color = {137 137 108} color2 = {255 255 255} @@ -4098,12 +4101,12 @@ c_shgnt_chiba = { color = {157 157 108} color2 = {255 255 255} + b_shgnt_chiba_2 = { + province = 620 # Chiba, 千葉城、Inohana, 亥鼻城 + } b_shgnt_chiba_1 = { province = 619 } - b_shgnt_chiba_2 = { - province = 620 - } b_shgnt_chiba_3 = { province = 621 } @@ -4631,12 +4634,12 @@ c_shgnt_ashikaga = { color = {93 74 65} color2 = {255 255 255} + b_shgnt_ashikaga_2 = { + province = 1051 # Ashikaga, 足利荘 + } b_shgnt_ashikaga_1 = { province = 1050 } - b_shgnt_ashikaga_2 = { - province = 1051 - } b_shgnt_ashikaga_3 = { province = 1052 } @@ -5179,12 +5182,12 @@ c_shgnt_kese = { color = {49 121 86} color2 = {255 255 255} + b_shgnt_kese_2 = { + province = 1196 # 矢作、高田城、米ヶ崎城 + } b_shgnt_kese_1 = { province = 1195 } - b_shgnt_kese_2 = { - province = 1196 - } b_shgnt_kese_3 = { province = 1197 } @@ -5215,12 +5218,12 @@ c_shgnt_tamatsukuri = { color = {59 141 96} color2 = {200 0 0} + b_shgnt_tamatsukuri_2 = { + province = 1204 # 一栗・岩出沢城 + } b_shgnt_tamatsukuri_1 = { province = 1203 } - b_shgnt_tamatsukuri_2 = { - province = 1204 - } } c_shgnt_kurihara = { color = {79 121 96} @@ -10724,8 +10727,11 @@ e_shgnt_ezochi = { } b_shgnt_nishi_1 = { - province = 2660 - cultural_names = { + province = 2660 # Otobe 乙部、o-to-pe, オトペ + } + b_shgnt_nishi_2 = { + province = 2661 # Kumaishi 熊石 + cultural_names = { hokkaido_ainu = cn_kuma_us_i chishima_ainu = cn_kuma_us_i karafuto_ainu = cn_kuma_us_i @@ -10738,9 +10744,6 @@ e_shgnt_ezochi = { uilta = cn_kuma_us_i } } - b_shgnt_nishi_2 = { - province = 2661 - } } c_shgnt_hiyama1 = { color = {0 76 62} @@ -10758,10 +10761,22 @@ e_shgnt_ezochi = { uilta = cn_e_sa_us_i } b_shgnt_hiyama1_1 = { - province = 2662 + province = 2662 # Assabu 厚沢部 } b_shgnt_hiyama1_2 = { - province = 2663 + province = 2663 # Esashi, e-sas-u, 江差、エサシウシ + cultural_names = { + hokkaido_ainu = cn_e_sa_us_i + chishima_ainu = cn_e_sa_us_i + karafuto_ainu = cn_e_sa_us_i + dohoku_ainu = cn_e_sa_us_i + doto_ainu = cn_e_sa_us_i + doo_ainu = cn_e_sa_us_i + donan_ainu = cn_e_sa_us_i + tohoku_ainu = cn_e_sa_us_i + nivkh = cn_e_sa_us_i + uilta = cn_e_sa_us_i + } } } c_shgnt_tsugaru1 = { @@ -10780,7 +10795,7 @@ e_shgnt_ezochi = { uilta = cn_mat_oma_i } b_shgnt_tsugaru1_1 = { - province = 2664 + province = 2664 # Ōshima 大島 } } c_shgnt_fukushima = { @@ -10830,10 +10845,22 @@ e_shgnt_ezochi = { uilta = cn_rir_o_nay } b_shgnt_kamiiso_1 = { - province = 2666 + province = 2666 # Kikonai, 木古内、rir-o-nay, リロナイ + cultural_names = { + hokkaido_ainu = cn_rir_o_nay + chishima_ainu = cn_rir_o_nay + karafuto_ainu = cn_rir_o_nay + dohoku_ainu = cn_rir_o_nay + doto_ainu = cn_rir_o_nay + doo_ainu = cn_rir_o_nay + donan_ainu = cn_rir_o_nay + tohoku_ainu = cn_rir_o_nay + nivkh = cn_rir_o_nay + uilta = cn_rir_o_nay + } } b_shgnt_kamiiso_2 = { - province = 2667 + province = 2667 # Kamiiso, 上磯〔和名〕 } } c_shgnt_kayabe = { @@ -10867,7 +10894,7 @@ e_shgnt_ezochi = { } } b_shgnt_kayabe_2 = { - province = 2669 + province = 2669 # Otoshibe 落部 } } c_shgnt_kameda = { @@ -10901,7 +10928,7 @@ e_shgnt_ezochi = { } } b_shgnt_kameda_2 = { - province = 2671 + province = 2671 # Todohokke, 椴法華、tu-pok-ke, トゥポクケ } } } @@ -10939,7 +10966,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_ku_un_tu } b_shgnt_kudo_1 = { - province = 2672 + province = 2672 # Kaitorima, 貝取澗、kaye-uturu, カイェウトゥル } b_shgnt_kudo_2 = { # Kudou province = 2673 @@ -11024,7 +11051,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_seta_nay } b_shgnt_setana_1 = { - province = 2676 + province = 2676 # Toshibetsu, 利別 } b_shgnt_setana_2 = { # Setanai province = 2677 @@ -11054,7 +11081,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_suma_oma_i } b_shgnt_shimamaki_1 = { - province = 2678 + province = 2678 # Nishishimamaki, 西島牧 } b_shgnt_shimamaki_2 = { province = 2679 @@ -11074,7 +11101,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_supki_pet } b_shgnt_suttsu_1 = { - province = 2680 + province = 2680 # Kuromatsunai, 黒松内、kurmat-nay, クルマッナイ } b_shgnt_suttsu_2 = { # Suttsu province = 2681 @@ -11158,10 +11185,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_iwaw_nay } b_shgnt_iwanai_1 = { - province = 2684 + province = 2684 # Shimano, 島野 } b_shgnt_iwanai_2 = { - province = 2685 + province = 2685 # Hattari, 発足 } } c_shgnt_furuu = { @@ -11178,10 +11205,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_hure_nay } b_shgnt_furuu_1 = { - province = 2686 + province = 2686 # Tomarimura, 泊村、moyre-tomari, モイレトマリ } b_shgnt_furuu_2 = { - province = 2687 + province = 2687 # Kamuenai, 神恵内、kamuy-nay, カムイナイ } } c_shgnt_shakotan = { @@ -11198,10 +11225,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_sak_kotan } b_shgnt_shakotan_1 = { - province = 2688 + province = 2688 # Irika, 入舸 } b_shgnt_shakotan_2 = { - province = 2689 + province = 2689 # Yobetsu, 余別 } } c_shgnt_bikuni = { @@ -11272,10 +11299,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_i_oci } b_shgnt_yoichi_1 = { - province = 2692 + province = 2692 # Akaigawa, 赤井川、suma-us-pet, スマウシペッ } b_shgnt_yoichi_2 = { - province = 2693 + province = 2693 # Oe, 大江、 } b_shgnt_yoichi_3 = { # Yoichi, 余市 province = 2694 @@ -11359,7 +11386,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_ota_nay } b_shgnt_otaru_1 = { - province = 2697 + province = 2697 # Asari, 朝里 } b_shgnt_otaru_2 = { # Otarunai province = 2698 @@ -11429,10 +11456,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_yam_us_nay } b_shgnt_yamakoshi_1 = { - province = 2699 + province = 2699 # Oshamambe, 長万部、upas-samampe, ウパシサマムペ } b_shgnt_yamakoshi_2 = { - province = 2700 + province = 2700 # Yakumo, 八雲、yu-rap, ユー・ラプ } } c_shgnt_abuta = { @@ -11462,10 +11489,10 @@ e_shgnt_ezochi = { } } b_shgnt_abuta_2 = { - province = 2702 + province = 2702 # Kucchancho, 倶知安、kutu-sani, クトゥサニ } b_shgnt_abuta_3 = { - province = 2703 + province = 2703 # Kariputo, 狩太 } } c_shgnt_usu = { @@ -11482,13 +11509,13 @@ e_shgnt_ezochi = { tohoku_ainu = cn_us_or } b_shgnt_usu_1 = { - province = 2704 + province = 2704 # Date, 伊達〔和名〕 } b_shgnt_usu_2 = { - province = 2705 + province = 2705 # Sopetsu, 壮瞥、so-pet, ソペッ } b_shgnt_usu_3 = { - province = 2706 + province = 2706 # Tokushunbetsu, 徳舜瞥、tukusis-un-pet, トゥクシシウン ペッ } } c_shgnt_muroran = { @@ -11586,10 +11613,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_i_put } b_shgnt_yufutsu_1 = { - province = 2710 + province = 2710 # Tomakomai,苫小牧、mak-oma-i, トマクオマイ } b_shgnt_yufutsu_2 = { - province = 2711 + province = 2711 # Atsuma,厚真、at-oma-p,アッオマプ } } c_shgnt_yufutsu1 = { @@ -11606,7 +11633,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_si_mukap } b_shgnt_yufutsu1_1 = { - province = 2712 + province = 2712 # Nian,似湾、 } b_shgnt_yufutsu1_2 = { province = 2713 @@ -11636,10 +11663,20 @@ e_shgnt_ezochi = { tohoku_ainu = cn_sikot_toho } b_shgnt_chitose_1 = { - province = 2714 + province = 2714 # Eniwa, 恵庭、e-en-iwa,エエンイワ } b_shgnt_chitose_2 = { - province = 2715 + province = 2715 # Chitose, 千歳 + cultural_names = { + hokkaido_ainu = cn_sikot_toho + chishima_ainu = cn_sikot_toho + karafuto_ainu = cn_sikot_toho + dohoku_ainu = cn_sikot_toho + doto_ainu = cn_sikot_toho + doo_ainu = cn_sikot_toho + donan_ainu = cn_sikot_toho + tohoku_ainu = cn_sikot_toho + } } } } @@ -11676,16 +11713,16 @@ e_shgnt_ezochi = { tohoku_ainu = cn_sar } b_shgnt_saru_1 = { - province = 2716 + province = 2716 # Usappu,右左府 } b_shgnt_saru_2 = { - province = 2717 + province = 2717 # Nina,荷菜 } b_shgnt_saru_3 = { - province = 2718 + province = 2718 # Nupukibetsu,貫気別、nupki-pet,ヌプキペッ } b_shgnt_saru_4 = { - province = 2719 + province = 2719 # Mombetsu,門別、mo-petモペッ } } c_shgnt_niikappu = { @@ -11702,10 +11739,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_ni_kap } b_shgnt_niikappu_1 = { - province = 2720 + province = 2720 # Hakuttsu,泊津 } b_shgnt_niikappu_2 = { - province = 2721 + province = 2721 # Okaribe,大狩部、o-punkar-us-peヲフンカルシベ } } c_shgnt_shizunai = { @@ -11789,7 +11826,7 @@ e_shgnt_ezochi = { } } b_shgnt_urakawa_2 = { - province = 2725 + province = 2725 # Ogifushi,荻伏、 } } c_shgnt_samani = { @@ -11880,7 +11917,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_pi_or } b_shgnt_hiroo_1 = { - province = 2728 + province = 2728 # Taiki,大樹、tayki-us-iタイキウシイ } } c_shgnt_tobui = { @@ -11897,7 +11934,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_to_puy } b_shgnt_tobui_1 = { - province = 2729 + province = 2729 #Moyori,茂寄、moy-orモイオロ } } c_shgnt_kasai1 = { @@ -11927,17 +11964,17 @@ e_shgnt_ezochi = { } } b_shgnt_kasai1_2 = { - province = 2731 + province = 2731 # Sarabetsu,更別、sar-car-petサラチャラペッ } } c_shgnt_kamikawa2 = { color = {91 181 439} color2 = {255 255 255} b_shgnt_kamikawa2_1 = { - province = 2732 + province = 2732 # Kutsutaraushi,屈足 } b_shgnt_kamikawa2_2 = { - province = 2733 + province = 2733 # Hitomappu,人舞、 } } c_shgnt_nakagawa1 = { @@ -11954,13 +11991,13 @@ e_shgnt_ezochi = { tohoku_ainu = cn_sey_o_sam } b_shgnt_nakagawa1_1 = { - province = 2734 + province = 2734 # Kawai,川合、 } b_shgnt_nakagawa1_2 = { - province = 2735 + province = 2735 # Toyokoro,豊頃、トプヨカオロ } b_shgnt_nakagawa1_3 = { - province = 2736 + province = 2736 # Hombetsu,本別 } } c_shgnt_kato1 = { @@ -12004,10 +12041,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_tokap_us_i } b_shgnt_tokachi_1 = { - province = 2738 + province = 2738 # Otsu,大津 } b_shgnt_tokachi_2 = { - province = 2739 + province = 2739 # Uraporo,浦幌、ut-nayウッナイ } } c_shgnt_ashoro1 = { @@ -12024,10 +12061,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_metot } b_shgnt_ashoro1_1 = { - province = 2740 + province = 2740 # Ashoro, 足寄、esoro-petエソロペッ } b_shgnt_ashoro1_2 = { - province = 2741 + province = 2741 # Rikumpetsu,陸別、ri-kun-petリクンペッ } } } @@ -12064,7 +12101,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_sirar_ukaw } b_shgnt_shiranuka_1 = { - province = 2742 + province = 2742 # Shakubetsu, 尺別 } b_shgnt_shiranuka_2 = { # Shiranuka, 白糠 province = 2743 @@ -12107,7 +12144,7 @@ e_shgnt_ezochi = { } } b_shgnt_kushiro_2 = { - province = 2745 + province = 2745 # Konbumori,昆布森、kompu-moyコムプモイ } } c_shgnt_akan = { @@ -12124,10 +12161,10 @@ e_shgnt_ezochi = { tohoku_ainu = cn_akam } b_shgnt_akan_1 = { - province = 2746 + province = 2746 # Shitakara, 舌辛 } b_shgnt_akan_2 = { - province = 2747 + province = 2747 # Tsurui, 鶴居〔和名〕 } } c_shgnt_abashiri1 = { @@ -12144,7 +12181,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_pi_poro } b_shgnt_abashiri1_1 = { - province = 2748 + province = 2748 # Tsubetsu, 津別、tu-petトゥペッ } b_shgnt_abashiri1_2 = { # Piporo, 美幌 province = 2749 @@ -12174,10 +12211,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_tes_ka_ka } b_shgnt_kushiro_kawakami_1 = { - province = 2750 - } - b_shgnt_kushiro_kawakami_2 = { # Teshikaga - province = 2751 + province = 2750 # Teshukaga,弟子屈、tes-ka-kaテシカカ cultural_names = { hokkaido_ainu = cn_tes_ka_ka chishima_ainu = cn_tes_ka_ka @@ -12189,6 +12223,9 @@ e_shgnt_ezochi = { tohoku_ainu = cn_tes_ka_ka } } + b_shgnt_kushiro_kawakami_2 = { # Toro塘路、to-or,トオロ + province = 2751 + } } c_shgnt_akkeshi = { color = {166 177 38} @@ -12217,7 +12254,7 @@ e_shgnt_ezochi = { } } b_shgnt_akkeshi_2 = { - province = 2753 + province = 2753 # Hamanaka,浜中、ota-noskeオタノシケ } } } @@ -12254,7 +12291,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_poro_not } b_shgnt_hanasaki_1 = { - province = 2754 + province = 2754 # Hapamai,歯舞 } } c_shgnt_notsuke = { @@ -12271,7 +12308,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_notkew } b_shgnt_notsuke_1 = { - province = 2755 + province = 2755 # Bekkai,別海、pet-kayペッカイ } } c_shgnt_nemuro = { @@ -12301,7 +12338,7 @@ e_shgnt_ezochi = { } } b_shgnt_nemuro_2 = { - province = 2757 + province = 2757 # Hashirikotan,走古丹、asir-kotanアシリコタン } } c_shgnt_shibetsu = { @@ -12345,7 +12382,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_menas_tomari } b_shgnt_menashi_1 = { - province = 2759 + province = 2759 # Uempetsu,植別 } } } @@ -12383,10 +12420,10 @@ e_shgnt_ezochi = { old_okhotsk = cn_kina_sir } b_shgnt_kunashiri_1 = { - province = 2760 + province = 2760 # Tomarimura, 泊村、moyre-tomariモイレトマリ } b_shgnt_kunashiri_2 = { - province = 2761 + province = 2761 # Ruyobetsu,留夜別 } } c_shgnt_shana = { @@ -12433,14 +12470,14 @@ e_shgnt_ezochi = { old_okhotsk = cn_etu_oro_o_p } b_shgnt_etorofu_1 = { - province = 2763 + province = 2763 # Rubetsu,留別 } } c_shgnt_shibetoro = { color = {240 205 0} color2 = {255 255 255} b_shgnt_shibetoro_1 = { - province = 2764 + province = 2764 # Shibetoro,蘂取 } } c_shgnt_furibetsu = { @@ -12457,7 +12494,7 @@ e_shgnt_ezochi = { tohoku_ainu = cn_si_pet_oro old_okhotsk = cn_si_pet_oro } - b_shgnt_furibetsu_1 = { # Shibetoro, 蘂取 + b_shgnt_furibetsu_1 = { # Furibetsu,振別 province = 2765 cultural_names = { hokkaido_ainu = cn_si_pet_oro @@ -12771,7 +12808,7 @@ e_shgnt_ezochi = { old_okhotsk = cn_is_kar_wei uilta = cn_is_kar_wei } - c_shgnt_ishikari = { + c_shgnt_ishikari = { # 石狩 color = {105 130 27} color2 = {255 255 255} cultural_names = { @@ -12784,14 +12821,24 @@ e_shgnt_ezochi = { donan_ainu = cn_is_kar_pet tohoku_ainu = cn_is_kar_pet } - b_shgnt_ishikari_1 = { - province = 2771 + b_shgnt_ishikari_2 = { + province = 2772 # Ishikari 石狩 + cultural_names = { + hokkaido_ainu = cn_is_kar_pet + chishima_ainu = cn_is_kar_pet + karafuto_ainu = cn_is_kar_pet + dohoku_ainu = cn_is_kar_pet + doto_ainu = cn_is_kar_pet + doo_ainu = cn_is_kar_pet + donan_ainu = cn_is_kar_pet + tohoku_ainu = cn_is_kar_pet + } } - b_shgnt_ishikari_2 = { - province = 2772 + b_shgnt_ishikari_1 = { + province = 2771 # Shinshinotsu 新篠津、sir-notシリノッ } b_shgnt_ishikari_3 = { - province = 2773 + province = 2773 # Tobetsu,当別、to-petトペッ } } c_shgnt_sapporo = { @@ -12807,17 +12854,27 @@ e_shgnt_ezochi = { donan_ainu = cn_sat_poro_pet tohoku_ainu = cn_sat_poro_pet } + b_shgnt_sapporo_3 = { + province = 2776 # Sapporo, 札幌 + cultural_names = { + hokkaido_ainu = cn_sat_poro_pet + chishima_ainu = cn_sat_poro_pet + karafuto_ainu = cn_sat_poro_pet + dohoku_ainu = cn_sat_poro_pet + doto_ainu = cn_sat_poro_pet + doo_ainu = cn_sat_poro_pet + donan_ainu = cn_sat_poro_pet + tohoku_ainu = cn_sat_poro_pet + } + } b_shgnt_sapporo_1 = { - province = 2774 + province = 2774 # Kotoni,琴似 } b_shgnt_sapporo_2 = { - province = 2775 - } - b_shgnt_sapporo_3 = { - province = 2776 + province = 2775 # Toyohira,豊平、tuy-piraトゥイピラ } b_shgnt_sapporo_4 = { - province = 2777 + province = 2777 # Ebetsu,江別、e-petkeエペッケ } } c_shgnt_yubari = { @@ -12853,7 +12910,7 @@ e_shgnt_ezochi = { } } } - c_shgnt_kabato = { + c_shgnt_kabato = { # 樺戸 color = {105 130 27} color2 = {255 255 255} cultural_names = { @@ -12867,13 +12924,13 @@ e_shgnt_ezochi = { tohoku_ainu = cn_kapato } b_shgnt_kabato_1 = { - province = 2781 + province = 2781 # Uraushi 浦臼 } b_shgnt_kabato_2 = { - province = 2782 + province = 2782 # Tsukigata 月形 } } - c_shgnt_sorachi = { + c_shgnt_sorachi = { # 空知 color = {105 130 27} color2 = {255 255 255} cultural_names = { @@ -13150,7 +13207,17 @@ e_shgnt_ezochi = { province = 2807 } b_shgnt_rumoi_2 = { - province = 2808 + province = 2808 # Rumoi 留萌 + cultural_names = { + hokkaido_ainu = cn_rur_mo_ot_pe + chishima_ainu = cn_rur_mo_ot_pe + karafuto_ainu = cn_rur_mo_ot_pe + dohoku_ainu = cn_rur_mo_ot_pe + doto_ainu = cn_rur_mo_ot_pe + doo_ainu = cn_rur_mo_ot_pe + donan_ainu = cn_rur_mo_ot_pe + tohoku_ainu = cn_rur_mo_ot_pe + } } } c_shgnt_tomamae = { @@ -13511,11 +13578,12 @@ e_shgnt_ezochi = { } } k_shgnt_kita_ezochi = { - color = {248 229 140} - color2 = {255 255 255} + color = {248 229 140} + color2 = {255 255 255} + d_shgnt_toyohara = { - color = {248 229 140} - color2 = {255 255 255} + color = {248 229 140} + color2 = {255 255 255} c_shgnt_toyohara = { color = {228 220 138} color2 = {255 255 255} @@ -13620,8 +13688,8 @@ e_shgnt_ezochi = { } } d_shgnt_maoka = { - color = {253 222 165} - color2 = {255 255 255} + color = {253 222 165} + color2 = {255 255 255} c_shgnt_tomarioru = { color = {253 222 165} color2 = {255 255 255} @@ -13652,8 +13720,8 @@ e_shgnt_ezochi = { } } d_shgnt_esutoru = { - color = {244 177 122} - color2 = {255 255 255} + color = {244 177 122} + color2 = {255 255 255} c_shgnt_kushunnai = { color = {244 177 122} color2 = {255 255 255} @@ -13677,8 +13745,8 @@ e_shgnt_ezochi = { } } d_shgnt_shisuka = { - color = {247 220 98} - color2 = {255 255 255} + color = {247 220 98} + color2 = {255 255 255} c_shgnt_mototomari = { color = {247 220 98} color2 = {255 255 255} diff --git a/common/named_colors/shgnt_colors.txt b/common/named_colors/shgnt_colors.txt index fd7501c..7bb2775 100644 --- a/common/named_colors/shgnt_colors.txt +++ b/common/named_colors/shgnt_colors.txt @@ -107,6 +107,7 @@ colors = { shikoku = hsv360 { 283 15 19 } shikon = hsv360 { 302 80 27 } shinku = hsv360 { 345 80 64 } + shiraai = hsv360 { 188 17 91 } # 白藍 shirafuji = hsv360 { 270 10 90 } shiro = hsv360 { 42 2 98 } shishi_iro = hsv360 { 16 38 94 } diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 4f298e4..2d0eea0 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -2306,20 +2306,20 @@ 2320=plains 2321=plains 2322=plains -2323=plains +2323=floodplains 2324=plains 2325=plains -2326=plains -2327=plains -2328=plains +2326=floodplains +2327=floodplains +2328=floodplains 2329=plains -2330=forest -2331=forest -2332=forest -2333=forest -2334=forest +2330=hills +2331=hills +2332=floodplains +2333=floodplains +2334=floodplains 2335=hills -2336=hills +2336=plains 2337=hills 2338=hills 2339=farmlands @@ -2467,17 +2467,17 @@ 2481=forest 2482=forest 2483=forest -2484=forest -2485=forest -2486=forest +2484=plains +2485=plains +2486=floodplains 2487=forest 2488=forest 2489=forest 2490=forest 2491=forest 2492=forest -2493=forest -2494=forest +2493=hills +2494=plains 2495=forest 2496=forest 2497=forest @@ -2488,10 +2488,10 @@ 2502=hills 2503=hills 2504=hills -2505=hills -2506=hills -2507=hills -2508=hills +2505=floodplains +2506=floodplains +2507=floodplains +2508=floodplains 2509=hills 2510=hills 2511=hills @@ -2537,22 +2537,22 @@ 2551=hills 2552=hills 2553=hills -2554=hills +2554=plains 2555=hills -2556=forest -2557=forest +2556=hills +2557=farmlands 2558=forest -2559=forest -2560=forest -2561=forest +2559=hills +2560=hills +2561=hills 2562=forest 2563=forest -2564=forest +2564=hills 2565=forest 2566=forest 2567=forest 2568=forest -2569=forest +2569=hills 2570=hills 2571=hills 2572=hills @@ -2561,7 +2561,7 @@ 2575=hills 2576=hills 2577=hills -2578=hills +2578=plains 2579=hills 2580=hills 2581=hills @@ -2580,7 +2580,7 @@ 2594=hills 2595=hills 2596=hills -2597=forest +2597=hills 2598=forest 2599=forest 2600=forest 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 f5b9e08..d3f7256 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:5201d436a58f1420bf14f9bcc3d2f42924b74f41f3c12eea2766780b8ef3e2ec -size 201171 +oid sha256:6e27cc16321c4fae343c59a06f5a751996a4634af3f4b03e06c0958a2c99e98f +size 201293 diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index d466373..d27bfb5 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -12691,8 +12691,8 @@ } { id=2127 - position={ 4786.000000 0.000000 2602.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + position={ 4784.958496 0.000000 2591.504639 } + rotation={ -0.000000 -0.999966 -0.000000 0.008296 } scale={ 1.000000 1.000000 1.000000 } } { @@ -14221,8 +14221,8 @@ } { id=2386 - position={ 3902.064697 0.000000 2609.195557 } - rotation={ -0.000000 -0.854568 -0.000000 0.519339 } + position={ 3898.786621 0.000000 2608.471436 } + rotation={ -0.000000 0.106548 -0.000000 0.994307 } scale={ 0.761108 0.761108 0.761108 } } { @@ -14527,7 +14527,7 @@ } { id=2437 - position={ 3514.522217 0.000000 2816.352051 } + position={ 3516.502686 0.000000 2818.614746 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 0.669678 0.669678 0.669678 } } @@ -15325,7 +15325,7 @@ } { id=2570 - position={ 3465.887451 0.000000 2297.014893 } + position={ 3463.447510 0.000000 2297.678467 } rotation={ -0.000000 -0.751425 -0.000000 0.659818 } scale={ 0.799170 0.799170 0.799170 } } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index 10ded58..558b058 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -12715,7 +12715,7 @@ } { id=2127 - position={ 4790.000000 0.000000 2593.000000 } + position={ 4787.275879 0.000000 2588.351807 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 0.750000 0.750000 0.750000 } } 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 c6fc504..837ae47 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=16710 + count=16737 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 @@ -11258,6 +11258,7 @@ 5087.629883 0.000000 2401.112793 0.000000 0.027398 0.000000 0.999625 0.195824 0.195824 0.195824 5089.037598 0.000000 2400.292969 0.000000 0.882598 0.000000 0.470129 0.661192 0.661192 0.661192 5058.596191 0.000000 2497.673828 0.000000 0.697752 0.000000 0.716339 0.785646 0.785646 0.785646 +5008.503418 0.000000 2558.394287 0.000000 0.519710 0.000000 -0.854342 1.321664 1.321664 1.321664 5024.663086 0.000000 2554.905273 0.000000 0.135489 0.000000 0.990779 0.069217 0.069217 0.069217 5049.311523 0.000000 2512.161621 0.000000 0.991290 0.000000 0.131698 0.795252 0.795252 0.795252 5039.896484 0.000000 2452.895508 0.000000 0.991443 0.000000 0.130538 0.795555 0.795555 0.795555 @@ -11284,7 +11285,7 @@ 5077.281738 0.000000 2475.094482 0.000000 0.564121 0.000000 -0.825692 0.873727 0.873727 0.873727 5084.464844 0.000000 2503.764648 0.000000 0.957303 0.000000 -0.289086 0.821672 0.821672 0.821672 5051.666016 0.000000 2485.092041 0.000000 0.693038 0.000000 0.720901 0.441421 0.441421 0.441421 -5011.850586 0.000000 2558.401367 0.000000 0.313132 0.000000 0.949709 0.232238 0.232238 0.232238 +5011.850586 0.000000 2558.401367 0.000000 0.313132 0.000000 0.949709 0.162205 0.162205 0.162205 5021.626953 0.000000 2552.897461 0.000000 0.045100 0.000000 0.998982 0.123533 0.123533 0.123533 5076.571289 0.000000 2550.832520 0.000000 0.528990 0.000000 0.848628 0.731185 0.731185 0.731185 5004.944336 0.000000 2527.071533 0.000000 0.997264 0.000000 -0.073926 0.806207 0.806207 0.806207 @@ -11471,7 +11472,7 @@ 4991.813477 0.000000 2554.333496 0.000000 0.712845 0.000000 -0.701322 1.057691 1.057691 1.057691 5067.000000 0.000000 2549.053711 0.000000 0.614872 0.000000 -0.788627 1.137522 1.137522 1.137522 5013.384277 0.000000 2522.872314 0.000000 0.428461 0.000000 0.903560 0.423766 0.423766 0.423766 -5013.861816 0.000000 2559.565430 0.000000 0.938543 0.000000 0.345162 0.627557 0.627557 0.627557 +5013.861816 0.000000 2559.565430 0.000000 0.938543 0.000000 0.345162 0.620519 0.620519 0.620519 5054.645020 0.000000 2547.979004 0.000000 0.999988 0.000000 0.004895 0.797556 0.797556 0.797556 5071.553711 0.000000 2431.837646 0.000000 0.301605 0.000000 0.953433 0.628276 0.628276 0.628276 5055.593750 0.000000 2454.198486 0.000000 0.916253 0.000000 -0.400599 0.964641 0.964641 0.964641 @@ -11662,10 +11663,10 @@ 5015.714355 0.000000 2479.893311 0.000000 0.142638 0.000000 -0.989775 1.196344 1.196344 1.196344 5050.916504 0.000000 2498.850342 0.000000 0.980771 0.000000 -0.195160 0.864729 0.864729 0.864729 5024.763672 0.000000 2438.987549 0.000000 0.507163 0.000000 0.861850 0.474234 0.474234 0.474234 -5025.387207 0.000000 2559.059814 0.000000 0.910481 0.000000 -0.413552 0.975414 0.975414 0.975414 +5025.387207 0.000000 2559.059814 0.000000 0.910481 0.000000 -0.413552 0.980524 0.980524 0.980524 5047.943848 0.000000 2502.430664 0.000000 0.612176 0.000000 0.790721 0.453924 0.453924 0.453924 5079.164551 0.000000 2515.898193 0.000000 0.800820 0.000000 -0.598906 0.966724 0.966724 0.966724 -5017.190430 0.000000 2559.007080 0.000000 0.934803 0.000000 0.355166 0.697024 0.697024 0.697024 +5017.190430 0.000000 2559.007080 0.000000 0.934803 0.000000 0.355166 0.681070 0.681070 0.681070 5040.344727 0.000000 2551.100586 0.000000 0.928550 0.000000 -0.371207 0.970903 0.970903 0.970903 4993.677734 0.000000 2484.077637 0.000000 0.967204 0.000000 0.254001 0.708700 0.708700 0.708700 5071.205078 0.000000 2486.833008 0.000000 0.254391 0.000000 -0.967102 1.343071 1.343071 1.343071 @@ -11940,7 +11941,7 @@ 5072.666992 0.000000 2509.560791 0.000000 0.821385 0.000000 0.570375 0.513910 0.513910 0.513910 5062.687012 0.000000 2468.141357 0.000000 0.979219 0.000000 -0.202804 0.872194 0.872194 0.872194 5052.148438 0.000000 2522.822998 0.000000 0.991361 0.000000 0.131161 0.752448 0.752448 0.752448 -5006.546387 0.000000 2559.335938 0.000000 0.583443 0.000000 0.812154 0.419497 0.419497 0.419497 +5006.546387 0.000000 2559.335938 0.000000 0.583443 0.000000 0.812154 0.392994 0.392994 0.392994 5075.007812 0.000000 2544.127930 0.000000 0.675856 0.000000 0.737034 0.530226 0.530226 0.530226 5033.008789 0.000000 2477.223145 0.000000 0.439981 0.000000 -0.898007 1.212061 1.212061 1.212061 5047.212891 0.000000 2437.908936 0.000000 0.822146 0.000000 0.569277 0.595581 0.595581 0.595581 @@ -12831,31 +12832,38 @@ 4680.532715 0.000000 2643.817627 0.000000 0.677499 0.000000 -0.735524 1.100409 1.100409 1.100409 4678.443848 0.000000 2641.467773 0.000000 0.778862 0.000000 0.627195 0.511593 0.511593 0.511593 4681.445312 0.000000 2645.218506 0.000000 0.506715 0.000000 0.862114 0.349512 0.349512 0.349512 +4989.625488 0.000000 2565.879883 0.000000 0.859931 0.000000 0.510411 0.790371 0.790371 0.790371 +4972.873535 0.000000 2564.212158 0.000000 0.913435 0.000000 -0.406985 1.013471 1.013471 1.013471 +4965.546875 0.000000 2567.532959 0.000000 0.603100 0.000000 -0.797666 1.207586 1.207586 1.207586 4959.915527 0.000000 2562.410645 0.000000 0.544832 0.000000 0.838545 0.734447 0.734447 0.734447 +4989.499023 0.000000 2569.083008 0.000000 0.957352 0.000000 -0.288924 0.825172 0.825172 0.825172 +4979.035156 0.000000 2568.142822 0.000000 0.971372 0.000000 -0.237563 0.823952 0.823952 0.823952 +4978.176270 0.000000 2563.204590 0.000000 0.790522 0.000000 0.612433 0.710481 0.710481 0.710481 4960.428223 0.000000 2565.864990 0.000000 0.969308 0.000000 0.245850 0.759319 0.759319 0.759319 4973.676270 0.000000 2561.914062 0.000000 0.995217 0.000000 0.097690 0.782998 0.782998 0.782998 -4971.778320 0.000000 2566.292480 0.000000 0.841463 0.000000 -0.540315 1.080452 1.080452 1.080452 -4975.183594 0.000000 2564.208984 0.000000 0.638828 0.000000 -0.769349 1.229539 1.229539 1.229539 +4971.778320 0.000000 2566.292480 0.000000 0.841463 0.000000 -0.540315 1.090712 1.090712 1.090712 +4975.183594 0.000000 2564.208984 0.000000 0.638828 0.000000 -0.769349 1.241812 1.241812 1.241812 4985.981445 0.000000 2561.262695 0.000000 0.950429 0.000000 -0.310942 0.952190 0.952190 0.952190 -4964.557129 0.000000 2565.437256 0.000000 0.638606 0.000000 -0.769534 1.140237 1.140237 1.140237 -4967.336914 0.000000 2566.095703 0.000000 0.318609 0.000000 0.947886 0.254772 0.254772 0.254772 +4964.557129 0.000000 2565.437256 0.000000 0.638606 0.000000 -0.769534 1.141991 1.141991 1.141991 +4967.336914 0.000000 2566.095703 0.000000 0.318609 0.000000 0.947886 0.170124 0.170124 0.170124 4990.687012 0.000000 2560.200684 0.000000 0.627546 0.000000 0.778579 0.445316 0.445316 0.445316 4962.401367 0.000000 2566.775146 0.000000 0.794288 0.000000 -0.607541 1.051695 1.051695 1.051695 4967.506836 0.000000 2561.990479 0.000000 0.922754 0.000000 -0.385390 0.875856 0.875856 0.875856 4962.127930 0.000000 2562.439453 0.000000 0.078239 0.000000 -0.996935 1.437898 1.437898 1.437898 4971.715820 0.000000 2561.446777 0.000000 0.941458 0.000000 0.337131 0.658522 0.658522 0.658522 -4977.405273 0.000000 2560.581787 0.000000 0.201353 0.000000 0.979519 0.264462 0.264462 0.264462 -4967.867188 0.000000 2567.968506 0.000000 0.925059 0.000000 0.379823 0.629589 0.629589 0.629589 +4977.405273 0.000000 2560.581787 0.000000 0.201353 0.000000 0.979519 0.253533 0.253533 0.253533 +4967.867188 0.000000 2567.968506 0.000000 0.925059 0.000000 0.379823 0.603132 0.603132 0.603132 4968.838867 0.000000 2560.290527 0.000000 0.973640 0.000000 0.228091 0.695212 0.695212 0.695212 -4970.962891 0.000000 2563.607666 0.000000 0.995231 0.000000 -0.097548 0.826929 0.826929 0.826929 +4970.962891 0.000000 2563.607666 0.000000 0.995231 0.000000 -0.097548 0.827319 0.827319 0.827319 4988.207031 0.000000 2561.844727 0.000000 0.634308 0.000000 0.773080 0.487608 0.487608 0.487608 -4988.801758 0.000000 2563.763672 0.000000 0.973682 0.000000 -0.227912 0.880365 0.880365 0.880365 +4988.801758 0.000000 2563.763672 0.000000 0.973682 0.000000 -0.227912 0.880824 0.880824 0.880824 +4990.644531 0.000000 2567.501953 0.000000 0.624052 0.000000 0.781383 0.606542 0.606542 0.606542 4970.612793 0.000000 2560.020508 0.000000 0.576393 0.000000 0.817173 0.406471 0.406471 0.406471 4984.315918 0.000000 2561.554443 0.000000 0.378339 0.000000 0.925667 0.230680 0.230680 0.230680 4964.042969 0.000000 2563.853027 0.000000 0.783281 0.000000 -0.621668 1.067977 1.067977 1.067977 4960.792969 0.000000 2560.889160 0.000000 0.527193 0.000000 -0.849745 1.175217 1.175217 1.175217 -4978.854980 0.000000 2561.730957 0.000000 0.913276 0.000000 0.407342 0.608115 0.608115 0.608115 -4977.937500 0.000000 2564.856445 0.000000 0.712787 0.000000 -0.701380 1.008037 1.008037 1.008037 +4978.854980 0.000000 2561.730957 0.000000 0.913276 0.000000 0.407342 0.596384 0.596384 0.596384 +4977.937500 0.000000 2564.856445 0.000000 0.712787 0.000000 -0.701380 1.057718 1.057718 1.057718 4985.376465 0.000000 2562.783691 0.000000 0.595899 0.000000 -0.803059 1.060715 1.060715 1.060715 4963.971191 0.000000 2567.236572 0.000000 0.232996 0.000000 -0.972478 1.314845 1.314845 1.314845 4961.049805 0.000000 2563.606445 0.000000 0.348642 0.000000 0.937256 0.292967 0.292967 0.292967 @@ -13502,51 +13510,70 @@ 4985.425781 0.000000 3025.733154 0.000000 0.995949 0.000000 0.089919 0.777161 0.777161 0.777161 4970.634277 0.000000 3004.175781 0.000000 0.999955 0.000000 0.009436 0.797305 0.797305 0.797305 4943.462891 0.000000 2962.658691 0.000000 0.914316 0.000000 0.405002 0.685905 0.685905 0.685905 -5029.512695 0.000000 2561.065430 0.000000 0.969224 0.000000 -0.246179 0.923203 0.923203 0.923203 -5010.781250 0.000000 2559.689941 0.000000 0.455036 0.000000 -0.890473 1.297978 1.297978 1.297978 +4996.272949 0.000000 2570.173584 0.000000 0.965856 0.000000 -0.259081 0.802094 0.802094 0.802094 +5015.915527 0.000000 2565.749268 0.000000 0.895793 0.000000 -0.444471 0.815638 0.815638 0.815638 +5010.110352 0.000000 2571.800781 0.000000 0.978010 0.000000 -0.208559 0.810491 0.810491 0.810491 +5022.986816 0.000000 2561.498535 0.000000 0.957954 0.000000 -0.286923 0.931356 0.931356 0.931356 +5029.512695 0.000000 2561.065430 0.000000 0.969224 0.000000 -0.246179 0.925190 0.925190 0.925190 +5010.781250 0.000000 2559.689941 0.000000 0.455036 0.000000 -0.890473 1.359402 1.359402 1.359402 5052.519531 0.000000 2562.984619 0.000000 0.623751 0.000000 -0.781623 0.880642 0.880642 0.880642 5050.817383 0.000000 2565.460205 0.000000 0.625674 0.000000 0.780084 0.437212 0.437212 0.437212 5077.843750 0.000000 2560.990723 0.000000 0.877722 0.000000 -0.479171 0.996614 0.996614 0.996614 5078.909668 0.000000 2565.703613 0.000000 0.288717 0.000000 0.957414 0.631549 0.631549 0.631549 5024.461426 0.000000 2573.491211 0.000000 0.762000 0.000000 -0.647577 0.881598 0.881598 0.881598 -4991.843750 0.000000 2562.968018 0.000000 0.866957 0.000000 -0.498382 0.865647 0.865647 0.865647 -5025.194824 0.000000 2559.776367 0.000000 0.296450 0.000000 -0.955048 1.322445 1.322445 1.322445 +4991.843750 0.000000 2562.968018 0.000000 0.866957 0.000000 -0.498382 0.871900 0.871900 0.871900 +5025.194824 0.000000 2559.776367 0.000000 0.296450 0.000000 -0.955048 1.337662 1.337662 1.337662 5028.241699 0.000000 2569.593994 0.000000 0.951460 0.000000 -0.307772 0.920594 0.920594 0.920594 5033.074219 0.000000 2562.587646 0.000000 0.535206 0.000000 0.844722 0.378044 0.378044 0.378044 +5021.958496 0.000000 2563.957275 0.000000 0.534817 0.000000 -0.844968 0.916593 0.916593 0.916593 5038.416504 0.000000 2559.926270 0.000000 0.417070 0.000000 0.908874 0.396793 0.396793 0.396793 5046.471680 0.000000 2562.607422 0.000000 0.834582 0.000000 0.550884 0.705616 0.705616 0.705616 +5020.890625 0.000000 2560.359619 0.000000 0.282895 0.000000 0.959151 0.628184 0.628184 0.628184 5081.973633 0.000000 2561.262695 0.000000 0.108033 0.000000 0.994147 0.309261 0.309261 0.309261 -5027.569336 0.000000 2559.768311 0.000000 0.780934 0.000000 0.624613 0.518391 0.518391 0.518391 +5010.393066 0.000000 2565.925537 0.000000 0.351781 0.000000 -0.936082 1.017737 1.017737 1.017737 +5027.569336 0.000000 2559.768311 0.000000 0.780934 0.000000 0.624613 0.513002 0.513002 0.513002 5032.862793 0.000000 2564.945312 0.000000 0.349853 0.000000 -0.936805 1.001143 1.001143 1.001143 5052.448242 0.000000 2567.057373 0.000000 0.998501 0.000000 0.054735 0.782391 0.782391 0.782391 +4998.471680 0.000000 2562.292725 0.000000 0.238379 0.000000 -0.971172 1.012522 1.012522 1.012522 5076.292480 0.000000 2562.495605 0.000000 0.029934 0.000000 -0.999552 1.387795 1.387795 1.387795 5063.499023 0.000000 2561.990479 0.000000 0.626276 0.000000 -0.779602 0.941062 0.941062 0.941062 -5018.142090 0.000000 2559.715820 0.000000 0.466585 0.000000 0.884476 0.472671 0.472671 0.472671 +5006.599609 0.000000 2567.430908 0.000000 0.943857 0.000000 0.330355 0.749568 0.749568 0.749568 +5018.142090 0.000000 2559.715820 0.000000 0.466585 0.000000 0.884476 0.431484 0.431484 0.431484 5076.912598 0.000000 2566.647705 0.000000 0.994929 0.000000 0.100581 0.779073 0.779073 0.779073 -4996.385254 0.000000 2563.163330 0.000000 0.281200 0.000000 0.959649 0.414807 0.414807 0.414807 +4996.385254 0.000000 2563.163330 0.000000 0.281200 0.000000 0.959649 0.350608 0.350608 0.350608 +5011.636719 0.000000 2563.347168 0.000000 0.971474 0.000000 -0.237148 0.892292 0.892292 0.892292 +4996.098633 0.000000 2565.146729 0.000000 0.831973 0.000000 0.554817 0.693106 0.693106 0.693106 5073.397461 0.000000 2560.581787 0.000000 0.207978 0.000000 -0.978133 1.107226 1.107226 1.107226 5048.184082 0.000000 2561.635986 0.000000 0.928325 0.000000 0.371770 0.653931 0.653931 0.653931 5060.463379 0.000000 2559.989502 0.000000 0.988598 0.000000 0.150577 0.748679 0.748679 0.748679 5031.325684 0.000000 2561.817627 0.000000 0.411673 0.000000 -0.911332 1.310636 1.310636 1.310636 5034.238281 0.000000 2559.754639 0.000000 0.395667 0.000000 0.918394 0.307144 0.307144 0.307144 +5008.518066 0.000000 2565.488770 0.000000 0.791464 0.000000 0.611215 0.572786 0.572786 0.572786 5040.357910 0.000000 2560.201660 0.000000 0.999458 0.000000 0.032933 0.790658 0.790658 0.790658 +5006.416016 0.000000 2571.198242 0.000000 0.958812 0.000000 0.284041 0.727523 0.727523 0.727523 4998.406250 0.000000 2559.712646 0.000000 0.981765 0.000000 -0.190099 0.843930 0.843930 0.843930 -5013.190430 0.000000 2559.775391 0.000000 0.645612 0.000000 0.763666 0.374792 0.374792 0.374792 +5013.190430 0.000000 2559.775391 0.000000 0.645612 0.000000 0.763666 0.357436 0.357436 0.357436 5024.763672 0.000000 2566.971924 0.000000 0.495389 0.000000 0.868671 0.518316 0.518316 0.518316 5027.949219 0.000000 2567.735352 0.000000 0.748573 0.000000 -0.663052 0.986763 0.986763 0.986763 5077.798340 0.000000 2563.599854 0.000000 0.930385 0.000000 0.366584 0.656820 0.656820 0.656820 +5014.670410 0.000000 2561.130127 0.000000 0.973329 0.000000 -0.229412 0.849005 0.849005 0.849005 5055.561523 0.000000 2564.218262 0.000000 0.835190 0.000000 -0.549962 0.972128 0.972128 0.972128 5024.344238 0.000000 2571.585693 0.000000 0.450065 0.000000 -0.892996 1.216720 1.216720 1.216720 -5024.849609 0.000000 2561.738037 0.000000 0.773410 0.000000 0.633906 0.484603 0.484603 0.484603 +4999.181641 0.000000 2565.934326 0.000000 0.999917 0.000000 -0.012863 0.803263 0.803263 0.803263 +5024.849609 0.000000 2561.738037 0.000000 0.773410 0.000000 0.633906 0.450321 0.450321 0.450321 5035.290039 0.000000 2562.368896 0.000000 0.699079 0.000000 0.715044 0.597921 0.597921 0.597921 -5026.087891 0.000000 2564.294189 0.000000 0.584180 0.000000 0.811624 0.523879 0.523879 0.523879 -5029.388672 0.000000 2562.806885 0.000000 0.431269 0.000000 0.902223 0.346169 0.346169 0.346169 +5026.087891 0.000000 2564.294189 0.000000 0.584180 0.000000 0.811624 0.510640 0.510640 0.510640 +5009.947754 0.000000 2570.076416 0.000000 0.539888 0.000000 0.841737 0.572203 0.572203 0.572203 +5029.388672 0.000000 2562.806885 0.000000 0.431269 0.000000 0.902223 0.332689 0.332689 0.332689 5031.707031 0.000000 2567.698486 0.000000 0.764837 0.000000 0.644224 0.538559 0.538559 0.538559 5080.308105 0.000000 2561.554443 0.000000 0.165436 0.000000 -0.986221 1.271293 1.271293 1.271293 +5001.810547 0.000000 2564.073975 0.000000 0.963276 0.000000 -0.268513 0.872212 0.872212 0.872212 +4999.809570 0.000000 2564.363037 0.000000 0.501698 0.000000 -0.865043 1.065123 1.065123 1.065123 5034.403320 0.000000 2565.866211 0.000000 0.840977 0.000000 -0.541070 0.970134 0.970134 0.970134 5051.867188 0.000000 2561.325684 0.000000 0.928490 0.000000 0.371358 0.700454 0.700454 0.700454 5039.493164 0.000000 2563.718018 0.000000 0.609255 0.000000 0.792975 0.558595 0.558595 0.558595 5074.847168 0.000000 2561.730957 0.000000 0.914930 0.000000 0.403613 0.688810 0.688810 0.688810 +5011.252930 0.000000 2561.260010 0.000000 0.118822 0.000000 -0.992916 1.316089 1.316089 1.316089 5073.929688 0.000000 2564.856445 0.000000 0.037634 0.000000 0.999292 0.325379 0.325379 0.325379 5052.352051 0.000000 2564.601074 0.000000 0.713667 0.000000 -0.700485 1.034052 1.034052 1.034052 5174.931641 0.000000 2587.247803 0.000000 0.512825 0.000000 0.858493 0.274242 0.274242 0.274242 diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index f57f33b..5fc6ebb 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -12715,7 +12715,7 @@ } { id=2127 - position={ 4787.000000 0.000000 2596.000000 } + position={ 4782.671387 0.000000 2607.280029 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -14245,7 +14245,7 @@ } { id=2386 - position={ 3897.145020 0.000000 2607.363770 } + position={ 3898.144531 0.000000 2602.891846 } rotation={ -0.000000 0.707152 -0.000000 0.707062 } 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 505599a..4990a0b 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -12703,8 +12703,8 @@ } { id=2127 - position={ 4786.000000 0.000000 2595.000000 } - rotation={ 0.000000 1.000000 0.000000 -0.000000 } + position={ 4784.836914 0.000000 2599.180420 } + rotation={ -0.000000 0.008296 -0.000000 0.999966 } scale={ 1.000000 1.000000 1.000000 } } { @@ -14233,8 +14233,8 @@ } { id=2386 - position={ 3899.973145 0.000000 2603.912842 } - rotation={ -0.000000 -0.985859 -0.000000 -0.167578 } + position={ 3904.316406 0.000000 2610.760498 } + rotation={ -0.000000 -0.570980 -0.000000 0.820964 } scale={ 0.761108 0.761108 0.761108 } } { @@ -14539,7 +14539,7 @@ } { id=2437 - position={ 3510.648682 0.000000 2811.832764 } + position={ 3512.629150 0.000000 2814.095459 } rotation={ 0.000000 0.937885 0.000000 0.346946 } scale={ 0.669678 0.669678 0.669678 } } @@ -15337,7 +15337,7 @@ } { id=2570 - position={ 3465.583984 0.000000 2290.335938 } + position={ 3463.144043 0.000000 2290.999512 } rotation={ -0.000000 -0.999997 -0.000000 -0.002644 } scale={ 0.799170 0.799170 0.799170 } } diff --git a/gfx/map/terrain/beach_02_mask.png b/gfx/map/terrain/beach_02_mask.png index 2a7f7c5..5088aa8 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:92fae943174fce235554f32721a36431c11c0f14e030fe82c2f02b22d7330b85 -size 7828447 +oid sha256:7bc43b2119545aa2f30c00630f345c8623b886d53fddf0abfb4689083b5524b1 +size 7828714 diff --git a/gfx/map/terrain/detail_index.tga b/gfx/map/terrain/detail_index.tga index dcccc7f..e2fa155 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:89d538b02e5bbceb4cca007fc1ad564271e37df2beb750cc6bb419d62b7c3021 +oid sha256:484101ea042f2a1d643fdb435fc165a35d6777da01dcbc559540bb3d4c827cb2 size 134217772 diff --git a/gfx/map/terrain/detail_intensity.tga b/gfx/map/terrain/detail_intensity.tga index 01f4bb3..e76e149 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:d311e5f76e2b923b7650d941163c20a69d72ef711242cbc5063b1b370952eaa3 +oid sha256:10d6953d250603be8adadc73399b02c1c8b4e4fde7ed80c664bdac770bde78b2 size 134217772 diff --git a/gfx/map/terrain/farmland_01_mask.png b/gfx/map/terrain/farmland_01_mask.png index 6e6a17e..8577a2d 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:35ef0f5d9fcd55fa62634d1c58b67c1701f3fbc7af6444036e8c45b70c37b5a4 -size 4847321 +oid sha256:62ee906913340dbe9045024aa7c24e5b7f28c4d6cec9c2314789c514ed6e29fa +size 4847288 diff --git a/gfx/map/terrain/hills_01_mask.png b/gfx/map/terrain/hills_01_mask.png index 77619da..86ad51d 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:760974fa2e9ba9aea2e47f0363669826cfde86abdaba777900e3ccfa419b34e1 -size 4833730 +oid sha256:e9b3f0ad8c63dcef3bfbbc9d23925d1f798e1243350db9608ea8478223e9eabf +size 4833869 diff --git a/gfx/map/terrain/india_farmlands_mask.png b/gfx/map/terrain/india_farmlands_mask.png index 0c82f34..5bfd928 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:1573db61ddfa7115e18754ce36fa88a3aa5c20bd645796784d93d3306a125a93 -size 2676272 +oid sha256:08dc6542de267ce14a6116beaeda2ccb37c4a17aae976a753b640c05783b8a6e +size 2676331 diff --git a/gfx/map/terrain/plains_01_mask.png b/gfx/map/terrain/plains_01_mask.png index a79f711..3b1f59e 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:c2c38fd13db7e6ff597dd0cd7bf6af18956328edcac33b9ac23f0a54853f3114 -size 4645785 +oid sha256:1f377eb254f6ad9ef4c39000e489ab841033bed0f415a462eb5390cc823b66ee +size 4646105 diff --git a/history/characters/12C-05_northern_kanto_characters.txt b/history/characters/12C-05_northern_kanto_characters.txt index dc485d3..cd8cf47 100644 --- a/history/characters/12C-05_northern_kanto_characters.txt +++ b/history/characters/12C-05_northern_kanto_characters.txt @@ -1951,7 +1951,7 @@ } } 12122000={ - name=character_name_12122000 # Tadayoshi + name=character_name_12122000 # Tadayoshi, 忠義 dynasty=10000108 # Satake father=10120130 # Satake Masayoshi mother=12030014 # Fujiwara Kiyoko @@ -1960,14 +1960,18 @@ 1116.1.1={ birth=yes } + 1132.01.01={ + give_nickname="nick_taro" # 「太郎」（『デジタル版 日本人名大辞典+Plus』）、（『続羣書類従』第五輯上「佐竹系図」） + } 1180.11.1={ death={ death_reason=death_murder + killer=10120075 # Minamoto Yoritomo } } } 12122001={ - name=character_name_12122001 # Yoshihiro + name=character_name_12122001 # Yoshihiro, 義弘 dynasty=10000108 # Satake father=10120130 # Satake Masayoshi mother=12030014 # Fujiwara Kiyoko @@ -1976,12 +1980,15 @@ 1117.1.1={ birth=yes } + 1137.01.01={ + give_nickname="nick_kurodo" #　「蔵人」（『続羣書類従』第五輯上「佐竹系図」） + } 1153.1.1={ death=yes } } 12122002={ - name=character_name_12122002 # Takayoshi + name=character_name_12122002 # Takayoshi, 隆義 dynasty=10000108 # Satake father=10120130 # Satake Masayoshi mother=12030014 # Fujiwara Kiyoko @@ -1992,6 +1999,9 @@ 1118.1.1={ birth=yes } + 1134.01.01={ + give_nickname="nick_shiro" # 「四郎」（『続羣書類従』第五輯上「佐竹系図」） + } 1150.1.1={ add_spouse=12125150 # Tomura [Fujiwara] Yoshimichi } @@ -2006,7 +2016,7 @@ } } 12122003={ - name=character_name_12122003 # Yoshimune + name=character_name_12122003 # Yoshimune, 義宗 dynasty=10000108 # Satake father=10120130 # Satake Masayoshi mother=12030014 # Fujiwara Kiyoko @@ -2015,12 +2025,15 @@ 1119.1.1={ birth=yes } + 1135.01.01={ + give_nickname="nick_jio" # 「次郎」（『続羣書類従』第五輯上「佐竹系図」） + } 1169.1.1={ death=yes } } 12122004={ - name=character_name_12122004 # Chikayoshi + name=character_name_12122004 # Chikayoshi, 親義、岡田親義 dynasty=10000108 # Satake father=10120130 # Satake Masayoshi mother=12030014 # Fujiwara Kiyoko @@ -2029,15 +2042,23 @@ 1120.1.1={ birth=yes } + # 「信州住」（『続羣書類従』第五輯上「佐竹系図」） + 1140.01.01={ + dynasty_house="house_shgnt_satake_okada" + give_nickname="nick_kaja" #　「冠者」（『続羣書類従』第五輯上「佐竹系図」） + } 1180.6.15={ employer=10120084 # Minamoto Yoshinaka } 1183.6.2={ - death=yes + death={ + death_reason=death_battle # 「寿永二年五月北国砥並山合戦」 + killer=10110049 # 三河守平知度（『続羣書類従』第五輯上「佐竹系図」） + } } } 12122005={ - name=character_name_12122005 # Yoshisue + name=character_name_12122005 # Yoshisue, 義季 dynasty=10000108 # Satake father=10120130 # Satake Masayoshi mother=12030014 # Fujiwara Kiyoko @@ -2046,12 +2067,15 @@ 1121.1.1={ birth=yes } + 1137.01.01={ + give_nickname="nick_goro" # 「佐竹五郎蔵人」（『続羣書類従』第五輯上「佐竹系図」） + } 1171.1.1={ death=yes } } 12122006={ - name=character_name_12122006 # Masanari + name=character_name_12122006 # Masanari, 昌成 dynasty=10000108 # Satake father=10120130 # Satake Masayoshi mother=12030014 # Fujiwara Kiyoko @@ -2060,6 +2084,9 @@ 1125.1.1={ birth=yes } + 1150.01.01={ + give_nickname="nick_kaja" # 「佐竹冠者」（『続羣書類従』第五輯上「佐竹系図」） + } 1175.1.1={ death=yes } @@ -2098,7 +2125,8 @@ } 12122015={ name=character_name_12122015 # Shigeyoshi - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_okada" father=12122004 # Satake Chikayoshi religion="shinto" culture="northern_kanto" @@ -2166,7 +2194,7 @@ } } 12122050={ - name=character_name_12122050 # Hideyoshi + name=character_name_12122050 # Hideyoshi, 秀義 dynasty=10000108 # Satake father=12122002 # Satake Takayoshi mother=12125150 # Tomura [Fujiwara] Yoshimichi @@ -2192,7 +2220,7 @@ } } 12122051={ - name=character_name_12122051 # Yoshishige + name=character_name_12122051 # Yoshishige, 義茂 dynasty=10000108 # Satake father=12122002 # Satake Takayoshi religion="shinto" @@ -2200,6 +2228,12 @@ 1152.1.1={ birth=yes } + 1168.01.01={ + give_nickname="nick_rokuro" # 「佐竹六郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1175.01.01={ + dynasty_house="house_shgnt_satake_minamisakaide" + } 1202.1.1={ death=yes } @@ -2213,6 +2247,12 @@ 1154.1.1={ birth=yes } + 1170.01.01={ + give_nickname="nick_hachiro" # 「佐竹八郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1180.01.01={ + dynasty_house="house_shgnt_satake_kitasakaide" + } 1204.1.1={ death=yes } @@ -2226,13 +2266,17 @@ 1157.1.1={ birth=yes } + 1177.01.01={ + dynasty_house="house_shgnt_satake_inamoto" + } 1207.1.1={ death=yes } } 12122060={ name=character_name_12122060 # Yoshiyuki - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_minamisakaide" father=12122051 # Satake Yoshishige religion="shinto" culture="northern_kanto" @@ -2246,7 +2290,8 @@ } 12122061={ name=character_name_12122061 # Yositoshi - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_minamisakaide" father=12122060 # Satake Yoshiyuki religion="shinto" culture="northern_kanto" @@ -2259,7 +2304,8 @@ } 12122065={ name=character_name_12122065 # Yoshisuke - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kitasakaide" father=12122052 # Satake Sueyoshi religion="shinto" culture="northern_kanto" @@ -2273,7 +2319,8 @@ } 12122066={ name=character_name_12122066 # Kimikiyo - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kitasakaide" father=12122052 # Satake Sueyoshi religion="shinto" culture="northern_kanto" @@ -2286,7 +2333,8 @@ } 12122067={ name=character_name_12122067 # Tsunayoshi - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kitasakaide" father=12122066 # Satake Kimikiyo religion="shinto" culture="northern_kanto" @@ -2299,7 +2347,8 @@ } 12122068={ name=character_name_12122068 # Akiyoshi - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kitasakaide" father=12122065 # Satake Yoshisuke religion="shinto" culture="northern_kanto" @@ -2312,7 +2361,8 @@ } 12122069={ name=character_name_12122069 # Yoshizane - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kitasakaide" father=12122068 # Satake Akiyoshi religion="shinto" culture="northern_kanto" @@ -2325,7 +2375,8 @@ } 12122070={ name=character_name_12122070 # Yoshinori - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kitasakaide" father=12122068 # Satake Akiyoshi religion="shinto" culture="northern_kanto" @@ -2338,7 +2389,8 @@ } 12122071={ name=character_name_12122071 # Yoshiyasu - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kitasakaide" father=12122068 # Satake Akiyoshi religion="shinto" culture="northern_kanto" @@ -2351,7 +2403,8 @@ } 12122072={ name=character_name_12122072 # Yoshinaga - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kitasakaide" father=12122070 # Satake Yoshinori religion="shinto" culture="northern_kanto" @@ -2363,7 +2416,7 @@ } } 12122080={ - name=character_name_12122080 # Yoshishige + name=character_name_12122080 # Yoshishige, 義重 dynasty=10000108 # Satake father=12122050 # Satake Hideyoshi religion="shinto" @@ -2371,12 +2424,15 @@ 1186.1.1={ birth=yes } + 1226.1.17={ + give_nickname="nick_hitachi_no_suke" # 「常陸介」（『続羣書類従』第五輯上「佐竹系図」） + } 1252.4.5={ death=yes } } 12122081={ - name=character_name_12122081 # Hideshige + name=character_name_12122081 # Hideshige, 秀繁 dynasty=10000108 # Satake father=12122050 # Satake Hideyoshi religion="shinto" @@ -2384,27 +2440,34 @@ 1190.1.1={ birth=yes } + 1210.01.01={ + give_nickname="nick_saemon_no_jo" # 「左衛門尉」（『続羣書類従』第五輯上「佐竹系図」） + } 1221.6.1={ death={ - death_reason=death_battle + death_reason=death_battle #　「承久ノ乱宇治ニ戦死」（『続羣書類従』第五輯上「佐竹系図」） } } } 12122082={ - name=character_name_12122082 # Nagayoshi + name=character_name_12122082 # Nagayoshi, 長義 dynasty=10000108 # Satake father=12122080 # Satake Shigeyoshi + #mother= # 「平忠遠女」（『続羣書類従』第五輯上「佐竹系図」） religion="shinto" culture="northern_kanto" 1207.1.1={ birth=yes } - 1272.1.1={ + 1223.01.01={ + give_nickname="nick_jio" # 「次郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1272.08.21={ # 「文永9(1272)年七月二十六日六十七卒」（『続羣書類従』第五輯上「佐竹系図」） death=yes } } 12122083={ - name=character_name_12122083 # Yoshitaka + name=character_name_12122083 # Yoshitaka,義高、 『続羣書類従』第五輯上「佐竹系図」では「義隆」、岡田四郎 dynasty=10000108 # Satake father=12122080 # Satake Shigeyoshi religion="shinto" @@ -2412,12 +2475,16 @@ 1211.1.1={ birth=yes } + 1227.01.01={ + give_nickname="nick_shiro" # 「四郎」（『続羣書類従』第五輯上「佐竹系図」） + dynasty_house="house_shgnt_satake_okada" + } 1261.1.1={ death=yes } } 12122084={ - name=character_name_12122084 # Yoshinao + name=character_name_12122084 # Yoshinao, 義直、童名「伊豆王丸」（『続羣書類従』第五輯上「佐竹系図」） dynasty=10000108 # Satake father=12122080 # Satake Shigeyoshi religion="shinto" @@ -2425,12 +2492,18 @@ 1214.1.1={ birth=yes } + 1230.01.01={ + give_nickname="nick_Yajio" # 「弥次郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1244.01.01={ + dynasty_house="house_shgnt_satake_nukata" + } 1264.1.1={ death=yes } } 12122085={ - name=character_name_12122085 # Yoshizumi + name=character_name_12122085 # Yoshizumi,義澄 dynasty=10000108 # Satake father=12122080 # Satake Shigeyoshi religion="shinto" @@ -2443,7 +2516,7 @@ } } 12122086={ - name=character_name_12122086 # Yoshitsuna + name=character_name_12122086 # Yoshitsuna,義綱 dynasty=10000108 # Satake father=12122080 # Satake Shigeyoshi religion="shinto" @@ -2456,7 +2529,7 @@ } } 12122087={ - name=character_name_12122087 # Shigeuji + name=character_name_12122087 # Shigeuji,重氏 dynasty=10000108 # Satake father=12122080 # Satake Shigeyoshi religion="shinto" @@ -2469,7 +2542,7 @@ } } 12122090={ - name=character_name_12122090 # Yoshitane + name=character_name_12122090 # Yoshitane,義胤 dynasty=10000108 # Satake father=12122082 # Satake Nagayoshi religion="shinto" @@ -2477,19 +2550,30 @@ 1227.1.1={ birth=yes } + 1243.01.01={ + give_nickname="nick_Magojuro" # 「孫次郎」（『続羣書類従』第五輯上「佐竹系図」） + } + # TODO: 「奥州岩崎（平氏也）女娶ル」（『続羣書類従』第五輯上「佐竹系図」） + 1272.08.21={ + give_nickname="nick_hitachi_no_suke" # 「常陸介」（『続羣書類従』第五輯上「佐竹系図」） + } 1278.4.30={ death=yes } } 12122100={ - name=character_name_12122100 # Yukiyoshi + name=character_name_12122100 # Yukiyoshi,行義 dynasty=10000108 # Satake father=12122090 # Satake Yoshitane + #mother= # 岩崎女 religion="shinto" culture="northern_kanto" 1263.1.1={ birth=yes } + 1279.01.01={ + give_nickname="nick_Hikojio" # 「彦次郎左衛門尉別当」（『続羣書類従』第五輯上「佐竹系図」） + } 1286.1.1={ add_spouse=12220244 # Nikaido Yoritsuna } @@ -2511,7 +2595,7 @@ } } 12122103={ - name=character_name_12122103 # Yoshihiro + name=character_name_12122103 # Yoshihiro, 義熈 dynasty=10000108 # Satake father=12122090 # Satake Yoshitane religion="shinto" @@ -2519,12 +2603,15 @@ 1269.1.1={ birth=yes } + 1299.01.01={ + dynasty_house="house_shgnt_satake_toyoma" + } 1319.1.1={ death=yes } } 12122104={ - name=character_name_12122104 # Kageyoshi + name=character_name_12122104 # Kageyoshi,景義 dynasty=10000108 # Satake father=12122090 # Satake Yoshitane religion="shinto" @@ -2532,26 +2619,35 @@ 1271.1.1={ birth=yes } + 1287.01.01={ + give_nickname="nick_goro" # 「高部五郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1301.01.01={ + dynasty_house="house_shgnt_satake_takabe" + } 1321.1.1={ death=yes } } 12122110={ - name=character_name_12122110 # Sadayoshi + name=character_name_12122110 # Sadayoshi,貞義 dynasty=10000108 # Satake father=12122100 # Satake Yukiyoshi - mother=12220244 # Nikaido Yoritsuna + mother=12220244 # Nikaido Yoritsuna, 「二階堂頼綱女」（『続羣書類従』第五輯上「佐竹系図」） religion="shinto" culture="northern_kanto" 1287.1.1={ birth=yes } + 1303.01.01={ + give_nickname="nick_jio" # 「次郎左衛門尉別当遠江権守上総介」（『続羣書類従』第五輯上「佐竹系図」） + } 1352.10.18={ death=yes } } 12122111={ - name=character_name_12122111 # Yoshitsuna + name=character_name_12122111 # Yoshitsuna, 義綱 dynasty=10000108 # Satake father=12122100 # Satake Yukiyoshi mother=12220244 # Nikaido Yoritsuna @@ -2560,12 +2656,18 @@ 1290.1.1={ birth=yes } + 1306.01.01={ + give_nickname="nick_saburo" # 「長倉三郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1320.01.01={ + dynasty_house="house_shgnt_satake_nagakura" + } 1340.1.1={ death=yes } } 12122112={ - name=character_name_12122112 # Yoshitaka + name=character_name_12122112 # Yoshitaka, 義高 dynasty=10000108 # Satake father=12122100 # Satake Yukiyoshi mother=12220244 # Nikaido Yoritsuna @@ -2574,12 +2676,18 @@ 1291.1.1={ birth=yes } + 1307.01.01={ + give_nickname="nick_Yojio" # 「大内與次郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1321.01.01={ + dynasty_house="house_shgnt_satake_ouchi" + } 1341.1.1={ death=yes } } 12122113={ - name=character_name_12122113 # Kageyoshi + name=character_name_12122113 # Kageyoshi, 景義 dynasty=10000108 # Satake father=12122100 # Satake Yukiyoshi mother=12220244 # Nikaido Yoritsuna @@ -2588,25 +2696,35 @@ 1293.1.1={ birth=yes } + 1309.01.01={ + give_nickname="nick_shiro" # 「馬淵四郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1323.01.01={ + dynasty_house="house_shgnt_satake_mabuchi" + } 1343.1.1={ death=yes } } 12122120={ - name=character_name_12122120 # Yoshiatsu + name=character_name_12122120 # Yoshiatsu, 義篤 dynasty=10000108 # Satake father=12122110 # Satake Sadayoshi + #mother= # TODO: 「海上六郎左衛門平胤泰娘」（『続羣書類従』第五輯上「佐竹系図」） religion="shinto" culture="northern_kanto" 1311.1.1={ birth=yes } + 1327.01.01={ + give_nickname="nick_Kotaro" # 「小太郎刑部大輔左馬権頭左兵衛督」（『続羣書類従』第五輯上「佐竹系図」） + } 1362.2.7={ death=yes } } 12122121={ - name=character_name_12122121 # Moroyoshi + name=character_name_12122121 # Moroyoshi, 師義 dynasty=10000108 # Satake father=12122110 # Satake Sadayoshi religion="shinto" @@ -2614,32 +2732,46 @@ 1330.1.1={ birth=yes } + 1346.01.01={ + give_nickname="nick_shichiro" # 「七郎刑部大輔」（『続羣書類従』第五輯上「佐竹系図」） + } + 1352.10.18={ + dynasty_house="house_shgnt_satake_yamairi" + } 1397.1.1={ death=yes } } 12122130={ - name=character_name_12122130 # Yoshinobu + name=character_name_12122130 # Yoshinobu, 義宣、始名「義香」（『続羣書類従』第五輯上「佐竹系図」） dynasty=10000108 # Satake father=12122120 # Satake Yoshiatsu + #mother= # TODO: 「小田左衛門尉知貞女」（『続羣書類従』第五輯上「佐竹系図」） religion="shinto" culture="northern_kanto" 1346.1.1={ birth=yes } + 1362.01.01={ + give_nickname="nick_the_sama_no_suke" # 「左馬介右馬頭左近大夫将監伊予守」（『続羣書類従』第五輯上「佐竹系図」） + } 1389.8.5={ death=yes } } 12122200={ name=character_name_12122200 # Tomoyoshi, 与義 - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122121 # Satake Moroyoshi、佐竹師義 religion="shinto" culture="northern_kanto" 1360.1.1={ birth=yes } + 1390.01.01={ + give_nickname="nick_the_kazusa_no_suke" # 「上総介」（『続羣書類従』第五輯上「佐竹系図」） + } 1422.11.27={ death={ death_reason=death_suicide # 自害 @@ -2648,16 +2780,21 @@ } } 12122201={ - name=character_name_12122201 # Yoriyoshi - dynasty=10000108 # Satake + name=character_name_12122201 # Yoriyoshi,自義 + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122121 # Satake Moroyoshi religion="shinto" culture="northern_kanto" 1362.1.1={ birth=yes } + 1378.01.01={ + give_nickname="nick_kuro" # 「小田野九郎」（『続羣書類従』第五輯上「佐竹系図」） + } 1407.10.22={ add_pressed_claim=d_shgnt_hitachi + give_nickname="nick_the_owari_no_kami" # 「尾張守」（『続羣書類従』第五輯上「佐竹系図」） } 1420.1.1={ death=yes @@ -2665,7 +2802,8 @@ } 12122205={ name=character_name_12122205 # Yoshisato - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122200 # Satake Tomoyoshi religion="shinto" culture="northern_kanto" @@ -2680,8 +2818,9 @@ } } 12122206={ - name=character_name_12122206 # Sukeyoshi - dynasty=10000108 # Satake + name=character_name_12122206 # Sukeyoshi,祐義 + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122200 # Satake Tomoyoshi religion="shinto" culture="northern_kanto" @@ -2690,14 +2829,16 @@ } 1423.1.1={ add_pressed_claim=d_shgnt_hitachi + give_nickname="nick_the_gyobu_daihu" # 「刑部大輔」（『続羣書類従』第五輯上「佐竹系図」） } 1460.1.1={ death=yes } } 12122210={ - name=character_name_12122210 # Yoshitomo - dynasty=10000108 # Satake + name=character_name_12122210 # Yoshitomo,義知 + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122206 # Satake Sukeyoshi religion="shinto" culture="northern_kanto" @@ -2706,14 +2847,16 @@ } 1460.1.1={ add_pressed_claim=d_shgnt_hitachi + give_nickname="nick_the_kazusa_no_suke" # 「上総介」（『続羣書類従』第五輯上「佐竹系図」） } 1478.1.1={ death=yes } } 12122211={ - name=character_name_12122211 # Yoshizane - dynasty=10000108 # Satake + name=character_name_12122211 # Yoshizane,義真 + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122206 # Satake Sukeyoshi religion="shinto" culture="northern_kanto" @@ -2722,6 +2865,7 @@ } 1478.1.1={ add_pressed_claim=d_shgnt_hitachi + give_nickname="nick_the_shimousa_no_suke" # 「下総介」（『続羣書類従』第五輯上「佐竹系図」） } 1480.1.1={ death=yes @@ -2729,7 +2873,8 @@ } 12122215={ name=character_name_12122215 # Yoshiaki - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122211 # Satake Yoshizane religion="shinto" culture="northern_kanto" @@ -2742,7 +2887,8 @@ } 12122216={ name=character_name_12122216 # Yoshifuji - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122211 # Satake Yoshizane religion="shinto" culture="northern_kanto" @@ -2760,7 +2906,8 @@ } 12122220={ name=character_name_12122220 # Ujiyoshi - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122216 # Satake Yoshifuji religion="shinto" culture="northern_kanto" @@ -2780,7 +2927,8 @@ } 12122225={ name=character_name_12122225 # Yoshimori - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122220 # Satake Ujiyoshi religion="shinto" culture="northern_kanto" @@ -2795,7 +2943,8 @@ } 12122230={ name=character_name_12122230 # Yoshito - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122225 # Satake Yoshimori religion="shinto" culture="northern_kanto" @@ -2808,7 +2957,8 @@ } 12122231={ name=character_name_12122231 # Yoshitsugu - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_yamairi" father=12122225 # Satake Yoshimori religion="shinto" culture="northern_kanto" diff --git a/history/characters/12C-13_koshin_characters.txt b/history/characters/12C-13_koshin_characters.txt index 810bb2f..a53bbdb 100644 --- a/history/characters/12C-13_koshin_characters.txt +++ b/history/characters/12C-13_koshin_characters.txt @@ -10783,7 +10783,8 @@ } 12385076={ name=character_name_12385076 # Mitsuteru - dynasty=10000229 # Yashiro + #dynasty=10000229 # Yashiro + dynasty_house="house_shgnt_murakami_yashiro" father=12385070 # Murakami Yorikuni religion="shinto" culture="koshin" diff --git a/history/characters/eastern_kanto_characters.txt b/history/characters/eastern_kanto_characters.txt index 516cf23..e7ddb4a 100644 --- a/history/characters/eastern_kanto_characters.txt +++ b/history/characters/eastern_kanto_characters.txt @@ -1,5 +1,5 @@ 10010801 = { - name=character_name_10010801 # Yoshiatsu + name=character_name_10010801 # Yoshiatsu, 義篤 dynasty=10000108 # Satake father=10010803 mother=10010807 @@ -20,25 +20,27 @@ add_spouse=10010409 } 1530.1.1={ - effect = { - add_trait = "jugoi_ge" - } + trait="jugoi_ge" + #effect = { + # add_trait = "jugoi_ge" + #} } 1540.7.17={ - give_nickname="nick_the_uma_no_kami" - effect = { - add_trait = "jushii_ge" - } + give_nickname="nick_the_uma_no_kami" # 「右馬権頭」（『続羣書類従』第五輯上「佐竹系図」） + trait="jushii_ge" # 「従四位下」（『続羣書類従』第五輯上「佐竹系図」） + #effect = { + # add_trait = "jushii_ge" + #} } 1542.1.1={ - give_nickname="nick_the_daizen_daihu" + give_nickname="nick_the_daizen_daihu" # 「大膳大夫」（『続羣書類従』第五輯上「佐竹系図」） } 1545.5.19={ death=yes } } 10010802 = { - name=character_name_10010802 # Yoshiaki + name=character_name_10010802 # Yoshiaki, 義昭 dynasty=10000108 # Satake father=10010801 mother=10010409 @@ -56,17 +58,17 @@ } } 1547.1.1={ - give_nickname="nick_jio" + give_nickname="nick_jio" # 「次郎」（『続羣書類従』第五輯上「佐竹系図」） } 1556.1.1={ - give_nickname="nick_ukyo_dayu" + give_nickname="nick_ukyo_dayu" # 「右京大夫」（『続羣書類従』第五輯上「佐竹系図」） } 1565.11.25={ death=yes } } 10010803 = { - name=character_name_10010803 # Yoshikiyo + name=character_name_10010803 # Yoshikiyo,義舜 dynasty=10000108 # Satake father=10010808 religion="shinto" @@ -81,7 +83,7 @@ trait="brave" trait="just" prowess=12 - 1470.1.1={ + 1470.1.1={ # 「文明2(1470)年生」（『続羣書類従』第五輯上「佐竹系図」） birth=yes } 1490.5.14={ @@ -93,17 +95,18 @@ add_spouse=10010807 } 1500.1.1={ - give_nickname="nick_the_ukyo_dayu" - effect = { - add_trait = "jushii_ge" - } + give_nickname="nick_the_ukyo_dayu" # 「右京大夫」（『続羣書類従』第五輯上「佐竹系図」） + trait="jushii_ge" # 「従四位少将」（『続羣書類従』第五輯上「佐竹系図」） + #effect = { + # add_trait = "jushii_ge" + #} } 1517.4.3={ death=yes } } 10010804 = { - name=character_name_10010804 # Yoshimoto + name=character_name_10010804 # Yoshimoto, 義元 dynasty=10000108 # Satake father=10010803 mother=10010807 @@ -113,14 +116,15 @@ birth=yes } 1524.1.1={ - give_nickname="nick_shiro" + give_nickname="nick_shiro" # 「部垂四郎」（『続羣書類従』第五輯上「佐竹系図」） + dynasty_house="house_shgnt_satake_hetare" } 1540.4.30={ death=yes } } 10010805 = { - name=character_name_10010805 # Yoshisato + name=character_name_10010805 # Yoshisato, 義里 dynasty=10000108 # Satake father=10010803 mother=10010807 @@ -163,23 +167,24 @@ } } 10010808 = { - name=character_name_10010808 # Yoshiharu + name=character_name_10010808 # Yoshiharu, 義治 dynasty=10000108 # Satake father=10010815 # Satake Yoshitoshi + #mother= # TODO: 「母小山大膳大夫女」（『続羣書類従』第五輯上「佐竹系図」） religion="shinto" culture="northern_kanto" 1443.1.1={ birth=yes } 1473.1.1={ - give_nickname="nick_uma_no_kami" + give_nickname="nick_uma_no_kami" # 「左衛門大夫右馬頭」（『続羣書類従』第五輯上「佐竹系図」） } 1490.5.14={ death=yes } } 10010809 = { - name=character_name_10010809 # Yoshitake + name=character_name_10010809 # Yoshitake,義武 dynasty=10000108 # Satake father=10010808 religion="shinto" @@ -188,16 +193,19 @@ birth=yes } 1488.1.1={ - give_nickname="nick_saburo" + give_nickname="nick_saburo" # 「久米三郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1492.01.01={ + dynasty_house="house_shgnt_satake_kume" } 1500.1.1={ death={ - death_reason=death_suicide + death_reason=death_suicide #　「ヽヽ生害」（『続羣書類従』第五輯上「佐竹系図」） } } } 10010810 = { - name=character_name_10010810 # Yoshinobu + name=character_name_10010810 # Yoshinobu, 義信 dynasty=10000108 # Satake father=10010808 religion="shinto" @@ -206,15 +214,17 @@ birth=yes } 1506.1.1={ - give_nickname="nick_saemon" + give_nickname="nick_saemon" # 「左衛門」（『続羣書類従』第五輯上「佐竹系図」） + dynasty_house="house_shgnt_satake_kita" } 1533.8.31={ death=yes } } 10010811 = { - name=character_name_10010811 # Yoshizumi - dynasty=10000108 # Satake + name=character_name_10010811 # Yoshizumi, + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kita" father=10010810 religion="shinto" culture="northern_kanto" @@ -227,7 +237,8 @@ } 10010812 = { name=character_name_10010812 # Yoshikado - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kita" father=10010810 religion="shinto" culture="northern_kanto" @@ -239,7 +250,7 @@ } } 10010813 = { - name=character_name_10010813 # Masayoshi + name=character_name_10010813 # Masayoshi, 政義 dynasty=10000108 # Satake father=10010808 religion="shinto" @@ -248,7 +259,8 @@ birth=yes } 1509.1.1={ - give_nickname="nick_sakonoe_shogen" + give_nickname="nick_sakonoe_shogen" # 「左近将監」（『続羣書類従』第五輯上「佐竹系図」） + dynasty_house="house_shgnt_satake_higashi" } 1534.10.10={ death=yes @@ -265,16 +277,16 @@ birth=yes } 1440.1.1={ - give_nickname="nick_iyo_no_kami" + give_nickname="nick_iyo_no_kami" #　「伊予守」（『続羣書類従』第五輯上「佐竹系図」） } 1477.12.29={ death=yes } } 10010816 = { - name=character_name_10010816 # Yoshinori + name=character_name_10010816 # Yoshinori,義憲、始名「義人」、童名「龍保丸」 dynasty=10000100 # Uesugi - father=10017016 + father=10017016 #　上杉憲定 martial=7 diplomacy=7 intrigue=8 @@ -286,9 +298,11 @@ 1400.1.1={ birth=yes } + # 「応永10(1403)年当国下着。」（『続羣書類従』第五輯上「佐竹系図」） 1407.10.22={ dynasty=10000108 # Adoption to the Satake clan culture="northern_kanto" + trait="child_of_adoption" effect = { set_father = character:10010821 set_real_father = character:10017016 @@ -297,13 +311,14 @@ } } 1416.1.1={ - give_nickname="nick_shichiro" + give_nickname="nick_shichiro" # 「上杉七郎」（『続羣書類従』第五輯上「佐竹系図」） } + # 「十七歳時義人ト改。」（『続羣書類従』第五輯上「佐竹系図」） 1417.1.1={ give_nickname="nick_the_sama_no_suke" } 1430.1.1={ - give_nickname="nick_ukyo_dayu" + give_nickname="nick_ukyo_dayu" #　「佐竹右京大夫」（『続羣書類従』第五輯上「佐竹系図」） } 1468.1.19={ death=yes @@ -320,18 +335,20 @@ birth=yes } 1407.10.22={ - add_spouse=10010816 + effect = { + create_betrothal_matrilineal = character:10010816 + } } 1415.1.1={ remove_spouse=10010816 add_matrilineal_spouse=10010816 # Satake Yoshinori } - 1456.1.1={ + 1456.1.1={ # 「鎌倉ニ卒。五十八歳。法号天徳寺甚山妙幸。」（『続羣書類従』第五輯上「佐竹系図」） death=yes } } 10010818 = { - name=character_name_10010818 # Sanesada + name=character_name_10010818 # Sanesada, 実定 dynasty=10000108 # Satake father=10010816 mother=10010817 @@ -341,14 +358,14 @@ birth=yes } 1445.1.1={ - give_nickname="nick_uma_no_kami" + give_nickname="nick_uma_no_kami" #　「上村右馬頭右京大夫」（『続羣書類従』第五輯上「佐竹系図」） } 1465.10.24={ death=yes } } 10010819 = { - name=character_name_10010819 # Yoshiwa + name=character_name_10010819 # Yoshiwa, 義倭 dynasty=10000108 # Satake father=10010816 mother=10010817 @@ -358,17 +375,18 @@ birth=yes } 1443.1.1={ - give_nickname="nick_hachiro" + give_nickname="nick_hachiro" #　「戸村八郎」（『続羣書類従』第五輯上「佐竹系図」） } 1457.1.1={ - give_nickname="nick_hitachi_no_suke" + give_nickname="nick_hitachi_no_suke" #　「戸村八郎常陸介」（『続羣書類従』第五輯上「佐竹系図」） + dynasty_house="house_shgnt_satake_minami" # 「号南ト。」（『続羣書類従』第五輯上「佐竹系図」） } 1477.1.1={ death=yes } } 10010820 = { - name=character_name_10010820 # Yoshimori + name=character_name_10010820 # Yoshimori, 「義森」（『続羣書類従』第五輯上「佐竹系図」） dynasty=10000108 # Satake father=10010816 mother=10010817 @@ -378,27 +396,32 @@ birth=yes } 1459.1.1={ - give_nickname="nick_saemon_no_suke" + give_nickname="nick_saemon_no_suke" # 「小野左衛門佐」（『続羣書類従』第五輯上「佐竹系図」） + dynasty_house="house_shgnt_satake_ono" } 1479.1.1={ death=yes } } 10010821 = { - name=character_name_10010821 # Yoshimori + name=character_name_10010821 # Yoshimori, 義盛 dynasty=10000108 # Satake father=12122130 # Satake Yoshinobu + #mother= #「河越女」（『続羣書類従』第五輯上「佐竹系図」） religion="shinto" culture="northern_kanto" 1365.1.1={ birth=yes } + 1381.01.01={ + give_nickname="nick_uma_no_kami" # 「右馬権守」 + } 1407.10.22={ death=yes } } 10010830 = { - name=character_name_10010830 # Yoshishige + name=character_name_10010830 # Yoshishige, 義重 dynasty=10000108 # Satake father=10010802 martial=8 @@ -417,7 +440,7 @@ birth=yes } 1565.11.25={ - give_nickname="nick_hitachi_no_suke" + give_nickname="nick_hitachi_no_suke" # 「常陸介」（『続羣書類従』第五輯上「佐竹系図」） effect = { set_realm_capital=title:c_shgnt_kuji } @@ -430,7 +453,7 @@ } } 10010831 = { - name=character_name_10010831 # Sukeie # Nasu Sukeii + name=character_name_10010831 # Sukeie,資家 # Nasu Sukeii dynasty=10000108 # Satake father=10010802 religion="shinto" @@ -443,7 +466,7 @@ } } 10010832 = { - name=character_name_10010832 # Yoshihisa + name=character_name_10010832 # Yoshihisa,義尚 dynasty=10000108 # Satake father=10010802 religion="shinto" @@ -452,7 +475,10 @@ birth=yes } 1566.1.1={ - give_nickname="nick_goro" + give_nickname="nick_goro" # 「五郎」（『続羣書類従』第五輯上「佐竹系図」） + } + 1580.01.01={ + dynasty_house="house_shgnt_satake_minami" #　「義隣ノ継」（『続羣書類従』第五輯上「佐竹系図」） } 1571.9.18={ death=yes @@ -469,6 +495,7 @@ } 1571.1.1={ give_nickname="nick_saburo" + dynasty_house="house_shgnt_satake_koba" } 1600.1.1={ death=yes @@ -589,7 +616,8 @@ } 10010842={ name=character_name_10010842 # Yoshitsuna - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_kita" father=10010812 # Satake Yoshikado religion="shinto" culture="northern_kanto" @@ -626,7 +654,8 @@ } 10010844={ name=character_name_10010844 # Yoshikata - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_higashi" father=10010813 # Satake Masayoshi religion="shinto" culture="northern_kanto" @@ -641,7 +670,8 @@ } 10010845={ name=character_name_10010845 # Yoshitaka - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_higashi" father=10010844 # Satake Yoshikata religion="shinto" culture="northern_kanto" @@ -654,7 +684,8 @@ } 10010846={ name=character_name_10010846 # Yoshihisa - dynasty=10000108 # Satake + #dynasty=10000108 # Satake + dynasty_house="house_shgnt_satake_higashi" father=10010844 # Satake Yoshikata religion="shinto" culture="northern_kanto" diff --git a/history/characters/koshin_characters.txt b/history/characters/koshin_characters.txt index be034a6..219c1cb 100644 --- a/history/characters/koshin_characters.txt +++ b/history/characters/koshin_characters.txt @@ -3890,7 +3890,8 @@ } 10021180={ name=character_name_10021180 # Masashige - dynasty=10000229 # Yashiro + #dynasty=10000229 # Yashiro + dynasty_house="house_shgnt_murakami_yashiro" father=12385076 # religion="shinto" culture="koshin" @@ -3903,7 +3904,8 @@ } 10021181={ name=character_name_10021181 # Masakuni - dynasty=10000229 # Yashiro + #dynasty=10000229 # Yashiro + dynasty_house="house_shgnt_murakami_yashiro" father=10021180 # religion="shinto" culture="koshin" @@ -3919,7 +3921,8 @@ } 10021182={ name=character_name_10021182 # Hidemasa - dynasty=10000229 # Yashiro + #dynasty=10000229 # Yashiro + dynasty_house="house_shgnt_murakami_yashiro" father=10021181 # religion="shinto" culture="koshin" @@ -3933,6 +3936,7 @@ 10021190 = { name=character_name_10021190 # Munekuni dynasty=10000227 # Muroga +# dynasty_house="house_shgnt_murakami_muroga" religion="shinto" culture="koshin" trait="education_intrigue_1" @@ -3946,6 +3950,7 @@ 10021191 = { name=character_name_10021191 # Morikiyo dynasty=10000227 # Muroga +# dynasty_house="house_shgnt_murakami_muroga" father=10021190 religion="shinto" culture="koshin" @@ -3960,6 +3965,7 @@ 10021192 = { name=character_name_10021192 # Nobutoshi dynasty=10000227 # Muroga +# dynasty_house="house_shgnt_murakami_muroga" father=10021191 religion="shinto" culture="koshin" @@ -3977,6 +3983,7 @@ name=character_name_10021193 # Hana # Fictional female=yes dynasty=10000227 # Muroga +# dynasty_house="house_shgnt_murakami_muroga" father=10021190 religion="shinto" culture="koshin" @@ -3990,7 +3997,8 @@ } 10021194 = { name=character_name_10021194 # Mitsumasa - dynasty=10000227 # Muroga +# dynasty=10000227 # Muroga + dynasty_house="house_shgnt_murakami_muroga" father=10021180 mother=10021193 religion="shinto" @@ -4005,7 +4013,8 @@ } 10021195 = { name=character_name_10021195 # Masatake - dynasty=10000227 # Muroga +# dynasty=10000227 # Muroga + dynasty_house="house_shgnt_murakami_muroga" father=10021194 martial=11 diplomacy=8 @@ -4033,7 +4042,8 @@ } 10021196 = { name=character_name_10021196 # Mitsutoshi - dynasty=10000227 # Muroga +# dynasty=10000227 # Muroga + dynasty_house="house_shgnt_murakami_muroga" father=10021194 religion="shinto" culture="koshin" diff --git a/history/characters/southern_oshu_characters.txt b/history/characters/southern_oshu_characters.txt index 720da18..0414875 100644 --- a/history/characters/southern_oshu_characters.txt +++ b/history/characters/southern_oshu_characters.txt @@ -1254,11 +1254,11 @@ 1433.1.1 = { birth=yes } - 1480.1.1={ - effect = { - set_realm_capital=title:c_shgnt_oshika - } - } + 1483.01.01 = { + effect={ + set_realm_capital=title:c_shgnt_oshika # 牡鹿郡石巻城 + } + } 1506.5.23 = { death=yes } @@ -1290,6 +1290,11 @@ 1345.1.1 = { birth=yes } + 1365.05.08 = { + effect={ + set_realm_capital=title:c_shgnt_oshika # 牡鹿郡石巻城 + } + } 1388.1.1 = { death=yes } @@ -1329,6 +1334,11 @@ 1370.1.1 = { birth=yes } + 1388.01.01 = { + effect={ + set_realm_capital=title:c_shgnt_oshika # 牡鹿郡石巻城 + } + } 1420.1.1 = { death=yes } @@ -1355,6 +1365,11 @@ 1398.1.1 = { birth=yes } + 1420.01.01 = { + effect={ + set_realm_capital=title:c_shgnt_oshika # 牡鹿郡石巻城 + } + } 1469.1.1 = { death=yes } @@ -1407,6 +1422,11 @@ 1427.1.1 = { birth=yes } + 1469.01.01 = { + effect={ + set_realm_capital=title:c_shgnt_oshika # 牡鹿郡石巻城 + } + } 1480.1.1 = { death=yes } @@ -1433,6 +1453,11 @@ 1451.1.1={ birth=yes } + 1480.01.01 = { + effect={ + set_realm_capital=title:c_shgnt_oshika # 牡鹿郡石巻城 + } + } 1483.1.1={ death=yes } @@ -1667,6 +1692,11 @@ 1280.1.1={ birth=yes } + 1310.01.01 = { + effect={ + set_realm_capital=title:c_shgnt_oshika # 牡鹿郡石巻城 + } + } 1351.4.23={ death=yes } @@ -1680,6 +1710,11 @@ 1312.1.1={ birth=yes } + 1351.04.23 = { + effect={ + set_realm_capital=title:c_shgnt_oshika # 牡鹿郡石巻城 + } + } 1365.5.8={ death=yes } diff --git a/history/characters/western_kanto_characters.txt b/history/characters/western_kanto_characters.txt index 6a14627..d4311dd 100644 --- a/history/characters/western_kanto_characters.txt +++ b/history/characters/western_kanto_characters.txt @@ -5209,6 +5209,11 @@ 1470.1.1={ birth=yes } + 1490.01.01={ + effect={ + set_realm_capital=title:c_shgnt_yokomi + } + } 1540.1.1={ death=yes } @@ -5241,6 +5246,11 @@ 1500.1.1={ birth=yes } + 1530.01.01={ + effect={ + set_realm_capital=title:c_shgnt_yokomi + } + } 1537.7.1={ employer = 10018001 # Uesugi Tomosada } diff --git a/history/provinces/k_shgnt_chubu.txt b/history/provinces/k_shgnt_chubu.txt index 967a837..ed6c67d 100644 --- a/history/provinces/k_shgnt_chubu.txt +++ b/history/provinces/k_shgnt_chubu.txt @@ -838,6 +838,12 @@ culture = western_chubu religion = shinto holding = none + 1221.07.06={ + holding=castle_holding # Ōga, 大桑城 + } + 1542.01.01={ + holding=none + } } 852 = { # Muge_1 culture = western_chubu diff --git a/history/provinces/k_shgnt_dewa.txt b/history/provinces/k_shgnt_dewa.txt index cce44a5..c569c5f 100644 --- a/history/provinces/k_shgnt_dewa.txt +++ b/history/provinces/k_shgnt_dewa.txt @@ -42,7 +42,7 @@ 1250 = { # Mogami_1 culture = dewa religion = shinto - holding = castle_holding # Nariu, Tendo + holding = castle_holding # Nariu } 1251 = { # Mogami_2 culture = dewa @@ -78,14 +78,14 @@ culture = dewa religion = shinto holding = none - 1356.01.01 = { - holding = castle_holding # Yamagata - } } 1258 = { # Mogami_9 culture = dewa religion = shinto holding = none + 1357.01.01={ + holding=castle_holding # Yamagata, 山形城 + } } 1259 = { # Mogami_10 culture = dewa @@ -95,7 +95,7 @@ 1260 = { # Mogami_11 culture = dewa religion = shinto - holding = castle_holding + holding = none } 1261 = { # Mogami_12 culture = dewa @@ -296,7 +296,7 @@ 1299 = { # Takawa_8 culture = dewa religion = shinto - holding = none + holding = church_holding # Hagurosan, 羽黒山 } 1300 = { # Takawa_9 culture = dewa diff --git a/history/provinces/k_shgnt_eastern_kanto.txt b/history/provinces/k_shgnt_eastern_kanto.txt index b289259..d61f8f5 100644 --- a/history/provinces/k_shgnt_eastern_kanto.txt +++ b/history/provinces/k_shgnt_eastern_kanto.txt @@ -42,7 +42,7 @@ 559 = { # Boshu_awa_1 culture = eastern_kanto religion = shinto - holding = castle_holding + holding = castle_holding # 沼郷→館山城 } 560 = { # Boshu_awa_2 culture = eastern_kanto @@ -52,7 +52,7 @@ 561 = { # Amaha_1 culture = eastern_kanto religion = shinto - holding = castle_holding + holding = castle_holding # 天羽荘→佐貫城 } 562 = { # Amaha_2 culture = eastern_kanto @@ -224,6 +224,12 @@ culture = eastern_kanto religion = shinto holding = none + 1394.01.01={ + holding=castle_holding # Narutō,成東城 + } + 1620.01.01={ + holding=none + } } 595 = { # Musa_4 culture = eastern_kanto @@ -359,12 +365,15 @@ 620 = { # Chiba_2 culture = eastern_kanto religion = shinto - holding = castle_holding + holding = castle_holding # Chiba, 千葉城、Inohana, 亥鼻城 } 621 = { # Chiba_3 culture = eastern_kanto religion = shinto holding = none + 1333.07.04={ + holding=castle_holding # Oyumi, 小弓城 + } } 622 = { # Inba_1 culture = eastern_kanto diff --git a/history/provinces/k_shgnt_northern_kyushu.txt b/history/provinces/k_shgnt_northern_kyushu.txt index 88d3595..5cf5a8d 100644 --- a/history/provinces/k_shgnt_northern_kyushu.txt +++ b/history/provinces/k_shgnt_northern_kyushu.txt @@ -8,6 +8,12 @@ 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 @@ -34,6 +40,12 @@ 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 @@ -171,6 +183,12 @@ 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 @@ -515,7 +533,7 @@ 2343 = { # Buzen_Takawa_1 culture = northern_kyushu religion = shinto - holding = none + holding = church_holding #　Hikosan, 英彦山 } 2344 = { # Buzen_Takawa_2 culture = northern_kyushu diff --git a/history/provinces/k_shgnt_northern_oshu.txt b/history/provinces/k_shgnt_northern_oshu.txt index 28e17dc..6ad8f6b 100644 --- a/history/provinces/k_shgnt_northern_oshu.txt +++ b/history/provinces/k_shgnt_northern_oshu.txt @@ -120,6 +120,9 @@ culture = northern_oshu religion = shinto holding = none + 1253.01.01={ + holding=castle_holding # Usuginu,薄衣城 + } } 1360 = { # Iwai_6 culture = northern_oshu diff --git a/history/provinces/k_shgnt_southern_kinai.txt b/history/provinces/k_shgnt_southern_kinai.txt index d93faa5..11b02ef 100644 --- a/history/provinces/k_shgnt_southern_kinai.txt +++ b/history/provinces/k_shgnt_southern_kinai.txt @@ -598,7 +598,7 @@ 2053 = { # Ito_3 culture = southern_kinai religion = shinto - holding = castle_holding + holding = church_holding # # Kongōbuji, 高野山金剛峯寺 } 2054 = { # Naga_1 culture = southern_kinai diff --git a/history/provinces/k_shgnt_southern_kyushu.txt b/history/provinces/k_shgnt_southern_kyushu.txt index 4a415e7..cffb7aa 100644 --- a/history/provinces/k_shgnt_southern_kyushu.txt +++ b/history/provinces/k_shgnt_southern_kyushu.txt @@ -667,7 +667,7 @@ 2601 = { # Kawanohe_4 culture = southern_kyushu religion = shinto - holding = none + holding = city_holding # Bōnotsu, 坊津 } 2602 = { # Ata_1 culture = southern_kyushu diff --git a/history/provinces/k_shgnt_southern_oshu.txt b/history/provinces/k_shgnt_southern_oshu.txt index b639c2e..c65be36 100644 --- a/history/provinces/k_shgnt_southern_oshu.txt +++ b/history/provinces/k_shgnt_southern_oshu.txt @@ -627,12 +627,18 @@ 1195 = { # Kese_1 culture = southern_oshu religion = shinto - holding = castle_holding + holding = none } 1196 = { # Kese_2 culture = southern_oshu religion = shinto holding = none + 1333.07.04={ # 仮の年月日 + holding=castle_holding# Takata,高田城 + } + 1589.01.01={# 仮の年月日 + holding=none + } } 1197 = { # Kese_3 culture = southern_oshu diff --git a/history/provinces/k_shgnt_western_kanto.txt b/history/provinces/k_shgnt_western_kanto.txt index 25d23fa..477dd60 100644 --- a/history/provinces/k_shgnt_western_kanto.txt +++ b/history/provinces/k_shgnt_western_kanto.txt @@ -508,6 +508,9 @@ culture = western_kanto religion = shinto holding = none + 1478.01.01={ + holding=castle_holding # Oshi, 忍城 + } } 521 = { # Kita_Saitama_4 culture = western_kanto diff --git a/history/titles/k_shgnt_chubu.txt b/history/titles/k_shgnt_chubu.txt index 78d5a34..e414220 100644 --- a/history/titles/k_shgnt_chubu.txt +++ b/history/titles/k_shgnt_chubu.txt @@ -3508,6 +3508,11 @@ c_shgnt_yamakata = { } 1221.07.06 = { holder = 10130326 # Iga Mitsusuke + effect = { + title:b_shgnt_yamakata_2 = { + set_title_name = b_shgnt_yamakata_2_1 # Ōga, 大桑城 + } + } } 1230.01.01 = { holder = 10130334 # Iga Mitsufusa @@ -3546,6 +3551,13 @@ c_shgnt_yamakata = { 1528.01.01 = { holder = 10025651 # Ando Morinari } + 1542.01.01={ + effect = { + title:b_shgnt_yamakata_2 = { + set_title_name = b_shgnt_yamakata_2_2 # Ōga, 大桑 + } + } + } 1567.09.01 = { liege = d_shgnt_owari # Oda Nobunaga holder = 10025651 # Ando Morinari diff --git a/history/titles/k_shgnt_dewa.txt b/history/titles/k_shgnt_dewa.txt index c3830c6..3bec095 100644 --- a/history/titles/k_shgnt_dewa.txt +++ b/history/titles/k_shgnt_dewa.txt @@ -303,6 +303,13 @@ c_shgnt_mogami = { liege = k_nmih_ushu_tandai # holder = 12015000 # Mogami Kaneyori } + 1357.01.01={ + effect = { + title:b_shgnt_mogami_9 = { + set_title_name = b_shgnt_mogami_9_1 # Yamagata, 山形城 + } + } + } 1375.01.01 = { holder = 12015001 # Mogami Naoie effect = { diff --git a/history/titles/k_shgnt_eastern_kanto.txt b/history/titles/k_shgnt_eastern_kanto.txt index e25d688..be86fbf 100644 --- a/history/titles/k_shgnt_eastern_kanto.txt +++ b/history/titles/k_shgnt_eastern_kanto.txt @@ -89,6 +89,13 @@ 1480.01.01 = { holder = 10011807 } + 1504.01.01={ + effect = { + title:b_shgnt_amaha_1 = { + set_title_name = b_shgnt_amaha_1_1 # Sanuki,佐貫城 + } + } + } 1506.01.01 = { holder = 10011805 } @@ -315,6 +322,13 @@ c_shgnt_boshu_awa = { 1578.07.05 = { holder = 10011903 # Satomi Yoshiyori } + 1580.01.01={ + effect = { + title:b_shgnt_boshu_awa_1 = { + set_title_name = b_shgnt_boshu_awa_1_1 # Tateyama,館山城 + } + } + } } c_shgnt_chiba = { 0001.01.01 = { change_development_level = 10 } @@ -351,6 +365,13 @@ c_shgnt_chiba = { 1312.05.05 = { holder = 12150160 # Chiba Sadatane } + 1333.07.04={ + effect = { + title:b_shgnt_chiba_3 = { + set_title_name = b_shgnt_chiba_3_1 # Oyumi, 小弓城 + } + } + } 1351.01.28 = { holder = 12150166 # Chiba Ujitane } @@ -820,6 +841,11 @@ c_shgnt_ishimi = { } 1400.01.01 = { holder = 10020376 # Toki Yorimoto + effect = { + title:b_shgnt_ishimi_3 = { + set_title_name = b_shgnt_ishimi_3_1 #　Mangi, 万喜城 + } + } } 1440.01.01 = { holder = 10020377 # Toki Yorifusa @@ -833,6 +859,13 @@ c_shgnt_ishimi = { 1579.01.01 = { holder = 10020385 # Toki Yoriharu } + 1591.01.01={ + effect = { + title:b_shgnt_ishimi_3 = { + set_title_name = b_shgnt_ishimi_3_2 #　Mangi, 万喜城 + } + } + } } c_shgnt_kamitsuga = { 0001.01.01 = { change_development_level = 10 } @@ -1062,6 +1095,13 @@ c_shgnt_katsushika = { 1430.01.01 = { holder = 10011672 # Hara Tanefusa } + 1450.01.01={ + effect = { + title:b_shgnt_katsushika_1 = { + set_title_name = b_shgnt_katsushika_1_1 # Kasai, 葛西城 + } + } + } 1456.11.28 = { liege = d_shgnt_sagami # holder = 10011615 # Musashi=Chiba Sanetane @@ -1531,6 +1571,13 @@ c_shgnt_musa = { 1365.09.28 = { holder = 12150170 # Chiba Mitsutane } + 1394.01.01={ + effect = { + title:b_shgnt_musa_3 = { + set_title_name = b_shgnt_musa_3_1 # Narutō,成東城 + } + } + } 1417.01.27 = { holder = 12150175 # Chiba Kanetane } diff --git a/history/titles/k_shgnt_hokuriku.txt b/history/titles/k_shgnt_hokuriku.txt index de85c3a..c696bf2 100644 --- a/history/titles/k_shgnt_hokuriku.txt +++ b/history/titles/k_shgnt_hokuriku.txt @@ -1578,6 +1578,9 @@ c_shgnt_nishi_kubiki = { liege = 0 holder = 0 } + 1300.1.1={ + liege="d_shgnt_echigo" + } 1360.01.01 = { holder = 12215326 # Nagao Kagetsune } diff --git a/history/titles/k_shgnt_northern_kinai.txt b/history/titles/k_shgnt_northern_kinai.txt index e456fdf..604dfdd 100644 --- a/history/titles/k_shgnt_northern_kinai.txt +++ b/history/titles/k_shgnt_northern_kinai.txt @@ -1241,6 +1241,18 @@ c_shgnt_kii = { liege = 0 # holder = 0 # Battle of Awazu } + 1333.07.04={ + effect = { + title:b_shgnt_kii_1 = { + set_title_name = b_shgnt_kii_1_1 # Toba 鳥羽 + } + } + effect = { + title:b_shgnt_kii_3 = { + set_title_name = b_shgnt_kii_3_1 # Fushimi 伏見 + } + } + } 1450.02.01 = { liege = d_shgnt_yamashiro # holder = 10048114 # Hatakeyama Mochikuni diff --git a/history/titles/k_shgnt_northern_kyushu.txt b/history/titles/k_shgnt_northern_kyushu.txt index 444c162..844bff4 100644 --- a/history/titles/k_shgnt_northern_kyushu.txt +++ b/history/titles/k_shgnt_northern_kyushu.txt @@ -1098,6 +1098,20 @@ c_shgnt_mikasa = { } } } + 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 = { @@ -1432,6 +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, 蘿岳城 + } + } } 1470.01.01 = { holder = 10067304 # Munakata Ujikuni @@ -1460,6 +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, 赤間 + } + } + } } c_shgnt_naori = { 0001.01.01 = { change_development_level = 30 } @@ -2958,6 +2984,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, 岡城 + } + } + } 1480.01.01 = { holder = 10068525 # Aso Hirokuni } @@ -2979,6 +3012,11 @@ c_shgnt_onga = { } 1570.01.01 = { holder = 10068530 # Aso Takasane + effect = { + title:b_shgnt_onga_2 = { + set_title_name = b_shgnt_onga_2_2 # Oka, 岡 + } + } } } c_shgnt_honami = { diff --git a/history/titles/k_shgnt_northern_oshu.txt b/history/titles/k_shgnt_northern_oshu.txt index ba07033..84813bd 100644 --- a/history/titles/k_shgnt_northern_oshu.txt +++ b/history/titles/k_shgnt_northern_oshu.txt @@ -33,7 +33,7 @@ holder = 12052025 # Hei Hisatomo } 1375.01.01 = { - effect = { + effect={ title:b_shgnt_hei_3 = { set_title_name = b_shgnt_hei_3_1 # Takusari } @@ -325,6 +325,13 @@ c_shgnt_iwai = { 1250.01.01 = { holder = 10006141 # Kasai Kiyochika } + 1259.01.01={ + effect = { + title:b_shgnt_iwai_5 = { + set_title_name = b_shgnt_iwai_5_1 # Usuginu,薄衣城 + } + } + } 1270.01.01 = { holder = 10006142 # Kasai Kiyotoki } diff --git a/history/titles/k_shgnt_southern_oshu.txt b/history/titles/k_shgnt_southern_oshu.txt index 8cb435c..712dc5c 100644 --- a/history/titles/k_shgnt_southern_oshu.txt +++ b/history/titles/k_shgnt_southern_oshu.txt @@ -539,6 +539,13 @@ c_shgnt_kese = { 1310.01.01 = { holder = 10006144 # Kasai Sadakiyo } + 1333.07.04={ # 仮の年月日 + effect = { + title:b_shgnt_kese_2={ + set_title_name=b_shgnt_kese_2_1 # Takata,高田城 + } + } + } 1351.04.23 = { liege = d_shgnt_rikuchu # holder = 10006145 # Kasai Takakiyo @@ -563,7 +570,19 @@ c_shgnt_kese = { } 1550.01.01 = { holder = 10009703 # Hamada Hirotsuna + effect = { + title:b_shgnt_kese_2={ + set_title_name=b_shgnt_kese_2_2 # Yonegasaki,米ヶ崎城 # 名前変更年月日は仮 + } + } } + 1589.01.01={# 仮の年月日 + effect = { + title:b_shgnt_kese_2={ + set_title_name=b_shgnt_kese_2 # + } + } + } } c_shgnt_kurihara = { 0001.01.01 = { change_development_level = 20 } diff --git a/history/titles/k_shgnt_western_kanto.txt b/history/titles/k_shgnt_western_kanto.txt index 11effd1..3578795 100644 --- a/history/titles/k_shgnt_western_kanto.txt +++ b/history/titles/k_shgnt_western_kanto.txt @@ -1609,6 +1609,13 @@ c_shgnt_kita_saitama = { liege = k_nmih_kamakura_kubo # holder = 10040059 # Ashikaga Shigeuji } + 1478.01.01={ + effect = { + title:b_shgnt_kita_saitama_3 = { + set_title_name = b_shgnt_kita_saitama_3_1 # Oshi, 忍城 + } + } + } 1480.01.01 = { holder = 10018101 # Narita Akiyasu } @@ -3538,6 +3545,13 @@ c_shgnt_yokomi = { liege = 0 holder = 0 } + 1399.01.01={ + effect = { + title:b_shgnt_yokomi_1 = { + set_title_name = b_shgnt_yokomi_1_1 # Matsuyama, 松山城 + } + } + } 1457.01.01 = { liege = d_shgnt_musashi # holder = 10017037 # Uesugi Mochitomo diff --git a/localization/english/dynasties/shgnt_dynasty_names_l_english.yml b/localization/english/dynasties/shgnt_dynasty_names_l_english.yml index 85394c6..4bfbbb0 100644 --- a/localization/english/dynasties/shgnt_dynasty_names_l_english.yml +++ b/localization/english/dynasties/shgnt_dynasty_names_l_english.yml @@ -352,4 +352,23 @@ # Suwa, 諏訪 dynn_Chino:0 "Chino" dynn_Takato:0 "Takatō" - dynn_Fujisawa:0 "Fujisawa" \ No newline at end of file + dynn_Fujisawa:0 "Fujisawa" +# Murakami, 村上 + dynn_Yashiro:0 "Yashiro" + dynn_Muroga:0 "Muroga" +# Satake, 佐竹 +dynn_Satake:0 "Satake" +dynn_Okada:0 "Okada" +dynn_Minamisakaide:0 "Minamisakaide" +dynn_Kitasakaide:0 "Kitasakaide" +dynn_Nukata:0 "Nukata" +dynn_Toyoma:0 "Toyoma" +dynn_Takabe:0 "Takabe" +dynn_Nagakura:0 "Nagakura" +#dynn_Ouchi:0 "大内" +dynn_Mabuchi:0 "Mabuchi" +dynn_Ono:0 "Ono" +dynn_Kume:0 "Kume" +dynn_Hetare:0 "Hetare" +dynn_Koba:0 "Koba" +dynn_Inamoto:0 "Inamoto" \ No newline at end of file diff --git a/localization/english/shgnt_titles_l_english.yml b/localization/english/shgnt_titles_l_english.yml index 371d281..96e8bad 100644 --- a/localization/english/shgnt_titles_l_english.yml +++ b/localization/english/shgnt_titles_l_english.yml @@ -965,7 +965,7 @@ b_shgnt_nifuta_3:0 "Eda" b_shgnt_nifuta_4:0 "Ōta" b_shgnt_nifuta_5:0 "Yura" - b_shgnt_nifuta_6:0 "Nitta no Tate" + b_shgnt_nifuta_6:0 "Nitta" b_shgnt_yamata_1:0 "Kamihisakata" b_shgnt_yamata_2:0 "Sonoda" b_shgnt_yamata_3:0 "Nirakawa" @@ -1295,7 +1295,7 @@ b_shgnt_takawa_5:0 "Umibe no Shō" b_shgnt_takawa_6:0 "Yamato" b_shgnt_takawa_7:0 "Karikawa" - b_shgnt_takawa_8:0 "Tachiyazawa" + b_shgnt_takawa_8:0 "Hagurosan" b_shgnt_takawa_9:0 "Itsuki" b_shgnt_akumi_1:0 "Yusa no Shō" b_shgnt_akumi_2:0 "Yashiro" @@ -1320,7 +1320,7 @@ b_shgnt_yamamoto_3:0 "Kakumi" b_shgnt_yamamoto_4:0 "Nagashida" b_shgnt_yamamoto_5:0 "Yokohori" - b_shgnt_yamamoto_6:0 "Rokugo" + b_shgnt_yamamoto_6:0 "Rokugō" b_shgnt_yamamoto_7:0 "Kowakubi" b_shgnt_yamamoto_8:0 "Arakawa" b_shgnt_yamamoto_9:0 "Tsuchikawa" @@ -1331,7 +1331,7 @@ b_shgnt_hiraka_5:0 "Yokote" b_shgnt_hiraka_6:0 "Sannai" b_shgnt_yuri_1:0 "Shimohama" - b_shgnt_yuri_2:0 "Daishoji" + b_shgnt_yuri_2:0 "Honjō" b_shgnt_yuri_3:0 "Otomo" b_shgnt_yuri_4:0 "Ayukawa" b_shgnt_yuri_5:0 "Hirasawa" @@ -2057,7 +2057,7 @@ b_shgnt_abu_5:0 "Hagi" b_shgnt_ito_1:0 "Kaseda" b_shgnt_ito_2:0 "Koino" - b_shgnt_ito_3:0 "Kimi" + b_shgnt_ito_3:0 "Kongōbuji" b_shgnt_naga_1:0 "Arakawa no Shō" b_shgnt_naga_2:0 "Kōno" b_shgnt_naga_3:0 "Nate" @@ -2335,7 +2335,7 @@ b_shgnt_kiku_2:0 "Kiku" b_shgnt_kiku_3:0 "Kusami" b_shgnt_kiku_4:0 "Moji" - b_shgnt_buzen_takawa_1:0 "Soeda" + b_shgnt_buzen_takawa_1:0 "Hikosan" b_shgnt_buzen_takawa_2:0 "Kakibaru" b_shgnt_buzen_takawa_3:0 "Ikata no Shō" b_shgnt_buzen_takawa_4:0 "Itoda no Shō" @@ -2593,7 +2593,7 @@ b_shgnt_kawanohe_1:0 "Beppu" b_shgnt_kawanohe_2:0 "Kawanabe" b_shgnt_kawanohe_3:0 "Kaseda" - b_shgnt_kawanohe_4:0 "Minamikata" + b_shgnt_kawanohe_4:0 "Bōnotsu" b_shgnt_ata_1:0 "Tafuse" b_shgnt_ata_2:0 "Isaku" b_shgnt_hioki_1:0 "Kushikino" @@ -4143,3 +4143,23 @@ b_shgnt_hiraga_3_1:0 "Daikōji" b_shgnt_aita_10_1:0 "Tokko" b_shgnt_imizu_2_1:0 "Hōjōzu" + b_shgnt_yamakata_2_1:0 "Ōga" + b_shgnt_yamakata_2_2:0 "Ōga" + b_shgnt_onga_2_1:0 "Oka" + b_shgnt_onga_2_2:0 "Oka" + b_shgnt_munakata_2_1:0 "Tsutadake" + b_shgnt_mikasa_2_1:0 "Hōmanzan" + b_shgnt_ishimi_3_1:0 "Mangi" + b_shgnt_ishimi_3_2:0 "Mangi" + b_shgnt_chiba_3_1:0 "Oyumi" + b_shgnt_yokomi_1_1:0 "Matsuyama" + b_shgnt_kita_saitama_3_1:0 "Oshi" + b_shgnt_mogami_9_1:0 "Yamagata" + b_shgnt_kese_2_1:0 "Takata" + b_shgnt_kese_2_2:0 "Yonegasaki" + b_shgnt_iwai_5_1:0 "Usuginu" + b_shgnt_musa_3_1:0 "Narutō" + b_shgnt_amaha_1_1:0 "Sanuki" + b_shgnt_boshu_awa_1_1:0 "Tateyama" + b_shgnt_kii_1_1:0 "Toba" + b_shgnt_kii_3_1:0 "Fushimi" diff --git a/localization/japanese/dynasties/shgnt_dynasty_names_l_english.yml b/localization/japanese/dynasties/shgnt_dynasty_names_l_english.yml index bfe5b77..a25967a 100644 --- a/localization/japanese/dynasties/shgnt_dynasty_names_l_english.yml +++ b/localization/japanese/dynasties/shgnt_dynasty_names_l_english.yml @@ -353,4 +353,23 @@ # Suwa, 諏訪 dynn_Chino:0 "茅野" dynn_Takato:0 "高遠" - dynn_Fujisawa:0 "藤沢" \ No newline at end of file + dynn_Fujisawa:0 "藤沢" +# Murakami, 村上 + dynn_Yashiro:0 "屋代" + dynn_Muroga:0 "室賀" +# Satake, 佐竹 +dynn_Satake:0 "佐竹" +dynn_Okada:0 "岡田" +dynn_Minamisakaide:0 "南酒出" +dynn_Kitasakaide:0 "北酒出" +dynn_Nukata:0 "額田" +dynn_Toyoma:0 "豊間" +dynn_Takabe:0 "高部" +dynn_Nagakura:0 "長倉" +#dynn_Ouchi:0 "大内" +dynn_Mabuchi:0 "馬淵" +dynn_Ono:0 "小野" +dynn_Kume:0 "久米" +dynn_Hetare:0 "部垂" +dynn_Koba:0 "小場" +dynn_Inamoto:0 "稲本" \ 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 5749cfa..fd1795f 100644 --- a/localization/japanese/shgnt_titles_l_english.yml +++ b/localization/japanese/shgnt_titles_l_english.yml @@ -1295,7 +1295,7 @@ b_shgnt_takawa_5:0 "海辺荘" b_shgnt_takawa_6:0 "大和" b_shgnt_takawa_7:0 "狩川" - b_shgnt_takawa_8:0 "立谷澤" + b_shgnt_takawa_8:0 "羽黒山" b_shgnt_takawa_9:0 "斎" b_shgnt_akumi_1:0 "遊佐庄" b_shgnt_akumi_2:0 "屋代" @@ -1331,7 +1331,7 @@ b_shgnt_hiraka_5:0 "横手" b_shgnt_hiraka_6:0 "山内" b_shgnt_yuri_1:0 "下浜" - b_shgnt_yuri_2:0 "大正寺" + b_shgnt_yuri_2:0 "本城" b_shgnt_yuri_3:0 "小友" b_shgnt_yuri_4:0 "鮎川" b_shgnt_yuri_5:0 "平沢" @@ -2058,7 +2058,7 @@ b_shgnt_abu_5:0 "萩" b_shgnt_ito_1:0 "袴田" b_shgnt_ito_2:0 "恋野" - b_shgnt_ito_3:0 "紀見" + b_shgnt_ito_3:0 "金剛峯寺" b_shgnt_naga_1:0 "荒川庄" b_shgnt_naga_2:0 "神野" b_shgnt_naga_3:0 "名手" @@ -2336,7 +2336,7 @@ b_shgnt_kiku_2:0 "企救" b_shgnt_kiku_3:0 "朽網" b_shgnt_kiku_4:0 "門司" - b_shgnt_buzen_takawa_1:0 "添田" + b_shgnt_buzen_takawa_1:0 "英彦山" b_shgnt_buzen_takawa_2:0 "柿原名" b_shgnt_buzen_takawa_3:0 "伊方荘" b_shgnt_buzen_takawa_4:0 "糸田荘" @@ -2594,7 +2594,7 @@ b_shgnt_kawanohe_1:0 "別府城" b_shgnt_kawanohe_2:0 "川辺" b_shgnt_kawanohe_3:0 "加世田" - b_shgnt_kawanohe_4:0 "南方" + b_shgnt_kawanohe_4:0 "坊津" b_shgnt_ata_1:0 "田布施" b_shgnt_ata_2:0 "伊作" b_shgnt_hioki_1:0 "串木野" @@ -4146,3 +4146,23 @@ b_shgnt_hiraga_3_1:0 "大光寺城" b_shgnt_aita_10_1:0 "十狐城" b_shgnt_imizu_2_1:0 "放生津城" + b_shgnt_yamakata_2_1:0 "大桑城" + b_shgnt_yamakata_2_2:0 "大桑" + b_shgnt_onga_2_1:0 "岡城" + b_shgnt_onga_2_2:0 "岡" + b_shgnt_munakata_2_1:0 "蘿岳城" + b_shgnt_mikasa_2_1:0 "宝満山城" + b_shgnt_ishimi_3_1:0 "万喜城" + b_shgnt_ishimi_3_2:0 "万喜" + b_shgnt_chiba_3_1:0 "小弓城" + b_shgnt_yokomi_1_1:0 "松山城" + b_shgnt_kita_saitama_3_1:0 "忍城" + b_shgnt_mogami_9_1:0 "山形城" + b_shgnt_kese_2_1:0 "高田城" + b_shgnt_kese_2_2:0 "米ヶ崎城" + b_shgnt_iwai_5_1:0 "薄衣城" + b_shgnt_musa_3_1:0 "成東城" + b_shgnt_amaha_1_1:0 "佐貫城" + b_shgnt_boshu_awa_1_1:0 "館山城" + b_shgnt_kii_1_1:0 "鳥羽" + b_shgnt_kii_3_1:0 "伏見" diff --git a/map_data/default.map b/map_data/default.map index bbd3e35..ab38cff 100644 --- a/map_data/default.map +++ b/map_data/default.map @@ -21,6 +21,7 @@ sea_zones = RANGE { 2900 2901 } sea_zones = RANGE { 2913 3090 } sea_zones = RANGE { 3168 3175 } sea_zones = RANGE { 3180 3188 } +sea_zones = LIST { 3097 } ############### # MAJOR RIVERS diff --git a/map_data/heightmap.png b/map_data/heightmap.png index e02358e..783c0fb 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:8a7bced2bdfee15125439dda84fb335de43b14608f81d76bd0fea9ac9cfbfc97 -size 48063955 +oid sha256:c52ba155df5f17c3e25a88786197d7b35a60e148ddcee4fabe760f9e92e1889c +size 48064150 diff --git a/map_data/packed_heightmap.png b/map_data/packed_heightmap.png index c0b1d15..ea42bd9 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:fbb9ad197aa1489171b85b256ecbec25423c7bf97f47255ecf39297a630452a3 -size 33140095 +oid sha256:61a186b5e1698fe6f4eeb5b752c752303bab6227ba45fc6bea46baaee7292f04 +size 33140360