diff --git a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt index 36b2e10b2..1b21c318c 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt @@ -23076,81 +23076,11 @@ k_royal_household ={ instance={ position={ 0.145000 0.660000 } scale={ 0.200000 0.200000 } - depth=1.010000 } } - colored_emblem={ - color1=red - color2=blue - texture="ce_lion_rampant.dds" - instance={ - position={ 0.750000 0.250000 } - scale={ 0.300000 0.300000 } - depth=5.010000 - } - - } - - colored_emblem={ - color1=yellow - color2=blue - color3=black - texture="ce_leopard_passant_guardant.dds" - instance={ - position={ 0.750000 0.750000 } - scale={ 0.500000 0.500000 } - depth=3.010000 - } - - instance={ - position={ 0.750000 0.600000 } - scale={ 0.500000 0.500000 } - depth=4.010000 - } - - instance={ - position={ 0.250000 0.400000 } - scale={ 0.500000 0.500000 } - depth=8.010000 - } - - instance={ - position={ 0.250000 0.100000 } - scale={ 0.500000 0.500000 } - depth=9.010000 - } - - instance={ - position={ 0.250000 0.250000 } - scale={ 0.500000 0.500000 } - depth=10.010000 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_block_02.dds" - instance={ - position={ 1.000000 0.000000 } - depth=6.010000 - } - - } - - colored_emblem={ - color1=red - texture="ce_double_tressure.dds" - instance={ - position={ 0.750000 0.250000 } - scale={ 0.600000 0.500000 } - } - - } - -} +} d_et_crimea={ pattern="pattern_horizontal_split_01.dds" color1=blue @@ -23279,7 +23209,13 @@ d_et_montenegro={ position={ 0.250000 0.250000 } scale={ 0.500000 0.500000 } depth=10.010000 + color1=blue + texture="ce_block_01.dds" + instance={ + position={ 0.500000 0.070000 } + depth=3.010000 } + } colored_emblem={ @@ -23312,6 +23248,10 @@ d_et_montenegro={ colored_emblem={ color1=red + texture="ce_double_tressure.dds" + instance={ + position={ 0.750000 0.250000 } + scale={ 0.600000 0.500000 } texture="ce_cross_patriarchal.dds" instance={ position={ 0.500000 0.390000 } diff --git a/common/culture/eras/00_culture_eras.txt b/common/culture/eras/00_culture_eras.txt index 04b190095..e8ab2d024 100644 --- a/common/culture/eras/00_culture_eras.txt +++ b/common/culture/eras/00_culture_eras.txt @@ -4,7 +4,7 @@ culture_era_tribal = { } culture_era_early_medieval = { - year = 2200 + year = 2300 invalid_for_government = tribal_government invalid_for_government = nomad_government invalid_for_government = herder_government @@ -37,7 +37,7 @@ culture_era_early_medieval = { } culture_era_high_medieval = { - year = 2450 + year = 2500 invalid_for_government = tribal_government invalid_for_government = nomad_government invalid_for_government = herder_government @@ -81,7 +81,7 @@ culture_era_high_medieval = { } culture_era_late_medieval = { - year = 2575 + year = 2750 invalid_for_government = tribal_government invalid_for_government = nomad_government invalid_for_government = herder_government diff --git a/common/culture/innovations/00_early_medieval_innovations.txt b/common/culture/innovations/00_early_medieval_innovations.txt index 4632da20b..1ad0eeb8c 100644 --- a/common/culture/innovations/00_early_medieval_innovations.txt +++ b/common/culture/innovations/00_early_medieval_innovations.txt @@ -31,7 +31,6 @@ @coinage = "gfx/interface/icons/culture_innovations/innovation_coinage.dds" @horseshoes = "gfx/interface/icons/culture_innovations/innovation_horseshoes.dds" @cloud_ladder = "gfx/interface/icons/culture_innovations/innovation_auh_cloud_ladder.dds" -@knighthood = "gfx/interface/icons/culture_innovations/innovation_knighthood.dds" @camel = "gfx/interface/icons/culture_innovations/innovation_camel.dds" @elephant = "gfx/interface/icons/culture_innovations/innovation_elephant.dds" @@ -177,6 +176,19 @@ innovation_arched_saddle = { flag = early_medieval_era_regular } +#culture_group_civic +innovation_hereditary_rule = { + skill = diplomacy + group = culture_group_civic + culture_era = culture_era_early_medieval + icon = @majesty_02 + + unlock_law = partition_succession_law + + flag = global_regular + flag = early_medieval_era_regular +} + innovation_manorialism = { skill = stewardship group = culture_group_civic @@ -222,25 +234,6 @@ innovation_currency_02 = { flag = early_medieval_era_regular } -innovation_knighthood = { - skill = martial - group = culture_group_military - culture_era = culture_era_early_medieval - icon = @knighthood - - character_modifier = { - active_accolades = 1 - glory_hound_opinion = 5 - knight_effectiveness_mult = 0.2 - accolade_glory_gain_mult = 0.1 - } - custom = students_of_knighthood - custom = more_glory_hounds - - flag = global_regular - flag = early_medieval_era_regular -} - innovation_royal_prerogative = { skill = diplomacy group = culture_group_civic diff --git a/common/culture/innovations/00_high_medieval_innovations.txt b/common/culture/innovations/00_high_medieval_innovations.txt index 4f46a92df..fbd75116a 100644 --- a/common/culture/innovations/00_high_medieval_innovations.txt +++ b/common/culture/innovations/00_high_medieval_innovations.txt @@ -29,6 +29,7 @@ @coins = "gfx/interface/icons/culture_innovations/innovation_welfare_01.dds" @misc_inventions = "gfx/interface/icons/culture_innovations/innovation_misc_inventions.dds" @advanced_bowmaking = "gfx/interface/icons/culture_innovations/innovation_advanced_bowmaking.dds" +@knighthood = "gfx/interface/icons/culture_innovations/innovation_knighthood.dds" @heraldry = "gfx/interface/icons/culture_innovations/innovation_heraldry.dds" @windmills = "gfx/interface/icons/culture_innovations/innovation_windmills.dds" @siege_tower = "gfx/interface/icons/culture_innovations/innovation_auh_siege_tower.dds" @@ -107,6 +108,25 @@ innovation_men_at_arms = { flag = high_medieval_era_regular } +innovation_knighthood = { + skill = martial + group = culture_group_military + culture_era = culture_era_high_medieval + icon = @knighthood + + character_modifier = { + active_accolades = 1 + glory_hound_opinion = 5 + knight_effectiveness_mult = 0.2 + accolade_glory_gain_mult = 0.1 + } + custom = students_of_knighthood + custom = more_glory_hounds + + flag = global_regular + flag = high_medieval_era_regular +} + innovation_advanced_bowmaking = { skill = learning group = culture_group_military @@ -133,9 +153,8 @@ innovation_heraldry = { culture_era = culture_era_high_medieval icon = @heraldry + unlock_law = high_partition_succession_law unlock_law = single_heir_dynasty_house - unlock_law = single_heir_succession_law - unlock_law = single_heir_succession_law_youngest custom = more_courtly flag = global_regular diff --git a/common/culture/innovations/00_late_medieval_innovations.txt b/common/culture/innovations/00_late_medieval_innovations.txt index a9d692028..a1313c5e9 100644 --- a/common/culture/innovations/00_late_medieval_innovations.txt +++ b/common/culture/innovations/00_late_medieval_innovations.txt @@ -146,6 +146,21 @@ innovation_plate_armor = { flag = late_medieval_era_regular } +#culture_group_civic +innovation_primogeniture = { + skill = diplomacy + group = culture_group_civic + culture_era = culture_era_late_medieval + icon = @majesty_01 + + unlock_law = single_heir_succession_law + unlock_law = single_heir_succession_law_youngest + + custom = more_zealot + + flag = global_regular + flag = late_medieval_era_regular +} innovation_cranes = { skill = stewardship diff --git a/common/culture/innovations/00_tribal_innovations.txt b/common/culture/innovations/00_tribal_innovations.txt index f4c3f2949..0be5f0163 100644 --- a/common/culture/innovations/00_tribal_innovations.txt +++ b/common/culture/innovations/00_tribal_innovations.txt @@ -216,8 +216,6 @@ innovation_gavelkind = { icon = @administration_3 unlock_law = confederate_partition_succession_law - unlock_law = high_partition_succession_law - unlock_law = partition_succession_law character_modifier = { domain_limit = 1 diff --git a/common/scripted_triggers/00_succession_triggers.txt b/common/scripted_triggers/00_succession_triggers.txt index 894ea3292..2f09a11f6 100644 --- a/common/scripted_triggers/00_succession_triggers.txt +++ b/common/scripted_triggers/00_succession_triggers.txt @@ -27,7 +27,6 @@ historical_succession_access_single_heir_succession_law_trigger = { limit = { government_has_mechanic = administrative } OR = { tgp_japan_single_heir_succession_override_trigger = yes - tgp_britain_single_heir_succession_override_trigger = yes tgp_korea_single_heir_succession_override_trigger = yes has_title = title:e_hindustan has_title = title:h_china diff --git a/common/scripted_triggers/10_tgp_japan_triggers.txt b/common/scripted_triggers/10_tgp_japan_triggers.txt index 8d6d2792b..132cdf705 100644 --- a/common/scripted_triggers/10_tgp_japan_triggers.txt +++ b/common/scripted_triggers/10_tgp_japan_triggers.txt @@ -8,15 +8,6 @@ tgp_is_japanese_kampaku_trigger = { } } -tgp_is_british_primeminsiter_trigger = { - has_title = title:e_japan - NOR = { - has_title = title:k_royal_household - has_global_variable = tenno_restored - has_global_variable = shogunate_established - } -} - tgp_is_japanese_governor_trigger = { custom_tooltip = { text = tgp_is_japanese_governor_trigger @@ -258,19 +249,6 @@ can_have_japanese_regency_succession_law_trigger = { } } -can_have_japanese_regency_succession_law_trigger = { - has_tgp_dlc_trigger = yes - is_independent_ruler = yes - government_has_flag = government_is_british_administrative - OR = { - has_title = title:k_royal_household - any_vassal_or_below = { has_title = title:k_royal_household } - } - NOT = { - has_global_variable = tenno_restored - } -} - can_have_japanese_appointment_succession_law_trigger = { has_tgp_dlc_trigger = yes government_has_flag = government_is_japan_administrative @@ -278,13 +256,6 @@ can_have_japanese_appointment_succession_law_trigger = { NOT = { has_title = title:k_chrysanthemum_throne } } -can_have_japanese_appointment_succession_law_trigger = { - has_tgp_dlc_trigger = yes - government_has_flag = government_is_british_administrative - is_independent_ruler = no - NOT = { has_title = title:k_royal_household } -} - can_keep_japanese_appointment_succession_law_trigger = { has_tgp_dlc_trigger = yes trigger_if = { @@ -308,17 +279,6 @@ tgp_japan_single_heir_succession_override_trigger = { } } -tgp_britain_single_heir_succession_override_trigger = { - save_temporary_scope_as = holder_temp - OR = { - title:k_royal_household.holder ?= scope:holder_temp - AND = { - #has_global_variable = tenno_restored - title:e_britannia.holder ?= scope:holder_temp - } - } -} - tgp_blocked_action_against_tenno_trigger = { custom_description = { text = tgp_blocked_ruler_against_ceremonial_action_trigger @@ -339,26 +299,6 @@ tgp_blocked_ruler_against_ceremonial_action_trigger = { } } -tgp_blocked_action_against_king_emperor_trigger = { - custom_description = { - text = tgp_blocked_ruler_against_ceremonial_action_trigger - NAND = { - $TARGET$ = { has_title = title:k_royal_household } - $TARGET$.top_liege = $ACTOR$.top_liege - } - } -} - -tgp_blocked_ruler_against_ceremonial_action_trigger = { - custom_description = { - text = tgp_blocked_ruler_against_ceremonial_action_trigger - NAND = { - $TENNO$ = { has_title = title:k_royal_household} - $REGENT$ = $TENNO$.liege - } - } -} - #japan_house_name_county_trigger = { # exists = $TITLE$ # save_temporary_scope_as = new_head_temp diff --git a/history/titles/NEOW_other_titles.txt b/history/titles/NEOW_other_titles.txt index d0d3b8b28..d253d78fe 100644 --- a/history/titles/NEOW_other_titles.txt +++ b/history/titles/NEOW_other_titles.txt @@ -58,12 +58,7 @@ k_royal_household = { # Ceremonial Emperor/Ten'nō name = ceremonial_title value = title:e_britannia } - - } - } - 2000.1.1 = { - effect = { - add_title_law = single_heir_succession_law # Regency inherited separately + add_title_law = single_heir_succession_law # Regency inherited separately } } 2555.1.1 = {