diff --git a/common/buildings/00_monotown_buildings.txt b/common/buildings/00_monotown_buildings.txt index 65dcd204..d1a930fc 100644 --- a/common/buildings/00_monotown_buildings.txt +++ b/common/buildings/00_monotown_buildings.txt @@ -384,7 +384,7 @@ monotown_01 = { culture = { has_innovation = innovation_city_planning } - government has_flag = government_is_urepublic + government_has_flag = government_is_urepublic } can_construct_showing_failures_only = { @@ -900,7 +900,7 @@ monotown_02 = { has_cultural_parameter = next_level_cities } } - government has_flag = government_is_urepublic + government_has_flag = government_is_urepublic } cost_gold = main_building_tier_2_cost @@ -1379,7 +1379,7 @@ monotown_03 = { has_innovation = innovation_manorialism } } - government has_flag = government_is_urepublic + government_has_flag = government_is_urepublic } cost_gold = main_building_tier_3_cost next_building = monotown_04 @@ -1858,7 +1858,7 @@ monotown_04 = { has_innovation = innovation_windmills } } - government has_flag = government_is_urepublic + government_has_flag = government_is_urepublic } cost_gold = main_building_tier_4_cost diff --git a/common/culture/cultures/NEOW_balto_finnic.txt b/common/culture/cultures/NEOW_balto_finnic.txt index a999810a..37f7fa56 100644 --- a/common/culture/cultures/NEOW_balto_finnic.txt +++ b/common/culture/cultures/NEOW_balto_finnic.txt @@ -12,7 +12,7 @@ tradition_fishermen } - name_list = name_list_finnish + name_list = name_list_NEOW_finnish coa_gfx = { balto_finnic_group_coa_gfx western_coa_gfx } building_gfx = { western_building_gfx } @@ -41,6 +41,7 @@ sami = { tradition_winter_warriors tradition_adaptive_skirmishing tradition_forest_wardens + tradition_midnight_herders } name_list = name_list_sami @@ -72,7 +73,7 @@ karelian = { tradition_swords_for_hire } - name_list = name_list_karelian + name_list = name_list_NEOW_finnish coa_gfx = { balto_finnic_group_coa_gfx western_coa_gfx } building_gfx = { western_building_gfx } diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index 61cf28bb..b671f530 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -201,7 +201,7 @@ charlesanthony_male = { Carlos_spc_Ant_o_act_n } charlesedward_male = { Carl-Edvard } charlesfrederick_male = { Carlfriedrich Karl-Friedrich } charleshenry_male = { Carle-Enri Karlheinz Karl-Heinz } -charlesjohn_male = { Karl-Hans Karl-Johan } +charlesjohn_male = { Carl-Johan Karl-Hans Karl-Johan } charleslouis_male = { Karl-Ludwig } charlesxavier_male = { Carlos_spc_Chabier } charya_male = { Chah_pst__i_hat_yya Charya Charyuh Cherryuh } diff --git a/common/culture/name_lists/NEOW_finnish.txt b/common/culture/name_lists/NEOW_finnish.txt index af2b4fab..9ac5b07f 100644 --- a/common/culture/name_lists/NEOW_finnish.txt +++ b/common/culture/name_lists/NEOW_finnish.txt @@ -197,10 +197,10 @@ name_list_NEOW_finnish = { Rea Reetta Regina Rita Rosa Saana Saija Saimi Salla Salme Sara Senja Siiri Sirkka Sirkka-Liisa Tia Tiia Tuire Tuuli - Vappu Venla Vieno Vilma Virve Vuokko + Vappu Venla Vieno Viivi Vilma Virve Vuokko } 1 = { - Ada Adalmiina Anitra Anna-Sofia Anni-Kristiina Axa + Ada Adalmiina Alviina Anitra Anna-Sofia Anni-Kristiina Axa Eija-Elina Eleonora Eva-Lisa Hannaleena Helen Inari diff --git a/common/culture/name_lists/NEOW_swedish.txt b/common/culture/name_lists/NEOW_swedish.txt index bddbb532..a03e3784 100644 --- a/common/culture/name_lists/NEOW_swedish.txt +++ b/common/culture/name_lists/NEOW_swedish.txt @@ -259,7 +259,7 @@ _O_uml_rjan Aage Alarik Algot Alvin Arnold Bengt-Urban Bernhard Brivio Bure - Carl-Axel Carl-Edvard Carl-Einar Casper Claes-Anders Claes-Bertil + Carl-Axel Carl-Edvard Carl-Einar Carl-Johan Casper Claes-Anders Claes-Bertil Edmund Edvard Elliot Elver Evald Eyvor Fillip Frankie Gehn_a_uml_ll_name Gideon Gordon Gunde Gustav-Adolf Guttorm diff --git a/common/culture/traditions/00_realm_traditions.txt b/common/culture/traditions/00_realm_traditions.txt index 2dcf6e74..270d3f8d 100644 --- a/common/culture/traditions/00_realm_traditions.txt +++ b/common/culture/traditions/00_realm_traditions.txt @@ -338,7 +338,7 @@ tradition_republican_legacy = { scope:character = { any_vassal = { primary_title.tier > tier_county - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } } } @@ -2279,7 +2279,7 @@ tradition_parochialism = { scope:character = { any_vassal = { primary_title.tier > tier_county - government_has_flag = government_is_special_republic + government_has_flag = government_is_republic } } } diff --git a/common/culture/traditions/NEOW_traditions.txt b/common/culture/traditions/NEOW_traditions.txt index ec105de1..b4760676 100644 --- a/common/culture/traditions/NEOW_traditions.txt +++ b/common/culture/traditions/NEOW_traditions.txt @@ -1019,4 +1019,116 @@ tradition_consanguinity_dynastic = { multiply = tradition_replacement_cost_if_relevant } } -} \ No newline at end of file +} + +tradition_midnight_herders = { + category = realm + + layers = { + 0 = steward + 2 = western + 4 = horses.dds + } + + can_pick = { + custom_tooltip = { + text = culture_in_taiga_desc + any_culture_county = { + percent >= 0.4 + any_county_province = { + OR = { + terrain = taiga + } + } + } + } + } + + parameters = { + taiga_wetland_pastures_allowed = yes + pastures_building_bonuses = yes + farm_estates_pastures_unlock = yes + better_herders_pasturalists = yes + } + + character_modifier = { + negate_health_penalty_add = 0.15 + prowess = 1 + taiga_fertility_growth_mult = low_culture_county_fertility_value_mult + forest_fertility_growth_mult = low_culture_county_fertility_value_mult + wetlands_fertility_growth_mult = low_culture_county_fertility_value_mult + } + + cost = { + prestige = { + add = { + value = tradition_base_cost + desc = BASE + format = "BASE_VALUE_FORMAT" + } + if = { + limit = { + NOR = { + culture_pillar:ethos_bellicose = { is_in_list = traits } + culture_pillar:ethos_stoic = { is_in_list = traits } + culture_pillar:ethos_communal = { is_in_list = traits } + } + } + add = { + value = tradition_incompatible_ethos_penalty + desc = not_bellicose_stoic_or_communal_desc + } + } + if = { + limit = { + NOT = { + any_culture_county = { + percent >= 0.6 + any_county_province = { + OR = { + terrain = taiga + } + } + } + } + } + add = { + value = tradition_unfulfilled_criteria_penalty + desc = culture_in_plains_or_steppe_terrain_percentage_desc + } + } + + if = { + limit = { + culture_tradition_reduction_trigger = { TRADITION = tradition_pastoralists } + } + multiply = { + value = 0.5 + desc = inspired_by_culture_desc + } + } + + multiply = tradition_replacement_cost_if_relevant + } + } + + ai_will_do = { + value = 200 + if = { + limit = { + NOT = { + scope:character = { + any_sub_realm_county = { + percent >= 0.6 + culture = scope:character.culture + county_has_province_with_terrain = { + terrain = taiga + } + } + } + } + } + multiply = 0 + } + } +} diff --git a/common/defines/00_defines.txt b/common/defines/00_defines.txt index 92faafc2..14600f91 100644 --- a/common/defines/00_defines.txt +++ b/common/defines/00_defines.txt @@ -214,6 +214,7 @@ NCharacter = { 16 #exc 68 #nice 69 #exc + 99 #godlike } SKILL_LEVELS_TEXTS = { "SKILL_TERRIBLE" @@ -223,6 +224,7 @@ NCharacter = { "SKILL_EXCELLENT" "SKILL_NICE" "SKILL_EXCELLENT" + "SKILL_GODLIKE" } SKILL_MODIFIER_OFFSET = -8 # skill modifiers with offset add this from skill value (see common/modifiers/00_basic_modifiers.txt) diff --git a/common/governments/00_government_types.txt b/common/governments/00_government_types.txt index 5d662c65..cc065bf1 100644 --- a/common/governments/00_government_types.txt +++ b/common/governments/00_government_types.txt @@ -633,7 +633,6 @@ landless_minority_government = { court_generate_spouses = yes council = yes always_use_patronym = yes - create_cadet_branches = yes rulers_should_have_dynasty = yes landless_playable = yes use_title_tier_modifiers = no @@ -659,7 +658,6 @@ landless_minority_government = { valid_holdings = { tribal_holding church_holding castle_holding city_holding temple_citadel_holding } character_modifier = { - active_accolades = -100 knight_limit = 2 character_travel_speed = 20 siege_weapon_siege_value_mult = -0.5 @@ -757,7 +755,6 @@ peasantrepublic_government = { men_at_arms_cap = -1 men_at_arms_limit = -1 knight_limit = -4 - active_accolades = -1 title_creation_cost_mult = 1.5 mercenary_hire_cost_mult = 2 men_at_arms_maintenance = 1.5 @@ -843,7 +840,6 @@ urbanrepublic_government = { men_at_arms_cap = 2 men_at_arms_limit = 2 knight_limit = -4 - active_accolades = -1 title_creation_cost_mult = 1.5 mercenary_hire_cost_mult = -0.25 men_at_arms_maintenance = 2 @@ -1138,11 +1134,6 @@ celestial_government = { has_special_house_aspirations } - # The hegemon cannot reassign ministers - ai_can_reassign_council_positions = { - primary_title != title:h_china - } - currency_levels_cap = { merit = 9 } diff --git a/common/landed_titles/germany.txt b/common/landed_titles/germany.txt index 516c481b..c6fe00bc 100644 --- a/common/landed_titles/germany.txt +++ b/common/landed_titles/germany.txt @@ -2161,7 +2161,7 @@ e_germany = { } b_gorlitz = { # Görlitz - province = 3163 + province = 3136 color = { 240 115 75 } cultural_names = { @@ -2178,16 +2178,27 @@ e_germany = { name_list_NEOW_slovak = cn_z_a_act_padn_e_act__zhorelec } } - b_weisswasser = { + b_weisswasser = { # Żagań province = 3066 color = { 240 115 75 } + + cultural_names = { + name_list_NEOW_low_saxon = cn_sagan + name_list_NEOW_bavarian = cn_sagan + name_list_NEOW_swabian = cn_sagan + name_list_NEOW_palatine = cn_sagan + name_list_NEOW_rhinelander = cn_sagan + name_list_NEOW_brandenburger = cn_sagan + name_list_NEOW_sorbian = cn__z_crn_aha_n_act_ + name_list_NEOW_czech = cn_zah_a_act__n_crn_ + } } b_lobau = { province = 2980 color = { 215 160 130 } } b_boxburg = { - province = 3136 + province = 3070 color = { 215 160 130 } } b_zittau = { diff --git a/common/nicknames/NEOW_nicknames.txt b/common/nicknames/NEOW_nicknames.txt index fa82c74f..ce025892 100644 --- a/common/nicknames/NEOW_nicknames.txt +++ b/common/nicknames/NEOW_nicknames.txt @@ -8,4 +8,7 @@ nick_the_mighty = {} nick_the_senan = {} nick_the_soldier = {} nick_the_white_ermine = {} -nick_the_saltspite = {} \ No newline at end of file +nick_the_saltspite = {} +nick_NEOW_the_menhir = {} +nick_NEOW_the_phantom = {} +nick_NEOW_the_oracle = {} \ No newline at end of file diff --git a/common/scripted_triggers/00_building_requirement_triggers.txt b/common/scripted_triggers/00_building_requirement_triggers.txt index fd41c1ef..52663531 100644 --- a/common/scripted_triggers/00_building_requirement_triggers.txt +++ b/common/scripted_triggers/00_building_requirement_triggers.txt @@ -175,6 +175,15 @@ building_pastures_requirement_terrain = { terrain = jungle NOT = { geographical_region = world_innovation_elephants } } + AND = { + OR = { + terrain = taiga + terrain = wetlands + } + culture = { + has_cultural_parameter = taiga_wetland_pastures_allowed + } + } } } diff --git a/gui/shared/lists.gui b/gui/shared/lists.gui index 72260f97..6b43f171 100644 --- a/gui/shared/lists.gui +++ b/gui/shared/lists.gui @@ -2113,7 +2113,7 @@ types Lists layoutpolicy_vertical = expanding margin_left = 10 hbox = { - visible = "[Character.GetGovernment.IsType('urbanrepublic_government'))]" + visible = "[Character.GetGovernment.IsType('urbanrepublic_government')]" spacing = 3 expand = {} icon = { diff --git a/history/characters/NEOW_e_france.txt b/history/characters/NEOW_e_france.txt index 708d6a7f..49066fdf 100644 --- a/history/characters/NEOW_e_france.txt +++ b/history/characters/NEOW_e_france.txt @@ -44,6 +44,7 @@ france0004 = { trait = honest trait = lifestyle_poet trait = disfigured + give_nickname=nick_NEOW_the_phantom 2512.1.1 = { birth = yes } @@ -894,6 +895,7 @@ france_menhir_obelix = { trait = gluttonous trait = content father = france_gaulle_vitalstatistix + give_nickname=nick_NEOW_the_menhir 2513.6.8 = { birth = yes } diff --git a/history/characters/NEOW_e_greece.txt b/history/characters/NEOW_e_greece.txt index e71ff4bf..b12963d0 100644 --- a/history/characters/NEOW_e_greece.txt +++ b/history/characters/NEOW_e_greece.txt @@ -400,7 +400,8 @@ greece0034 = { # name = "Kheírōn" dynasty = pherae_dynasty religion = "megalocratic" - culture = NEOW_cappadocian + culture = NEOW_cappadocian + give_nickname=nick_NEOW_the_oracle trait = education_learning_4 trait = brave trait = patient @@ -666,7 +667,7 @@ greece0045 = { # ####Albanians#### albania0001 = { #Tirana - name = "Ismail" + name = "Sadik" dynasty = qemali_dynasty religion = "alevi" culture = NEOW_albanian diff --git a/history/provinces/e_germany.txt b/history/provinces/e_germany.txt index 48d73372..c26795c3 100644 --- a/history/provinces/e_germany.txt +++ b/history/provinces/e_germany.txt @@ -927,7 +927,7 @@ } ##d_upper_lusatia ###c_gorlitz -3070 = { +3136 = { culture = sorbian religion = roman_catholic holding = castle_holding @@ -946,7 +946,7 @@ religion = volksmarchen } } -3136 = { +3070 = { holding = none } 4135 = { diff --git a/localization/english/replace/NEOW_nicknames_l_english.yml b/localization/english/replace/NEOW_nicknames_l_english.yml index 2bc3c210..68823ca1 100644 --- a/localization/english/replace/NEOW_nicknames_l_english.yml +++ b/localization/english/replace/NEOW_nicknames_l_english.yml @@ -5,6 +5,12 @@ nick_the_senan_desc:1 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] [CharWereWas(CHARACTER)] raised on the island of Sein, and [CharWereWas(CHARACTER)] known for [CharYourHerHis(CHARACTER)] love of it." nick_the_soldier:0 "the Soldier" nick_the_white_ermine:0 "the White Ermine" - nick_the_white_ermine_desc:1 ""#italic Kentoc'h mervel eget bezañ saotret!#!" - Rather death than dishonour! Like the beast adorning the flag of [CharYourHerHis(CHARACTER)] people, [CHARACTER.GetShortUINameNoTooltipNoFormat|U] would die rather than stain [CharYourHerHis(CHARACTER)]'s honour." + nick_the_white_ermine_desc:1 ""#italic Kentoc'h mervel eget bezañ saotret!#!" - Rather death than dishonour! Like the beast adorning the flag of [CharYourHerHis(CHARACTER)] people, [CHARACTER.GetShortUINameNoTooltipNoFormat|U] would die rather than stain [CharYourHerHis(CHARACTER)] honour." nick_the_saltspite:0 "Saltspite" - nick_the_saltspite_desc:1 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] [CharAreIs(CHARACTER)] known for two things. His spiteful nature, and his love of the sea." \ No newline at end of file + nick_the_saltspite_desc:1 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] [CharAreIs(CHARACTER)] known for two things. His spiteful nature, and his love of the sea." + nick_NEOW_the_menhir:0 "the Menhir" + nick_NEOW_the_menhir_desc:1 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] towers over every man, and [CharAreIs(CHARACTER)] sometimes even mistaken for a standing stone of old." + nick_NEOW_the_phantom:0 "the Phantom" + nick_NEOW_the_phantom_desc:1 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] is known for [CharYourHerHis(CHARACTER)] love of the shadows, terrifying courtiers when finally spotted." + nick_NEOW_the_oracle:0 "the Oracle" + nick_NEOW_the_oracle_desc:1 "They say that [CHARACTER.GetShortUINameNoTooltipNoFormat|U] predicted the fall of the Empire many years ago, earning [CharYourHerHimself(CHARACTER)] a prophetic reputation." \ No newline at end of file diff --git a/localization/english/replace/culture/traditions/zz_NEOW_cultural_traditions_l_english.yml b/localization/english/replace/culture/traditions/zz_NEOW_cultural_traditions_l_english.yml index 5fcb23a2..e152dc6d 100644 --- a/localization/english/replace/culture/traditions/zz_NEOW_cultural_traditions_l_english.yml +++ b/localization/english/replace/culture/traditions/zz_NEOW_cultural_traditions_l_english.yml @@ -42,4 +42,10 @@ # MAA Unlocks culture_parameter_unlock_maa_handgonners:0 "Can recruit [GetMaA('handgonners').GetName] as [men_at_arms|E]" - culture_parameter_unlock_maa_kuhjung:0 "Can recruit [GetMaA('cowboys').GetName] as [men_at_arms|E]" \ No newline at end of file + culture_parameter_unlock_maa_kuhjung:0 "Can recruit [GetMaA('cowboys').GetName] as [men_at_arms|E]" + + # + tradition_midnight_herders_name:0 "Midnight Herders" + tradition_midnight_herders_desc:1 "This culture has made their home in the far north, raising great herds of reindeer on the frozen tundra." + culture_in_taiga_desc:0 "The [culture|E] does not have #V 40%#! of its [counties|E] in Taiga[terrain|E]" + culture_parameter_taiga_wetland_pastures_allowed:0 "The [GetBuilding('pastures_01').GetTypeName|V] line of [buildings|E] may be built in [GetTerrain( 'taiga' ).GetName] and [GetTerrain( 'wetlands' ).GetName]" \ No newline at end of file diff --git a/localization/english/replace/names/NEOW_character_names_l_english.yml b/localization/english/replace/names/NEOW_character_names_l_english.yml index 0b87c3ea..f2af1794 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -11170,4 +11170,6 @@ Bure:0 "Bure" Perttu:0 "Perttu" Saija:0 "Saija" + Alviina:0 "Alviina" + Viivi:0 "Viivi" \ No newline at end of file diff --git a/map_data/provinces.png b/map_data/provinces.png index 01640eeb..84b34ec8 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf1f57c42e22784d3c31719042a725358b336c513d37848ade288c08fb359817 -size 2557598 +oid sha256:47de7acc168ebd9f4505de4037cf885c4a03847fe5b28d6de3ff3c0f33b0b4e2 +size 2636896