diff --git a/common/culture/cultures/NEOW_french.txt b/common/culture/cultures/NEOW_french.txt index b91a228b..1d447ba2 100644 --- a/common/culture/cultures/NEOW_french.txt +++ b/common/culture/cultures/NEOW_french.txt @@ -377,14 +377,16 @@ gascon = { beur = { color = { 0.4 0.9 0.9 } - ethos = ethos_spiritual - heritage = heritage_arabic + ethos = ethos_communal + heritage = heritage_berber language = language_french martial_custom = martial_custom_equal traditions = { tradition_maritime_mercantilism tradition_chivalry tradition_practiced_pirates + tradition_horse_breeder + tradition_diasporic } name_list = name_list_maghrebi diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 2d45c8c2..999471e2 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -1232,9 +1232,9 @@ default_coastal_sea=coastal_sea 1507=farmlands 1508=farmlands 1509=forest -1510=plains +1510=tells 1511=plains -1512=plains +1512=tells 1513=forest 1514=plains 1515=plains @@ -1248,11 +1248,11 @@ default_coastal_sea=coastal_sea 1523=wetlands 1524=plains 1525=plains -1526=farmlands -1527=farmlands -1528=farmlands -1529=farmlands -1530=farmlands +1526=tells +1527=tells +1528=tells +1529=tells +1530=tells 1531=plains 1532=plains 1533=forest @@ -2055,9 +2055,9 @@ default_coastal_sea=coastal_sea 2330=plains 2331=plains 2332=plains -2333=farmlands -2334=farmlands -2335=farmlands +2333=tells +2334=tells +2335=tells 2336=farmlands 2337=farmlands 2338=farmlands @@ -2078,8 +2078,8 @@ default_coastal_sea=coastal_sea 2353=farmlands 2354=farmlands 2355=farmlands -2356=farmlands -2357=farmlands +2356=tells +2357=tells 2358=farmlands 2359=farmlands 2360=plains @@ -8869,5 +8869,6 @@ default_coastal_sea=coastal_sea 9691=plains 9692=farmlands 9693=plains +9734=tells 9740=farmlands 9741=farmlands \ No newline at end of file diff --git a/common/terrain_types/00_terrains.txt b/common/terrain_types/00_terrains.txt new file mode 100644 index 00000000..4b4a1589 --- /dev/null +++ b/common/terrain_types/00_terrains.txt @@ -0,0 +1,407 @@ +@provisions_cost_minimal = 25 +@provisions_cost_light = 50 +@provisions_cost_medium = 80 +@provisions_cost_high = 100 +@provisions_cost_extreme = 150 + +plains = { + color = hsv { 0.1 0.5 0.8 } + travel_danger_color = hsv { 0.1 0.5 0.8 } + travel_danger_score = 10 + provision_cost = @provisions_cost_light + county_fertility = 30 + + province_modifier = { + supply_limit_mult = 0 + travel_danger = 10 + county_fertility_growth_add = plains_county_fertility_value + } + + audio_parameter = 1.0 +} + +sea = { + color = hsv { 0.0 0.0 0.1 0 } + travel_danger_color = hsv { 0.00 0.00 1.00 0.00 } + travel_danger_score = 20 + provision_cost = @provisions_cost_high + + province_modifier = { + travel_danger = 75 + + } +} + +coastal_sea = { + color = hsv { 0.0 0.0 0.1 0 } + travel_danger_color = hsv { 0.00 0.00 1.00 0.00 } + travel_danger_score = 20 + provision_cost = @provisions_cost_medium + + province_modifier = { + travel_danger = 50 + } +} + +farmlands = { + color = hsv { 0 1 1 } + provision_cost = @provisions_cost_minimal + county_fertility = 40 + + province_modifier = { + supply_limit_mult = 0.5 + county_fertility_growth_add = farmlands_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = 0.2 + } + + audio_parameter = 1.0 +} + +hills = { + color = hsv { 29 0.867 0.353 } + travel_danger_color = hsv { 29 0.6 0.353 } + travel_danger_score = hills_danger_value + provision_cost = @provisions_cost_light + county_fertility = 20 + + province_modifier = { + supply_limit_mult = -0.1 + travel_danger = hills_danger_value + county_fertility_growth_add = hills_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.1 + } + + defender_combat_effects = { + name = combat_hills + image = combat_hills + advantage = 5 + } + + movement_speed = 0.8 + combat_width = 0.8 + + audio_parameter = 1.0 +} + +mountains = { + color = hsv { 0 0 0.392 } + travel_danger_color = hsv { 0 0 0.392 } + travel_danger_score = mountains_danger_value + provision_cost = @provisions_cost_extreme + county_fertility = 15 + + province_modifier = { + supply_limit_mult = -0.5 + travel_danger = mountains_danger_value + county_fertility_growth_add = mountains_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.25 + } + + defender_combat_effects = { + name = combat_mountain + image = combat_mountain + advantage = 12 + } + + movement_speed = 0.5 + combat_width = 0.5 + + audio_parameter = 6.0 +} + +desert = { + color = hsv { 0.15 1 1 } #{ 225 255 0 } + travel_danger_color = hsv { 0.16 0.7 0.8 } + travel_danger_score = desert_danger_value + provision_cost = @provisions_cost_extreme + county_fertility = 20 + + province_modifier = { + supply_limit_mult = -0.3 + travel_danger = desert_danger_value + county_fertility_growth_add = desert_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.5 + } + + movement_speed = 0.7 + + audio_parameter = 2.0 +} + +desert_mountains = { + color = hsv { 0.7 0.5 0.15 } + travel_danger_color = hsv { 0 0 0.392 } + travel_danger_score = desert_mountains_danger_value + provision_cost = @provisions_cost_extreme + county_fertility = 20 + + province_modifier = { + supply_limit_mult = -0.6 + travel_danger = desert_mountains_danger_value + county_fertility_growth_add = desert_mountains_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.5 + } + + defender_combat_effects = { + name = combat_desert_mountains + image = defender_desert_mountains + advantage = 12 + } + + defender_modifier = { + retreat_losses = -0.3 + } + + movement_speed = 0.5 + combat_width = 0.5 + + audio_parameter = 7.0 +} + +oasis = { + color = hsv { 0.7 0.3 0.8 } + travel_danger_color = hsv { 0.16 0.7 0.8 } + travel_danger_score = 10 + provision_cost = @provisions_cost_minimal + county_fertility = 30 + + province_modifier = { + supply_limit_mult = 0.1 + travel_danger = 10 + county_fertility_growth_add = oasis_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = 0.1 + } + + movement_speed = 1 + + audio_parameter = 10.0 +} + +jungle = { + color = { 10 60 35 } + travel_danger_color = { 10 60 35 } + travel_danger_score = jungle_danger_value + provision_cost = @provisions_cost_high + county_fertility = 10 + + province_modifier = { + supply_limit_mult = -0.25 + travel_danger = jungle_danger_value + county_fertility_growth_add = jungle_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.4 + } + + defender_combat_effects = { + name = combat_jungle + image = defender_jungle + advantage = 6 + } + + movement_speed = 0.5 + combat_width = 0.7 + + audio_parameter = 8.0 +} + +forest = { + color = hsv { 0.3 0.75 0.7 } #50 255 25 + travel_danger_color = hsv { 0.37 0.8 0.5 } + travel_danger_score = forest_danger_value + provision_cost = @provisions_cost_light + county_fertility = 15 + + province_modifier = { + supply_limit_mult = -0.1 + travel_danger = forest_danger_value + county_fertility_growth_add = forest_county_fertility_value + } + + defender_combat_effects = { + name = combat_forest + image = defender_forest + advantage = 3 + } + + movement_speed = 0.8 + combat_width = 0.9 + + audio_parameter = 4.0 + + entity = "forest_birds_01" +} + +taiga = { + color = hsv { 0.4 0.7 0.6 } #0 90 0 + travel_danger_color = hsv { 0.37 0.8 0.5 } + travel_danger_score = taiga_danger_value + provision_cost = @provisions_cost_high + county_fertility = 15 + + province_modifier = { + supply_limit_mult = -0.2 + travel_danger = taiga_danger_value + county_fertility_growth_add = taiga_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.05 + } + + defender_combat_effects = { + name = combat_taiga + image = defender_taiga + advantage = 4 + } + + movement_speed = 0.8 + combat_width = 0.8 + + audio_parameter = 9.0 +} + +wetlands = { + color = hsv { 0.5 0.5 0.6 } #75 200 200 + travel_danger_color = { 47 128 97 } + travel_danger_score = wetlands_danger_value + provision_cost = @provisions_cost_medium + county_fertility = 20 + + province_modifier = { + supply_limit_mult = -0.25 + travel_danger = wetlands_danger_value + county_fertility_growth_add = wetlands_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.25 + } + + attacker_modifier = { + hard_casualty_modifier = 0.2 + retreat_losses = 0.25 + } + + defender_modifier = { + hard_casualty_modifier = 0.2 + retreat_losses = 0.25 + } + + defender_combat_effects = { + name = combat_wetlands + image = defender_wetlands + advantage = 5 + } + + movement_speed = 0.7 + combat_width = 0.6 + + audio_parameter = 3.0 +} + +steppe = { + color = { 200 100 25 } + travel_danger_color = hsv { 0.16 0.7 0.8 } + travel_danger_score = steppe_danger_value + provision_cost = @provisions_cost_medium + county_fertility = 30 + + province_modifier = { + supply_limit_mult = 0 + travel_danger = steppe_danger_value + county_fertility_growth_add = steppe_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.5 + } + + audio_parameter = 5.0 +} + +floodplains = { + color = hsv { 0.7 0.8 0.6 } #200 50 100 + travel_danger_color = { 47 128 97 } + travel_danger_score = floodplains_danger_value + provision_cost = @provisions_cost_minimal + county_fertility = 30 + + province_modifier = { + supply_limit_mult = 0.35 + travel_danger = floodplains_danger_value + county_fertility_growth_add = floodplains_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = 0.2 + } + + combat_width = 0.75 + + audio_parameter = 2.0 +} + +drylands = { + color = { 220 45 120 } + travel_danger_color = hsv { 0.16 0.7 0.8 } + travel_danger_score = drylands_danger_value + provision_cost = @provisions_cost_medium + county_fertility = 25 + + province_modifier = { + supply_limit_mult = 0 + travel_danger = drylands_danger_value + county_fertility_growth_add = drylands_county_fertility_value + } + + county_capital_modifier = { + development_growth_factor = -0.05 + } + + audio_parameter = 1.0 +} + +tells = { + color = { 161 102 95 } + travel_danger_color = { 61 102 95 } + travel_danger_score = hills_danger_value + provision_cost = @provisions_cost_medium + county_fertility = 25 + + province_modifier = { + supply_limit_mult = -0.1 + travel_danger = hills_danger_value + county_fertility_growth_add = hills_county_fertility_value + } + + defender_combat_effects = { + name = combat_tells + image = combat_tells + advantage = 8 + } + + movement_speed = 0.75 + combat_width = 0.8 + + audio_parameter = 1.0 +} \ No newline at end of file diff --git a/gfx/interface/icons/terrain_types/tells.dds b/gfx/interface/icons/terrain_types/tells.dds new file mode 100644 index 00000000..2bb3b834 --- /dev/null +++ b/gfx/interface/icons/terrain_types/tells.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e882f4c297d86fb95d4979ce2eaf98f7ccf3fecc12ae72498eedffa1b080f31 +size 1928 diff --git a/gfx/interface/illustrations/loading_screens/loadscreen_settings.txt b/gfx/interface/illustrations/loading_screens/loadscreen_settings.txt index d39d490c..022fd3da 100644 --- a/gfx/interface/illustrations/loading_screens/loadscreen_settings.txt +++ b/gfx/interface/illustrations/loading_screens/loadscreen_settings.txt @@ -1,6 +1,6 @@ -bike = { priority = 50 } -paris = { priority = 50 } -andorra = { priority = 50 } -bhutan = { priority = 50 } -shepherd = { priority = 50 } -numenor = { priority = 50 } +bike = { priority = 100 } +paris = { priority = 100 } +andorra = { priority = 100 } +bhutan = { priority = 100 } +shepherd = { priority = 100 } +numenor = { priority = 100 } diff --git a/history/provinces/k_france.txt b/history/provinces/k_france.txt index 2009a88d..ecc0b8ab 100644 --- a/history/provinces/k_france.txt +++ b/history/provinces/k_france.txt @@ -258,6 +258,8 @@ holding = castle_holding } 2266 = { #MAYENNE + culture = galo + religion = victorian holding = castle_holding } 2265 = { #LAVAL @@ -734,7 +736,7 @@ 2349 = { #VEZELAY culture = bourguignon religion = carolingian - holding = church_holding + holding = castle_holding } 2378 = { #MORVAN holding = none diff --git a/localization/english/terrains_l_english.yml b/localization/english/terrains_l_english.yml new file mode 100644 index 00000000..b601dfd8 --- /dev/null +++ b/localization/english/terrains_l_english.yml @@ -0,0 +1,45 @@ +l_english: + plains:0 "Plains" + hills:0 "Hills" + combat_hills:0 "Defending in Hills" + mountains:0 "Mountains" + combat_mountain:0 "Defending in Mountains" + desert:0 "Desert" + desert_mountains:0 "Desert Mountains" + combat_desert_mountains:0 "Defending in Desert Mountains" + jungle:0 "Jungle" + combat_jungle:0 "Defending in Jungle" + forest:0 "Forest" + combat_forest:0 "Defending in Forest" + oasis:0 "Oasis" + taiga:0 "Taiga" + combat_taiga:0 "Defending in Taiga" + wetlands:0 "Wetlands" + combat_wetlands:0 "Defending in Wetlands" + steppe:0 "Steppe" + farmlands:0 "Farmlands" + floodplains:0 "Floodplains" + drylands:0 "Drylands" + winter:0 "Winter" + sea:0 "Sea" + coastal_sea:0 "Coastal Sea" + tells:0 "Tells" + combat_tells:0 "Defending in Tells" + TERRAIN_DESCRIPTION:0 "[Terrain.GetEffects]" + TERRAIN_PROVINCE_MODIFIER_HEADER:0 "#S [county|E] Effects:#!" + TERRAIN_COUNTY_CAPITAL_MODIFIER_HEADER: "#S [county_capital|E] Effects:#!" + TERRAIN_MOVEMENT_SPEED:0 "Movement Speed: $VALUE|%0V$" + TERRAIN_COMBAT_WIDTH:0 "[combat_width|E]: $VALUE|%0V$" + TERRAIN_ATTACKER_MODIFIER:0 "Attacker [advantage|E]: $VALUE|=+0$" + TERRAIN_DEFENDER_MODIFIER:0 "Defender [advantage|E]: $VALUE|=+0$" + TERRAIN_MILITARY_EFFECTS_HEADER:0 "#S Military Effects:#!" + TERRRAIN_MILITARY_ATTACKER_MODIFIER:0 "#S Attacker Modifier:#!" + TERRRAIN_MILITARY_DEFENDER_MODIFIER:0 "#S Defender Modifier:#!" + TERRAIN_MILD_WINTER:0 "Mild $winter$" + TERRAIN_NORMAL_WINTER:0 "Normal $winter$" + TERRAIN_HARSH_WINTER:0 "Harsh $winter$" + TERRAIN_TRAVEL_EFFECTS_HEADER:0 "#S Travel Effects:#!" + TERRAIN_DANGER:1 "[travel_danger|E]: $VALUE|=-0$" + TERRAIN_PROVISIONS_BASE_COST: "Base Cost" + TERRAIN_PROVISIONS_COST: "[provisions|E] Cost" +