From bd336b772b00bbcf684abaabac903e60f535fba8 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Mon, 9 Feb 2026 19:38:45 +0000 Subject: [PATCH 01/20] winter --- .../01_province_properties.txt | 222 +++++++++--------- map_data/climate.txt | 2 +- 2 files changed, 118 insertions(+), 106 deletions(-) diff --git a/common/province_terrain/01_province_properties.txt b/common/province_terrain/01_province_properties.txt index 933acedc..c51d1be0 100644 --- a/common/province_terrain/01_province_properties.txt +++ b/common/province_terrain/01_province_properties.txt @@ -7048,7 +7048,7 @@ } # b_lonigo 2509 ={ - winter_severity_bias = 0.07 + winter_severity_bias = 0.60 } # b_montagnana 2666 ={ @@ -7061,11 +7061,11 @@ ## c_polesine # b_rovigo 2525 ={ - winter_severity_bias = 0.0 + winter_severity_bias = 0.20 } # b_adria 2524 ={ - winter_severity_bias = 0.0 + winter_severity_bias = 0.20 } ### d_piedmonte ## c_monferrato @@ -22388,7 +22388,7 @@ } # b_moulins 2307 ={ - winter_severity_bias = 0.40 + winter_severity_bias = 0.25 } # b_pougues_les_eaux 2344 ={ @@ -22633,7 +22633,7 @@ # b_annecy 13276 = {winter_severity_bias = 0.60} # b_thonon_les_bains -13277 = {winter_severity_bias = 0.45} +13277 = {winter_severity_bias = 0.60} # b_bonneville 13278 = {winter_severity_bias = 0.60} @@ -22828,7 +22828,7 @@ } # b_saint_flour 2224 ={ - winter_severity_bias = 0.60 + winter_severity_bias = 0.35 } # b_langeac 2291 ={ @@ -22845,7 +22845,7 @@ } # b_marvejols 2227 ={ - winter_severity_bias = 0.25 + winter_severity_bias = 0.30 } # b_la_peyrade 2229 ={ @@ -22882,7 +22882,7 @@ ## c_montpellier # b_montpellier 2015 ={ - winter_severity_bias = 0.10 + winter_severity_bias = 0.25 } # b_nimes 2016 ={ @@ -22909,7 +22909,7 @@ } # b_limoux 2447 ={ - winter_severity_bias = 0.10 + winter_severity_bias = 0.30 } # b_narbonne 2005 ={ @@ -22931,11 +22931,11 @@ ## c_foix # b_foix 2209 ={ - winter_severity_bias = 0.10 + winter_severity_bias = 0.30 } # b_tarascon 2210 ={ - winter_severity_bias = 0.10 + winter_severity_bias = 0.30 } # b_montbel 2007 ={ @@ -23267,11 +23267,11 @@ ## c_bern # b_bern 2046 ={ - winter_severity_bias = 0.45 + winter_severity_bias = 0.70 } # b_lausanne 2037 ={ - winter_severity_bias = 0.45 + winter_severity_bias = 0.70 } # b_thun 2047 ={ @@ -23280,7 +23280,7 @@ ## c_geneva # b_geneva 2035 ={ - winter_severity_bias = 0.45 + winter_severity_bias = 0.70 } ## c_aosta # b_aosta @@ -23756,7 +23756,7 @@ } # b_amposta 1858 ={ - winter_severity_bias = 0.0 + winter_severity_bias = 0.20 } # b_segorbe 1941 ={ @@ -24077,7 +24077,7 @@ } # b_calaceite 1893 ={ - winter_severity_bias = 0.40 + winter_severity_bias = 0.20 } ### d_barcelona ## c_barcelona @@ -24152,11 +24152,11 @@ ## c_rossello # b_perpignan #Perpinya 1866 ={ - winter_severity_bias = 0.60 + winter_severity_bias = 0.40 } # b_roses 1865 ={ - winter_severity_bias = 0.60 + winter_severity_bias = 0.40 } # b_prades_rossello 8798 = { @@ -42031,28 +42031,28 @@ winter_severity_bias = 0.0 } 779 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.70 } 780 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.70 } 781 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.70 } 782 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.70 } 783 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.70 } 784 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.70 } 785 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.70 } 786 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.60 } 787 = { winter_severity_bias = 0.0 @@ -42678,12 +42678,12 @@ 2484 = { winter_severity_bias = 0.0 } -3256 = { - winter_severity_bias = @the_alps -} 3257 = { winter_severity_bias = @the_alps } +3258 = { + winter_severity_bias = 0.30 +} 3259 = { winter_severity_bias = 0.0 } @@ -42988,12 +42988,6 @@ # UNUSED PROVINCES ################### -8802 = { - winter_severity_bias = 0.0 -} -8803 = { - winter_severity_bias = 0.0 -} 8804 = { winter_severity_bias = 0.0 } @@ -44136,58 +44130,61 @@ 12820 = { winter_severity_bias = 1.00 } 9663 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9665 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.45 +} +9666 = { + winter_severity_bias = 0.45 } 9667 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.45 } 9668 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.45 } 9669 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.55 } 9670 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.55 } 9671 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9672 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.55 } 9673 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.55 } 9674 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9675 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.55 } 9676 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9679 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9680 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9681 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9682 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9683 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.45 } 9684 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.45 } 9685 = { winter_severity_bias = 0.20 @@ -44229,10 +44226,10 @@ winter_severity_bias = 0.70 } 9698 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.45 } 9699 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.45 } 9700 = { winter_severity_bias = 0.70 @@ -44271,85 +44268,88 @@ winter_severity_bias = 1.0 } 9714 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.50 } 9715 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9716 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.50 } 9717 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.55 } 9718 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.55 } 9719 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.50 } 9720 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.50 } 9721 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9722 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 +} +9723 = { + winter_severity_bias = 0.50 } 9724 = { winter_severity_bias = 0.0 } 9725 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9726 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9727 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9728 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9729 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9730 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9731 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9732 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9733 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9734 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9735 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9736 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.40 } 9737 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.40 } 9738 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.40 } 9739 = { - winter_severity_bias = 0.10 + winter_severity_bias = 0.40 } 9740 = { - winter_severity_bias = 0.20 + winter_severity_bias = 0.40 } 9741 = { - winter_severity_bias = 0.20 + winter_severity_bias = 0.40 } 9742 = { winter_severity_bias = 0.20 @@ -44364,28 +44364,28 @@ winter_severity_bias = 0.10 } 9746 = { - winter_severity_bias = 0.20 + winter_severity_bias = 0.40 } 9747 = { - winter_severity_bias = 0.20 + winter_severity_bias = 0.40 } 9748 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0 } 9749 = { - winter_severity_bias = 0.20 + winter_severity_bias = 0.40 } 9750 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.40 } 9751 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.40 } 9752 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0 } 9753 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0 } 9754 = { winter_severity_bias = 0.10 @@ -44409,7 +44409,7 @@ winter_severity_bias = 0.10 } 9761 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0 } 9762 = { winter_severity_bias = 0.0 @@ -44418,43 +44418,52 @@ winter_severity_bias = 0.70 } 9764 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.80 } 9765 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0 } 9766 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0 } 9767 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0 } 9768 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.45 } 9769 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0 } 9770 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.50 } 9771 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.50 } 9772 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.50 } 9773 = { - winter_severity_bias = 0.70 + winter_severity_bias = 0.50 +} +311 = { + winter_severity_bias = 0.50 +} +312 = { + winter_severity_bias = 0.50 +} +313 = { + winter_severity_bias = 0.50 } 9774 = { winter_severity_bias = 0.70 } 9776 = { - winter_severity_bias = 0.20 + winter_severity_bias = 0.45 } 9777 = { - winter_severity_bias = 0.20 + winter_severity_bias = 0.50 } 9778 = { winter_severity_bias = 0.20 @@ -44472,13 +44481,13 @@ winter_severity_bias = 0.70 } 9783 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.70 } 9784 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.50 } 9785 = { - winter_severity_bias = 0.0 + winter_severity_bias = 0.80 } 9786 = { winter_severity_bias = 0.70 @@ -50513,3 +50522,6 @@ 13269 = { winter_severity_bias = 0.0 } +13422 = { + winter_severity_bias = 0.80 +} \ No newline at end of file diff --git a/map_data/climate.txt b/map_data/climate.txt index 49e5ef4b..9d743d9d 100644 --- a/map_data/climate.txt +++ b/map_data/climate.txt @@ -45,7 +45,7 @@ normal_winter = { # Denmark 259 260 261 262 263 264 265 266 267 304 306 307 308 # East Frisia - 80 81 82 83 84 85 86 87 88 89 119 120 121 122 254 255 256 257 258 309 310 311 312 313 + 80 81 82 83 84 85 86 87 88 89 119 120 121 122 254 255 256 257 258 309 310 # France 217 219 223 224 242 209 221 # Germany From 50520cf9418ce0e22beba8efd6d1bec29aaeeff9 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Mon, 9 Feb 2026 20:19:36 +0000 Subject: [PATCH 02/20] texture --- gfx/map/terrain/tells_diffuse.dds | 2 +- gfx/map/terrain/tells_dry_diffuse.dds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/map/terrain/tells_diffuse.dds b/gfx/map/terrain/tells_diffuse.dds index 77dcb386..b57b4754 100644 --- a/gfx/map/terrain/tells_diffuse.dds +++ b/gfx/map/terrain/tells_diffuse.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c041c25e19fd637b54e1e62907f8457c2837bf7b5f0851615c0b48a4392c44d3 +oid sha256:6a535578d47a47b157a6448b98d5e6d8eece2901e5df139cd817d3dae97f6474 size 1398256 diff --git a/gfx/map/terrain/tells_dry_diffuse.dds b/gfx/map/terrain/tells_dry_diffuse.dds index 9c62643f..4cf015ce 100644 --- a/gfx/map/terrain/tells_dry_diffuse.dds +++ b/gfx/map/terrain/tells_dry_diffuse.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a51413e0080c1bd1d4d920d3704a834f6242f378e187a4f28ccd572a5eb1971a +oid sha256:b7b036daf5ae04d785ebc682c390db97673f4a67d719f8867409f2fe2567acaa size 1398256 From cd6d40254cb51e1ceaa806f21b94ca6acffac25c Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Mon, 9 Feb 2026 22:36:53 +0000 Subject: [PATCH 03/20] snow --- gfx/map/environment/snow.settings | 38 +++++++++++++++++++++++++++++++ gfx/map/textures/snow_mask.dds | 3 +++ 2 files changed, 41 insertions(+) create mode 100644 gfx/map/environment/snow.settings create mode 100644 gfx/map/textures/snow_mask.dds diff --git a/gfx/map/environment/snow.settings b/gfx/map/environment/snow.settings new file mode 100644 index 00000000..615047f9 --- /dev/null +++ b/gfx/map/environment/snow.settings @@ -0,0 +1,38 @@ +# Access these settings ingame with "Tweak Snow." +# Recommend turning off gradient borders when adjusting visuals + +"Texture_Index" = 4 # Index of snow terrain texture (Terrain texture array) + +"Noise_Tiling" = 4 # Tiling of large snow noise, Smaller tiling creates larger empty areas +"Noise2_Tiling" = 300 # Tiling of detail snow noise, Smaller tiling creates larger empty areas +"Texture_Tiling" = 200 + +"Snow.Extent" = 0.5 # Maximum Southern extent of snow (top to bottom distance) +"Snow.AngleRemove" = 0.25 # Snow removal based on terrain Normal angle ( 0.0 - 1.0 ) + +"Frost.Hemisphere_Position" = 0.2 # (Use Snow.Extent) +"Frost.Hemisphere_Constrast" = 0.8 # Contrast of hemisphere mask (top to bottom) +"Frost.Terrain_Area_Position" = 0.7 # Position of frost noise mask, increase to cover more area +"Frost.Terrain_Area_Constrast" = 0.5 # Contrast of frost noise mask, increase to soften mask +"Frost.Multiplier" = 0.55 # Frost intensity multiplier + +"Snow.Hemisphere_Position" = 0.7 # (Use Snow.Extent) +"Snow.Hemisphere_Constrast" = 0.40 # Contrast of hemisphere mask (top to bottom) +"Snow.Terrain_Area_Position" = 0.3 # Position of snow noise mask, increase to cover more area +"Snow.Terrain_Area_Constrast" = 0.9 # Contrast of snow noise mask, increase to soften mask + +"Snow.Area_Position" = 0.9 # Position of mesh snow noise mask, increase to cover more area +"Snow.Area_Constrast" = 0.9 # Contrast of mesh snow noise mask, increase to soften mask + +"Snow.GameMaskImpact" = 1.0 # Amount of snow added based on coded game snow mask +"Snow.GameMaskMin" = 0.0 # Minimum adjustment of game snow mask +"Snow.GameMaskMax" = 0.50 # Maximum adjustment of game snow mask + +"Snow.Height_Weight" = 0.23 # Terrain material height blending +"Snow.Height_Contrast" = 14.0 # Terrain material height blending + +"Snow.TerrainHeight_Add" = 3.0 # Extra snow added based on terrain height +"Snow.TerrainHeight_Min" = 15.0 # Terrain height snow min +"Snow.TerrainHeight_Max" = 80.0 # Terrain height snow max + +"Debug.Winter_Value" = 0.0 # Debugging of the hemisphere based snow mask for adjusting visuals \ No newline at end of file diff --git a/gfx/map/textures/snow_mask.dds b/gfx/map/textures/snow_mask.dds new file mode 100644 index 00000000..27ca6d4b --- /dev/null +++ b/gfx/map/textures/snow_mask.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23c1d8e64be7d09e713dece8bdc2c9a815ee6af78afd9745b5a4cfc6b5f7dcbf +size 56623424 From 1d49a94c0f4c951a7e22fc0b505917ace66f7c5f Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Mon, 9 Feb 2026 22:50:14 +0000 Subject: [PATCH 04/20] Update snow.settings --- gfx/map/environment/snow.settings | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/map/environment/snow.settings b/gfx/map/environment/snow.settings index 615047f9..94379a11 100644 --- a/gfx/map/environment/snow.settings +++ b/gfx/map/environment/snow.settings @@ -4,10 +4,10 @@ "Texture_Index" = 4 # Index of snow terrain texture (Terrain texture array) "Noise_Tiling" = 4 # Tiling of large snow noise, Smaller tiling creates larger empty areas -"Noise2_Tiling" = 300 # Tiling of detail snow noise, Smaller tiling creates larger empty areas +"Noise2_Tiling" = 7 # Tiling of detail snow noise, Smaller tiling creates larger empty areas "Texture_Tiling" = 200 -"Snow.Extent" = 0.5 # Maximum Southern extent of snow (top to bottom distance) +"Snow.Extent" = 0.43 # Maximum Southern extent of snow (top to bottom distance) "Snow.AngleRemove" = 0.25 # Snow removal based on terrain Normal angle ( 0.0 - 1.0 ) "Frost.Hemisphere_Position" = 0.2 # (Use Snow.Extent) @@ -16,7 +16,7 @@ "Frost.Terrain_Area_Constrast" = 0.5 # Contrast of frost noise mask, increase to soften mask "Frost.Multiplier" = 0.55 # Frost intensity multiplier -"Snow.Hemisphere_Position" = 0.7 # (Use Snow.Extent) +"Snow.Hemisphere_Position" = 0.75 # (Use Snow.Extent) "Snow.Hemisphere_Constrast" = 0.40 # Contrast of hemisphere mask (top to bottom) "Snow.Terrain_Area_Position" = 0.3 # Position of snow noise mask, increase to cover more area "Snow.Terrain_Area_Constrast" = 0.9 # Contrast of snow noise mask, increase to soften mask From 4fece42bebf02850c4cc333baa3dba935458f912 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Mon, 9 Feb 2026 22:55:26 +0000 Subject: [PATCH 05/20] fix --- gfx/map/terrain/tells_diffuse.dds | 2 +- gfx/map/terrain/tells_dry_diffuse.dds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/map/terrain/tells_diffuse.dds b/gfx/map/terrain/tells_diffuse.dds index b57b4754..cb2c23d3 100644 --- a/gfx/map/terrain/tells_diffuse.dds +++ b/gfx/map/terrain/tells_diffuse.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a535578d47a47b157a6448b98d5e6d8eece2901e5df139cd817d3dae97f6474 +oid sha256:925f013147b7ae6568a396a39accef625552d6bab46be1dcef1da4c8c86473df size 1398256 diff --git a/gfx/map/terrain/tells_dry_diffuse.dds b/gfx/map/terrain/tells_dry_diffuse.dds index 4cf015ce..3a27db7f 100644 --- a/gfx/map/terrain/tells_dry_diffuse.dds +++ b/gfx/map/terrain/tells_dry_diffuse.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7b036daf5ae04d785ebc682c390db97673f4a67d719f8867409f2fe2567acaa +oid sha256:f01a4eb8ff75eafde21192425b1c65139d64179acc17d3e0abb9fcd65b7616d2 size 1398256 From e3cce9a64d8b45c8ebd3946bbec90cf1d69d19a4 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Mon, 9 Feb 2026 23:10:49 +0000 Subject: [PATCH 06/20] Update snow_mask.dds --- gfx/map/textures/snow_mask.dds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/map/textures/snow_mask.dds b/gfx/map/textures/snow_mask.dds index 27ca6d4b..199e1385 100644 --- a/gfx/map/textures/snow_mask.dds +++ b/gfx/map/textures/snow_mask.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23c1d8e64be7d09e713dece8bdc2c9a815ee6af78afd9745b5a4cfc6b5f7dcbf +oid sha256:bcc3993c7baccb0ac3bcf2a8e9104430da775279e4f859282d0b47daa749e4e7 size 56623424 From f6ef743d52232575bfc9723d5ee92cee73587471 Mon Sep 17 00:00:00 2001 From: trashmasteruni Date: Tue, 10 Feb 2026 00:41:31 +0100 Subject: [PATCH 07/20] Fremch --- common/religion/doctrines/30_core_tenets.txt | 6 +-- common/religion/religions/NEOW_pantheonic.txt | 24 +++++---- common/religion/religions/NEOW_wicca.txt | 2 +- gfx/interface/icons/faith/ascensionist.dds | 3 ++ gfx/interface/icons/faith/girondin.dds | 3 -- history/characters/NEOW_e_france.txt | 18 +++---- history/provinces/e_alps.txt | 4 +- history/provinces/e_europa.txt | 4 +- history/provinces/e_france.txt | 26 +++++----- ...z_NEOW_religion_core_tenets_l_english .yml | 2 +- .../zz_NEOW_religion_pantheonic_l_english.yml | 50 +++++++++---------- 11 files changed, 69 insertions(+), 73 deletions(-) create mode 100644 gfx/interface/icons/faith/ascensionist.dds delete mode 100644 gfx/interface/icons/faith/girondin.dds diff --git a/common/religion/doctrines/30_core_tenets.txt b/common/religion/doctrines/30_core_tenets.txt index 79242b26..8f482adc 100644 --- a/common/religion/doctrines/30_core_tenets.txt +++ b/common/religion/doctrines/30_core_tenets.txt @@ -424,15 +424,11 @@ # Multiplier for keeping same tenet if = { - limit = { has_doctrine = tenet_sacred_destruction } + limit = { has_doctrine = tenet_righteous_fury } multiply = faith_unchanged_doctrine_cost_mult } } - is_shown = { - religion_tag = adonist_religion - } - can_pick = { custom_description = { text = incompatible_tenet_pacifism_trigger diff --git a/common/religion/religions/NEOW_pantheonic.txt b/common/religion/religions/NEOW_pantheonic.txt index ec304ebf..fe415449 100644 --- a/common/religion/religions/NEOW_pantheonic.txt +++ b/common/religion/religions/NEOW_pantheonic.txt @@ -224,9 +224,9 @@ piety_icon_group = "christian" faiths = { - girondin = { - color = { 36 82 163} - icon = girondin + ascensionist = { + color = { 26 41 178 } + icon = ascensionist # religious_head = k_papal_state @@ -243,9 +243,9 @@ doctrine = special_doctrine_people_of_the_book #Tenets | placeholder - doctrine = tenet_liberte - doctrine = tenet_egalite - doctrine = tenet_fraternite + doctrine = tenet_pursuit_of_power + doctrine = tenet_adaptive + doctrine = tenet_ancestor_worship #Special/virtue | placeholder doctrine = special_doctrine_liberty @@ -256,7 +256,7 @@ } jacobin = { - color = { 22 133 229 } + color = { 22 91 229 } icon = jacobin # religious_head = k_papal_state @@ -274,9 +274,13 @@ doctrine = special_doctrine_people_of_the_book #Tenets | placeholder - doctrine = tenet_human_sacrifice - doctrine = tenet_warmonger - doctrine = tenet_false_conversion_sanction + doctrine = tenet_righteous_fury + doctrine = tenet_legalism + doctrine_selection_pair = { + requires_dlc_flag = legacy_of_persia + doctrine = tenet_fp3_fedayeen + fallback_doctrine = tenet_struggle_submission + } #Special/virtue | placeholder doctrine = special_doctrine_fraternity diff --git a/common/religion/religions/NEOW_wicca.txt b/common/religion/religions/NEOW_wicca.txt index 07d9ed8b..bf1fd4ed 100644 --- a/common/religion/religions/NEOW_wicca.txt +++ b/common/religion/religions/NEOW_wicca.txt @@ -252,7 +252,7 @@ #Tenets | placeholder doctrine = tenet_divine_opulence - doctrine = king_of_winter + doctrine = tenet_unrelenting_faith doctrine = tenet_chivalric_ideals doctrine = doctrine_witchcraft_accepted diff --git a/gfx/interface/icons/faith/ascensionist.dds b/gfx/interface/icons/faith/ascensionist.dds new file mode 100644 index 00000000..f40d1e0f --- /dev/null +++ b/gfx/interface/icons/faith/ascensionist.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97b4b0a1a94bc7b3e1a97fdde9f832b3824cf0cfa12b26c26e149158573ca410 +size 40128 diff --git a/gfx/interface/icons/faith/girondin.dds b/gfx/interface/icons/faith/girondin.dds deleted file mode 100644 index 56da5647..00000000 --- a/gfx/interface/icons/faith/girondin.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8938463cbd55f5d3d465bf5e824f5c8fb76f79506ccbcbf0da553264cffd9930 -size 40128 diff --git a/history/characters/NEOW_e_france.txt b/history/characters/NEOW_e_france.txt index 31b43e03..afbaec37 100644 --- a/history/characters/NEOW_e_france.txt +++ b/history/characters/NEOW_e_france.txt @@ -36,7 +36,7 @@ france0003 = { france0004 = { name = "Éric" dynasty = leroux_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon trait = education_intrigue_3 trait = chaste @@ -94,7 +94,7 @@ france0006 = { france_dain_gaillard = { name = "Daín" dynasty = gaillard_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon trait = calm trait = greedy @@ -111,7 +111,7 @@ france_dain_gaillard = { france_marc_dumont = { name = "Marc" dynasty = dumont_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon trait = gluttonous trait = greedy @@ -129,7 +129,7 @@ france_marc_dumont = { france_raymonde_laurent = { name = "Raymonde" dynasty = laurent_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon female = yes trait = temperate @@ -147,7 +147,7 @@ france_raymonde_laurent = { france_abraracourcix_leclerc = { name = "Abraracourcix" dynasty = leclerc_dynasty - religion = "girondin" + religion = "ascensionist" culture = bourguignon trait = temperate trait = arbitrary @@ -538,7 +538,7 @@ france_edmond_daunte = { france_joachim_murat = { name = "Joachim" dynasty = murat_dynasty - religion = "girondin" + religion = "ascensionist" culture = "axiton" trait = education_martial_3 trait = ambitious @@ -977,7 +977,7 @@ france_nicephore_clemence = { france_robur_amouroux = { name = "Robur" dynasty = amouroux_dynasty - religion = "girondin" + religion = "ascensionist" culture = axiton trait = education_stewardship_1 trait = greedy @@ -1232,7 +1232,7 @@ france_belasko_agurto = { france_adelberth_de_bourbon_naundorff = { name = "Adelberth" dynasty_house = house_bourbon_naundorff - religion = girondin + religion = ascensionist culture = metropolitain trait = education_learning_3 trait = ambitious @@ -1249,7 +1249,7 @@ france_adelberth_de_bourbon_naundorff = { france_guy_loup_chitteaux={ name ="Guy-Loup" dynasty=chitteaux_dynasty - religion=girondin + religion=ascensionist culture=bourguignon 2519.4.18={birth=yes} 2600.1.1={death =yes} diff --git a/history/provinces/e_alps.txt b/history/provinces/e_alps.txt index db6edbb5..768e16b6 100644 --- a/history/provinces/e_alps.txt +++ b/history/provinces/e_alps.txt @@ -115,7 +115,7 @@ ###c_vesoul 2077 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2383 = { @@ -123,7 +123,7 @@ } 2076 = { culture = pelonais - religion = girondin + religion = ascensionist holding = castle_holding } 2192 = { diff --git a/history/provinces/e_europa.txt b/history/provinces/e_europa.txt index 5ac4773b..83440d27 100644 --- a/history/provinces/e_europa.txt +++ b/history/provinces/e_europa.txt @@ -624,7 +624,7 @@ ###c_neufchateau 2715 = { culture = lorin - religion = girondin + religion = ascensionist holding = city_holding } 2384 = { @@ -638,7 +638,7 @@ ###c_nancy 2709 = { culture = lorin - religion = girondin + religion = ascensionist holding = castle_holding } 2713 = { diff --git a/history/provinces/e_france.txt b/history/provinces/e_france.txt index 4ee25619..8ec66693 100644 --- a/history/provinces/e_france.txt +++ b/history/provinces/e_france.txt @@ -318,7 +318,7 @@ ###c_tourraine 2274 = { culture = metropolitain - religion = girondin + religion = ascensionist holding = castle_holding 1066.1.1 = { buildings = { @@ -569,7 +569,7 @@ ###c_loir_et_cher 2319 = { culture = metropolitain - religion = girondin + religion = ascensionist holding = castle_holding } 2283 = { @@ -652,7 +652,7 @@ ###c_langres 2374 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 9750 = { @@ -674,7 +674,7 @@ ###c_dijon 2380 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2375 = { @@ -691,7 +691,7 @@ ###c_autun 2347 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2304 = { @@ -703,7 +703,7 @@ ###c_beaune 2376 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = city_holding } 2377 = { @@ -718,12 +718,12 @@ ###c_macon 2302 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2348 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2458 = { @@ -732,7 +732,7 @@ ###c_auxerre 2346 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2350 = { @@ -760,7 +760,7 @@ ###c_nievre 2343 = { culture = bourguignon - religion = girondin + religion = ascensionist holding = castle_holding } 2344 = { @@ -1052,7 +1052,7 @@ ###c_bellac 2247 = { culture = axiton - religion = girondin + religion = ascensionist holding = castle_holding } 2240 = { @@ -1240,7 +1240,7 @@ ###c_auvergne 2294 = { culture = axiton - religion = girondin + religion = ascensionist holding = castle_holding } 2293 = { @@ -1255,7 +1255,7 @@ ###c_clermont_sur_allier 2289 = { culture = axiton - religion = girondin + religion = ascensionist holding = castle_holding special_building_slot = generic_university } diff --git a/localization/english/replace/religion/doctrines/zz_NEOW_religion_core_tenets_l_english .yml b/localization/english/replace/religion/doctrines/zz_NEOW_religion_core_tenets_l_english .yml index 5fbf6ffd..50f6e3e5 100644 --- a/localization/english/replace/religion/doctrines/zz_NEOW_religion_core_tenets_l_english .yml +++ b/localization/english/replace/religion/doctrines/zz_NEOW_religion_core_tenets_l_english .yml @@ -2,7 +2,7 @@ #Adonist Tenets tenet_righteous_fury_name:0 "Righteous Fury" - tenet_righteous_fury_desc:0 "It is our holy duty to ride forth against the forces of Moloch, in the name of our true chosen creator." + tenet_righteous_fury_desc:0 "It is our holy duty to ride forth against the forces of [ROOT.Faith.DevilName], and burn them and their temples down to the foundation." #Hermetic Tenets tenet_scientific_discourse_name:0 "Scientific Discourse" diff --git a/localization/english/replace/religion/zz_NEOW_religion_pantheonic_l_english.yml b/localization/english/replace/religion/zz_NEOW_religion_pantheonic_l_english.yml index e3e1ff36..39acce8c 100644 --- a/localization/english/replace/religion/zz_NEOW_religion_pantheonic_l_english.yml +++ b/localization/english/replace/religion/zz_NEOW_religion_pantheonic_l_english.yml @@ -10,10 +10,10 @@ french_pantheon_high_god_name_possessive:0 "The Supreme Being's" french_pantheon_high_god_name_alternate:0 "The Creator" french_pantheon_high_god_name_alternate_possessive:0 "The Creator's" - french_pantheon_devil_name:0 "Madame Guillotine" - french_pantheon_devil_name_possessive:0 "Madame Guillotine's" - french_pantheon_death_deity_name:0 "$french_pantheon_devil_name$" - french_pantheon_death_deity_name_possessive:0 "$french_pantheon_devil_name_possessive$" + french_pantheon_devil_name:0 "Satan" + french_pantheon_devil_name_possessive:0 "Satan's" + french_pantheon_death_deity_name:0 "Madame Guillotine" + french_pantheon_death_deity_name_possessive:0 "Madame Guillotine's" french_pantheon_house_of_worship:0 "convention" french_pantheon_house_of_worship_plural:0 "conventions" french_pantheon_religious_symbol:0 "tricolour" @@ -26,18 +26,18 @@ french_pantheon_priest_plural:0 "speakers" french_pantheon_bishop:0 "proclamator" french_pantheon_bishop_plural:0 "proclamators" - french_pantheon_positive_afterlife:0 "the Enlightenment" + french_pantheon_positive_afterlife:0 "Sa Cour" french_pantheon_negative_afterlife:0 "the Bastille" - french_pantheon_witch_god_name:0 "$french_pantheon_devil_name$" - french_pantheon_witch_god_name_possessive:0 "$french_pantheon_devil_name_possessive$" + french_pantheon_witch_god_name:0 "$french_pantheon_death_name$" + french_pantheon_witch_god_name_possessive:0 "$french_pantheon_death_name_possessive$" french_pantheon_creator_god_name:0 "$french_pantheon_high_god_name$" french_pantheon_creator_god_name_possessive:0 "$french_pantheon_high_god_name_possessive$" - french_pantheon_health_god_name:0 "Notre-Seigneur" - french_pantheon_health_god_name_possessive:0 "Notre-Seigneur's" + french_pantheon_health_god_name:0 "Liberté" + french_pantheon_health_god_name_possessive:0 "Liberté's" french_pantheon_fertility_god_name:0 "Notre-Dame" french_pantheon_fertility_god_name_possessive:0 "Notre-Dame's" - french_pantheon_wealth_god_name:0 "Liberté" - french_pantheon_wealth_god_name_possessive:0 "Liberté's" + french_pantheon_wealth_god_name:0 "le Roi Soleil" + french_pantheon_wealth_god_name_possessive:0 "le Roi Soleil's" french_pantheon_household_god_name:0 "Fraternité" french_pantheon_household_god_name_possessive:0 "Fraternité's" french_pantheon_fate_god_name:0 "le Prophète" @@ -46,31 +46,27 @@ french_pantheon_knowledge_god_name_possessive:0 "Marianne's" french_pantheon_war_god_name:0 "l'Empereur" french_pantheon_war_god_name_possessive:0 "l'Empereur's" - french_pantheon_trickster_god_name:0 "le Roi Soleil" - french_pantheon_trickster_god_name_possessive:0 "le Roi Soleil's" - french_pantheon_night_god_name:0 "$french_pantheon_devil_name$" - french_pantheon_night_god_name_possessive:0 "$french_pantheon_devil_name_possessive$" + french_pantheon_trickster_god_name:0 "$french_pantheon_death_name$" + french_pantheon_trickster_god_name_possessive:0 "$french_pantheon_death_name_possessive$" + french_pantheon_night_god_name:0 "$french_pantheon_death_name$" + french_pantheon_night_god_name_possessive:0 "$french_pantheon_death_name_possessive$" french_pantheon_water_god_name:0 "Egalité" french_pantheon_water_god_name_possessive:0 "Egalité's" - girondin:0 "Girondin Convention" - girondin_adj:0 "Girondin" - girondin_adherent:0 "Girondin" - girondin_adherent_plural:0 "Girondins" - girondin_desc:0 "The Girondins are a deistic faith that believes the many gods of Europe are merely individual facets of a single great, incomprehensible Architect of Creation, who made man in his image spiritually, but not physically. Because man is of the Creator, it is also man who is to rule over other men, with those of the First Estate being chosen by the Creator to rule. However, should a monarch fall to his basal desires, and fail to uphold the duties and virtues bestowed upon him by God, it is the duty of the Third Estate to dethrone him and feed him to Madame Guillotine. It is in this way that Girondists uphold the balance of the universe, for it was Madame Guillotine who brought the [Concept('neow_the_event','Event')|E] once every ruler on Earth was a corrupt tyrant. The three archangels of God - Liberty, Equality, and Fraternity, embody the principles a just and righteous ruler is to live by, and are also those who bring the Third Estate to depose a tyrant." - girondin_religious_head_title:0 "WIP" - girondin_religious_head_title_name:0 "WIP" + ascensionist:0 "Panthéon de l'Ascension" + ascensionist_adj:0 "Ascensionist" + ascensionist_adherent:0 "Ascensionist" + ascensionist_adherent_plural:0 "Ascensionists" + ascensionist_desc:0 "The Ascensionists consider themselves the instrument of mankind's apotheosis at the hands of Marianne, the Angel of Liberation. They hold that through heroic and virtuous deeds in life, anyone - from king to commoner - may be 'pantheonised', inducted into the great Panthéon of the French people. This most often includes great warriors, philosophers, and leaders, who were instrumental in shaping and defending their homes. Their bodies are interred in great mausoleums where the faithful come to leaving offerings and pray for their blessing, and the goal of every Ascensionist is to one day be buried amongst the greats, guarding their homeland from the heavens." special_doctrine_liberty_name: "Liberté Focus" special_doctrine_liberty_desc: "Identifying itself primarily by its commitment to the virtue and archangel known as "Liberté", this sect of Estatist religion emphasizes independence and freedom above the two other causes." - jacobin:0 "Jacobin Convention" + jacobin:0 "Jacobinism" jacobin_adj:0 "Jacobin" jacobin_adherent:0 "Jacobin" jacobin_adherent_plural:0 "Jacobins" - jacobin_desc:0 "The Jacobins, members of a secret society in the highest echelons of European academia, are those who live to placate the eternal hunger of Madame Guillotine. Jacobins believe that many years before the [Concept('neow_the_event','Event')|E], the prophet Robespierre was given this sacred duty by the Madame herself, but was soon killed by those unbelievers who considered him a madman. With Madame Guillotine left unfed, it was humanity that paid the price, the Madame taking back all the lives owed to her in the Event. With rivers of blood painting the streets of Europe red, the Jacobins slowly reemerged and reorganised, seeking to right the wrongs of their ancestors. Though denounced by the rest of the Third Estatists and driven underground by the many other faiths of the continent, the Jacobins have slowly built up a web of informants and volunteers in Europe's universities, and only need the right time to strike." - jacobin_religious_head_title:0 "WIP" - jacobin_religious_head_title_name:0 "WIP" + jacobin_desc:0 "Jacobins hold that, many years ago, France was home to the magnificent Republic, in which gods walked among men as equals. However, in their hunger for power and tyranny, the supporters of the Ancien Régime returned and destroyed the Republic, for which they were smited down by Madame Guillotine. Now, in this new world, the Jacobins have taken up arms and reorganised, seeking to restore the utopia of the old world. They believe that through the steady guidance of the angels Liberty, Equality and Fraternity the Republic will rise again, and all of its enemies will be fed to the Guillotine to ensure that oneness of the earth and the Panthéon is eternal." special_doctrine_fraternity_name: "Fraternité Focus" special_doctrine_fraternity_desc: "Identifying itself primarily by its commitment to the virtue and archangel known as "Fraternité", this sect of Estatist religion emphasizes brotherhood and unity of mankind above the two other causes." @@ -79,7 +75,7 @@ communard_adj:0 "Communard" communard_adherent:0 "Communard" communard_adherent_plural:0 "Communards" - communard_desc:0 "The Communards are those Girondins who reject the First Estate as the one given mandate by God. Instead, they believe a ruler cannot uphold his duties if he isn't even of the same Estate, and as such they believe the only Estate capable of ruling over the Third Estate is itself. Only the lowest echelons of society can uphold Liberty, Equality, and Fraternity, for they are the only ones who know what life is like without them. They also insist that Madame Guillotine will never be satisfied if she is fed the lives of those who have nothing to give, for it is the fat and the rich she yearns for. Thus, the Communards haven't only given themselves the noble goal of peasant liberation, but also believe it is their divine right to feed the whole of the First Estate to Madame Guillotine. As such, the Communards are heavily demonised and feared by the rulers and faiths of Europe, and rightfully so - for they have no compassion for the ruling classes and ask for none in return. When their turn comes, they will make no excuse for the terror to be unleashed." + communard_desc:0 "The Communards are those ascensionists who reject the First Estate as the one given mandate by God. Instead, they believe a ruler cannot uphold his duties if he isn't even of the same Estate, and as such they believe the only Estate capable of ruling over the Third Estate is itself. Only the lowest echelons of society can uphold Liberty, Equality, and Fraternity, for they are the only ones who know what life is like without them. They also insist that Madame Guillotine will never be satisfied if she is fed the lives of those who have nothing to give, for it is the fat and the rich she yearns for. Thus, the Communards haven't only given themselves the noble goal of peasant liberation, but also believe it is their divine right to feed the whole of the First Estate to Madame Guillotine. As such, the Communards are heavily demonised and feared by the rulers and faiths of Europe, and rightfully so - for they have no compassion for the ruling classes and ask for none in return. When their turn comes, they will make no excuse for the terror to be unleashed." communard_religious_head_title:0 "WIP" communard_religious_head_title_name:0 "WIP" From e1eaeb4c24fde2e51ed5e43d51b54852b1ab69b1 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Mon, 9 Feb 2026 23:58:03 +0000 Subject: [PATCH 08/20] push --- descriptor.mod | 1 + gfx/map/environment/snow.settings | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/descriptor.mod b/descriptor.mod index 52b4ae22..981d8307 100644 --- a/descriptor.mod +++ b/descriptor.mod @@ -8,6 +8,7 @@ replace_path="history/characters" replace_path="history/cultures" replace_path="history/provinces" replace_path="history/titles" +replace_path="gfx/map/terrain/masks" replace_path="gfx/interface/illustrations/loading_screens" supported_version="1.18.*" path="mod/N3OW" \ No newline at end of file diff --git a/gfx/map/environment/snow.settings b/gfx/map/environment/snow.settings index 94379a11..d0145c25 100644 --- a/gfx/map/environment/snow.settings +++ b/gfx/map/environment/snow.settings @@ -5,7 +5,7 @@ "Noise_Tiling" = 4 # Tiling of large snow noise, Smaller tiling creates larger empty areas "Noise2_Tiling" = 7 # Tiling of detail snow noise, Smaller tiling creates larger empty areas -"Texture_Tiling" = 200 +"Texture_Tiling" = 1 "Snow.Extent" = 0.43 # Maximum Southern extent of snow (top to bottom distance) "Snow.AngleRemove" = 0.25 # Snow removal based on terrain Normal angle ( 0.0 - 1.0 ) @@ -21,7 +21,7 @@ "Snow.Terrain_Area_Position" = 0.3 # Position of snow noise mask, increase to cover more area "Snow.Terrain_Area_Constrast" = 0.9 # Contrast of snow noise mask, increase to soften mask -"Snow.Area_Position" = 0.9 # Position of mesh snow noise mask, increase to cover more area +"Snow.Area_Position" = 0.6 # Position of mesh snow noise mask, increase to cover more area "Snow.Area_Constrast" = 0.9 # Contrast of mesh snow noise mask, increase to soften mask "Snow.GameMaskImpact" = 1.0 # Amount of snow added based on coded game snow mask From 52d01d347bc4dc4d534eba9cfdaf1139f3cb0984 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 00:08:14 +0000 Subject: [PATCH 09/20] Update snow.settings --- gfx/map/environment/snow.settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/map/environment/snow.settings b/gfx/map/environment/snow.settings index d0145c25..f2650e21 100644 --- a/gfx/map/environment/snow.settings +++ b/gfx/map/environment/snow.settings @@ -10,7 +10,7 @@ "Snow.Extent" = 0.43 # Maximum Southern extent of snow (top to bottom distance) "Snow.AngleRemove" = 0.25 # Snow removal based on terrain Normal angle ( 0.0 - 1.0 ) -"Frost.Hemisphere_Position" = 0.2 # (Use Snow.Extent) +"Frost.Hemisphere_Position" = 0.751 # (Use Snow.Extent) "Frost.Hemisphere_Constrast" = 0.8 # Contrast of hemisphere mask (top to bottom) "Frost.Terrain_Area_Position" = 0.7 # Position of frost noise mask, increase to cover more area "Frost.Terrain_Area_Constrast" = 0.5 # Contrast of frost noise mask, increase to soften mask From c1ff5d2ffbb311f1bcbbba7a40c9e7389c3dc77f Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 00:15:46 +0000 Subject: [PATCH 10/20] Revert "Update snow.settings" This reverts commit 52d01d347bc4dc4d534eba9cfdaf1139f3cb0984. --- gfx/map/environment/snow.settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/map/environment/snow.settings b/gfx/map/environment/snow.settings index f2650e21..d0145c25 100644 --- a/gfx/map/environment/snow.settings +++ b/gfx/map/environment/snow.settings @@ -10,7 +10,7 @@ "Snow.Extent" = 0.43 # Maximum Southern extent of snow (top to bottom distance) "Snow.AngleRemove" = 0.25 # Snow removal based on terrain Normal angle ( 0.0 - 1.0 ) -"Frost.Hemisphere_Position" = 0.751 # (Use Snow.Extent) +"Frost.Hemisphere_Position" = 0.2 # (Use Snow.Extent) "Frost.Hemisphere_Constrast" = 0.8 # Contrast of hemisphere mask (top to bottom) "Frost.Terrain_Area_Position" = 0.7 # Position of frost noise mask, increase to cover more area "Frost.Terrain_Area_Constrast" = 0.5 # Contrast of frost noise mask, increase to soften mask From ee37c8c72f17fe0e1f810b0e626117e5318cb45a Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 00:15:50 +0000 Subject: [PATCH 11/20] Revert "push" This reverts commit e1eaeb4c24fde2e51ed5e43d51b54852b1ab69b1. --- descriptor.mod | 1 - gfx/map/environment/snow.settings | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/descriptor.mod b/descriptor.mod index 981d8307..52b4ae22 100644 --- a/descriptor.mod +++ b/descriptor.mod @@ -8,7 +8,6 @@ replace_path="history/characters" replace_path="history/cultures" replace_path="history/provinces" replace_path="history/titles" -replace_path="gfx/map/terrain/masks" replace_path="gfx/interface/illustrations/loading_screens" supported_version="1.18.*" path="mod/N3OW" \ No newline at end of file diff --git a/gfx/map/environment/snow.settings b/gfx/map/environment/snow.settings index d0145c25..94379a11 100644 --- a/gfx/map/environment/snow.settings +++ b/gfx/map/environment/snow.settings @@ -5,7 +5,7 @@ "Noise_Tiling" = 4 # Tiling of large snow noise, Smaller tiling creates larger empty areas "Noise2_Tiling" = 7 # Tiling of detail snow noise, Smaller tiling creates larger empty areas -"Texture_Tiling" = 1 +"Texture_Tiling" = 200 "Snow.Extent" = 0.43 # Maximum Southern extent of snow (top to bottom distance) "Snow.AngleRemove" = 0.25 # Snow removal based on terrain Normal angle ( 0.0 - 1.0 ) @@ -21,7 +21,7 @@ "Snow.Terrain_Area_Position" = 0.3 # Position of snow noise mask, increase to cover more area "Snow.Terrain_Area_Constrast" = 0.9 # Contrast of snow noise mask, increase to soften mask -"Snow.Area_Position" = 0.6 # Position of mesh snow noise mask, increase to cover more area +"Snow.Area_Position" = 0.9 # Position of mesh snow noise mask, increase to cover more area "Snow.Area_Constrast" = 0.9 # Contrast of mesh snow noise mask, increase to soften mask "Snow.GameMaskImpact" = 1.0 # Amount of snow added based on coded game snow mask From db9c60f09952776ba346a93a9021779409f98cab Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 00:15:53 +0000 Subject: [PATCH 12/20] Revert "Update snow_mask.dds" This reverts commit e3cce9a64d8b45c8ebd3946bbec90cf1d69d19a4. --- gfx/map/textures/snow_mask.dds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/map/textures/snow_mask.dds b/gfx/map/textures/snow_mask.dds index 199e1385..27ca6d4b 100644 --- a/gfx/map/textures/snow_mask.dds +++ b/gfx/map/textures/snow_mask.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcc3993c7baccb0ac3bcf2a8e9104430da775279e4f859282d0b47daa749e4e7 +oid sha256:23c1d8e64be7d09e713dece8bdc2c9a815ee6af78afd9745b5a4cfc6b5f7dcbf size 56623424 From 290b692ccce0c38c9697840d02f67d95745b1e57 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 00:15:57 +0000 Subject: [PATCH 13/20] Revert "fix" This reverts commit 4fece42bebf02850c4cc333baa3dba935458f912. --- gfx/map/terrain/tells_diffuse.dds | 2 +- gfx/map/terrain/tells_dry_diffuse.dds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/map/terrain/tells_diffuse.dds b/gfx/map/terrain/tells_diffuse.dds index cb2c23d3..b57b4754 100644 --- a/gfx/map/terrain/tells_diffuse.dds +++ b/gfx/map/terrain/tells_diffuse.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:925f013147b7ae6568a396a39accef625552d6bab46be1dcef1da4c8c86473df +oid sha256:6a535578d47a47b157a6448b98d5e6d8eece2901e5df139cd817d3dae97f6474 size 1398256 diff --git a/gfx/map/terrain/tells_dry_diffuse.dds b/gfx/map/terrain/tells_dry_diffuse.dds index 3a27db7f..4cf015ce 100644 --- a/gfx/map/terrain/tells_dry_diffuse.dds +++ b/gfx/map/terrain/tells_dry_diffuse.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f01a4eb8ff75eafde21192425b1c65139d64179acc17d3e0abb9fcd65b7616d2 +oid sha256:b7b036daf5ae04d785ebc682c390db97673f4a67d719f8867409f2fe2567acaa size 1398256 From 9185e4e50f6f32f424af508b31dcd8c256cb0184 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 00:16:02 +0000 Subject: [PATCH 14/20] Revert "Update snow.settings" This reverts commit 1d49a94c0f4c951a7e22fc0b505917ace66f7c5f. --- gfx/map/environment/snow.settings | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/map/environment/snow.settings b/gfx/map/environment/snow.settings index 94379a11..615047f9 100644 --- a/gfx/map/environment/snow.settings +++ b/gfx/map/environment/snow.settings @@ -4,10 +4,10 @@ "Texture_Index" = 4 # Index of snow terrain texture (Terrain texture array) "Noise_Tiling" = 4 # Tiling of large snow noise, Smaller tiling creates larger empty areas -"Noise2_Tiling" = 7 # Tiling of detail snow noise, Smaller tiling creates larger empty areas +"Noise2_Tiling" = 300 # Tiling of detail snow noise, Smaller tiling creates larger empty areas "Texture_Tiling" = 200 -"Snow.Extent" = 0.43 # Maximum Southern extent of snow (top to bottom distance) +"Snow.Extent" = 0.5 # Maximum Southern extent of snow (top to bottom distance) "Snow.AngleRemove" = 0.25 # Snow removal based on terrain Normal angle ( 0.0 - 1.0 ) "Frost.Hemisphere_Position" = 0.2 # (Use Snow.Extent) @@ -16,7 +16,7 @@ "Frost.Terrain_Area_Constrast" = 0.5 # Contrast of frost noise mask, increase to soften mask "Frost.Multiplier" = 0.55 # Frost intensity multiplier -"Snow.Hemisphere_Position" = 0.75 # (Use Snow.Extent) +"Snow.Hemisphere_Position" = 0.7 # (Use Snow.Extent) "Snow.Hemisphere_Constrast" = 0.40 # Contrast of hemisphere mask (top to bottom) "Snow.Terrain_Area_Position" = 0.3 # Position of snow noise mask, increase to cover more area "Snow.Terrain_Area_Constrast" = 0.9 # Contrast of snow noise mask, increase to soften mask From b8cbe40a36eaa445390460ad68b976ce8f2bc527 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 00:16:05 +0000 Subject: [PATCH 15/20] Revert "snow" This reverts commit cd6d40254cb51e1ceaa806f21b94ca6acffac25c. --- gfx/map/environment/snow.settings | 38 ------------------------------- gfx/map/textures/snow_mask.dds | 3 --- 2 files changed, 41 deletions(-) delete mode 100644 gfx/map/environment/snow.settings delete mode 100644 gfx/map/textures/snow_mask.dds diff --git a/gfx/map/environment/snow.settings b/gfx/map/environment/snow.settings deleted file mode 100644 index 615047f9..00000000 --- a/gfx/map/environment/snow.settings +++ /dev/null @@ -1,38 +0,0 @@ -# Access these settings ingame with "Tweak Snow." -# Recommend turning off gradient borders when adjusting visuals - -"Texture_Index" = 4 # Index of snow terrain texture (Terrain texture array) - -"Noise_Tiling" = 4 # Tiling of large snow noise, Smaller tiling creates larger empty areas -"Noise2_Tiling" = 300 # Tiling of detail snow noise, Smaller tiling creates larger empty areas -"Texture_Tiling" = 200 - -"Snow.Extent" = 0.5 # Maximum Southern extent of snow (top to bottom distance) -"Snow.AngleRemove" = 0.25 # Snow removal based on terrain Normal angle ( 0.0 - 1.0 ) - -"Frost.Hemisphere_Position" = 0.2 # (Use Snow.Extent) -"Frost.Hemisphere_Constrast" = 0.8 # Contrast of hemisphere mask (top to bottom) -"Frost.Terrain_Area_Position" = 0.7 # Position of frost noise mask, increase to cover more area -"Frost.Terrain_Area_Constrast" = 0.5 # Contrast of frost noise mask, increase to soften mask -"Frost.Multiplier" = 0.55 # Frost intensity multiplier - -"Snow.Hemisphere_Position" = 0.7 # (Use Snow.Extent) -"Snow.Hemisphere_Constrast" = 0.40 # Contrast of hemisphere mask (top to bottom) -"Snow.Terrain_Area_Position" = 0.3 # Position of snow noise mask, increase to cover more area -"Snow.Terrain_Area_Constrast" = 0.9 # Contrast of snow noise mask, increase to soften mask - -"Snow.Area_Position" = 0.9 # Position of mesh snow noise mask, increase to cover more area -"Snow.Area_Constrast" = 0.9 # Contrast of mesh snow noise mask, increase to soften mask - -"Snow.GameMaskImpact" = 1.0 # Amount of snow added based on coded game snow mask -"Snow.GameMaskMin" = 0.0 # Minimum adjustment of game snow mask -"Snow.GameMaskMax" = 0.50 # Maximum adjustment of game snow mask - -"Snow.Height_Weight" = 0.23 # Terrain material height blending -"Snow.Height_Contrast" = 14.0 # Terrain material height blending - -"Snow.TerrainHeight_Add" = 3.0 # Extra snow added based on terrain height -"Snow.TerrainHeight_Min" = 15.0 # Terrain height snow min -"Snow.TerrainHeight_Max" = 80.0 # Terrain height snow max - -"Debug.Winter_Value" = 0.0 # Debugging of the hemisphere based snow mask for adjusting visuals \ No newline at end of file diff --git a/gfx/map/textures/snow_mask.dds b/gfx/map/textures/snow_mask.dds deleted file mode 100644 index 27ca6d4b..00000000 --- a/gfx/map/textures/snow_mask.dds +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23c1d8e64be7d09e713dece8bdc2c9a815ee6af78afd9745b5a4cfc6b5f7dcbf -size 56623424 From b99590fbe4acdea7b56de2a814c50aa65bdb36b7 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 00:16:09 +0000 Subject: [PATCH 16/20] Revert "texture" This reverts commit 50520cf9418ce0e22beba8efd6d1bec29aaeeff9. --- gfx/map/terrain/tells_diffuse.dds | 2 +- gfx/map/terrain/tells_dry_diffuse.dds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/map/terrain/tells_diffuse.dds b/gfx/map/terrain/tells_diffuse.dds index b57b4754..77dcb386 100644 --- a/gfx/map/terrain/tells_diffuse.dds +++ b/gfx/map/terrain/tells_diffuse.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a535578d47a47b157a6448b98d5e6d8eece2901e5df139cd817d3dae97f6474 +oid sha256:c041c25e19fd637b54e1e62907f8457c2837bf7b5f0851615c0b48a4392c44d3 size 1398256 diff --git a/gfx/map/terrain/tells_dry_diffuse.dds b/gfx/map/terrain/tells_dry_diffuse.dds index 4cf015ce..9c62643f 100644 --- a/gfx/map/terrain/tells_dry_diffuse.dds +++ b/gfx/map/terrain/tells_dry_diffuse.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7b036daf5ae04d785ebc682c390db97673f4a67d719f8867409f2fe2567acaa +oid sha256:a51413e0080c1bd1d4d920d3704a834f6242f378e187a4f28ccd572a5eb1971a size 1398256 From 358cd1d309ef55c8e49ff1a87444a0e421625451 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 11:43:42 +0000 Subject: [PATCH 17/20] Update materials.settings --- gfx/map/terrain/materials.settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/map/terrain/materials.settings b/gfx/map/terrain/materials.settings index c15d1462..c5430fcb 100644 --- a/gfx/map/terrain/materials.settings +++ b/gfx/map/terrain/materials.settings @@ -1,4 +1,4 @@ -# masked textures +# masked textures # diffuse - relative path # normal - relative path # material - relative path From 2792b358d94a5302a80c05215b8b8c9dd7ee34f3 Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 11:54:14 +0000 Subject: [PATCH 18/20] Update descriptor.mod --- descriptor.mod | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/descriptor.mod b/descriptor.mod index 52b4ae22..b0fea938 100644 --- a/descriptor.mod +++ b/descriptor.mod @@ -8,6 +8,10 @@ replace_path="history/characters" replace_path="history/cultures" replace_path="history/provinces" replace_path="history/titles" +replace_path="gfx/map/terrain/masks" +replace_path="gfx/map/terrain/masks_gen" +replace_path="gfx/map/terrain/unmasked" +replace_path="gfx/map/map_object_data" replace_path="gfx/interface/illustrations/loading_screens" supported_version="1.18.*" path="mod/N3OW" \ No newline at end of file From cd19586e797cacbaa8b5d0332cc1edc32e5c3b0c Mon Sep 17 00:00:00 2001 From: Fishedotjpg Date: Tue, 10 Feb 2026 12:07:31 +0000 Subject: [PATCH 19/20] Update descriptor.mod --- descriptor.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/descriptor.mod b/descriptor.mod index b0fea938..98c6db73 100644 --- a/descriptor.mod +++ b/descriptor.mod @@ -11,7 +11,7 @@ replace_path="history/titles" replace_path="gfx/map/terrain/masks" replace_path="gfx/map/terrain/masks_gen" replace_path="gfx/map/terrain/unmasked" -replace_path="gfx/map/map_object_data" +replace_path="gfx/map/map_object_data/generated" replace_path="gfx/interface/illustrations/loading_screens" supported_version="1.18.*" path="mod/N3OW" \ No newline at end of file From 414e3829b27afae9d4dfce583c88dba96cf7e434 Mon Sep 17 00:00:00 2001 From: McMeme1 Date: Tue, 10 Feb 2026 13:16:34 +0100 Subject: [PATCH 20/20] rocambolist de-landed --- history/characters/NEOW_e_alps.txt | 8 ++++---- history/characters/NEOW_e_france.txt | 14 +++++++------- history/provinces/e_alps.txt | 10 +++++----- history/provinces/e_europa.txt | 2 +- history/provinces/e_france.txt | 28 ++++++++++++++-------------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/history/characters/NEOW_e_alps.txt b/history/characters/NEOW_e_alps.txt index 04d4a7e1..96595977 100644 --- a/history/characters/NEOW_e_alps.txt +++ b/history/characters/NEOW_e_alps.txt @@ -325,7 +325,7 @@ friedrich_bludenzer_4={ france_sade_alphonse = { name = "Alphonse" dynasty = sade_dynasty - religion = rocambolist + religion = simurghi culture = provencal trait = education_learning_4 trait = sadistic @@ -343,7 +343,7 @@ france_sade_alphonse = { france_bova_ivette = { name = "Ivette" dynasty = bova_dynasty - religion = rocambolist + religion = simurghi culture = piedmontese trait = education_martial_2 trait = physique_good_3 @@ -387,7 +387,7 @@ france_grimaldi_honore = { france_clement_eugene = { name = "Eugène" dynasty = clement_dynasty - religion = rocambolist + religion = ascensionist culture = patoues trait = education_intrigue_4 trait = deceitful @@ -404,7 +404,7 @@ france_clement_eugene = { france_hernaud_jean = { name = "Jean" dynasty = hernaud_dynasty - religion = rocambolist + religion = ascensionist culture = provencal trait = education_diplomacy_3 trait = deceitful diff --git a/history/characters/NEOW_e_france.txt b/history/characters/NEOW_e_france.txt index afbaec37..df9b2c14 100644 --- a/history/characters/NEOW_e_france.txt +++ b/history/characters/NEOW_e_france.txt @@ -411,7 +411,7 @@ france_spatstone_george_1 = { france0015 = { name = "Bernard" dynasty = rieux_dynasty - religion = "rocambolist" + religion = "numenorian" culture = galo trait = education_learning_4 trait = lifestyle_physician @@ -487,7 +487,7 @@ france0018 = { france0019 = { name = "Charles" dynasty = swann_dynasty - religion = "rocambolist" + religion = "ascensionist" culture = poitevin trait = education_diplomacy_3 trait = gregarious @@ -1007,7 +1007,7 @@ france_evrard_voigt = { france_lucie_trelut = { name = "Lucie" dynasty = trelut_dynasty - religion = "rocambolist" + religion = "carolingian" culture = gascon trait = education_diplomacy_3 trait = fickle @@ -1024,7 +1024,7 @@ france_lucie_trelut = { france_ferrand_andrieu = { name = "Ferrand" dynasty = andrieu_dynasty - religion = "carolingian" + religion = "iberian" culture = occitan trait = education_learning_4 trait = brave @@ -1144,7 +1144,7 @@ france_gwendolen_aco = { france_aerin_rabelais = { name = "Aerin" dynasty = bonnefont_dynasty - religion = "rocambolist" + religion = "carolingian" culture = poitevin female = yes trait = honest @@ -1348,7 +1348,7 @@ france_regis_romanin={ france_wendelin_ney={ name="Wendelin" dynasty=ney_dynasty #total larp - religion=rocambolist + religion=trenchsinger culture=rottisch 2534.1.10={birth=yes} 2600.1.1={death =yes} @@ -1384,7 +1384,7 @@ france_bookwyrm_raphael={ france_savinian_de_rostagnac={ name = "Savinian" dynasty = rostagnac_dynasty - religion = rocambolist + religion = carolingian culture = gascon trait = education_martial_4 trait = beauty_bad_2 diff --git a/history/provinces/e_alps.txt b/history/provinces/e_alps.txt index 768e16b6..34c5e359 100644 --- a/history/provinces/e_alps.txt +++ b/history/provinces/e_alps.txt @@ -337,7 +337,7 @@ ###c_isere 2027 = { # Grenoble culture = patoues - religion = rocambolist + religion = ascensionist holding = castle_holding special_building_slot = generic_university } @@ -356,7 +356,7 @@ ###c_drome 2032 = { # Valence culture = provencal - religion = rocambolist + religion = ascensionist holding = castle_holding } 2033 = { # Montélimar @@ -371,7 +371,7 @@ ###c_upper_alps 2059 = { # Gap culture = provencal - religion = rocambolist + religion = ascensionist holding = castle_holding } 2060 = { # Briançon @@ -403,7 +403,7 @@ ###c_vaucluse 2067 = { # Avignon culture = provencal - religion = rocambolist + religion = simurghi holding = castle_holding } 2068 = { # Carpentras @@ -415,7 +415,7 @@ ###c_lower_alps 2070 = { # Forcalquier culture = provencal - religion = rocambolist + religion = simurghi holding = castle_holding } 2071 = { # Digne-les-Bains diff --git a/history/provinces/e_europa.txt b/history/provinces/e_europa.txt index 83440d27..cfb0810a 100644 --- a/history/provinces/e_europa.txt +++ b/history/provinces/e_europa.txt @@ -142,7 +142,7 @@ ###c_flevoland 9698 = { holding = castle_holding - culture = dutch + culture = angler religion = genevan } 9699 = { diff --git a/history/provinces/e_france.txt b/history/provinces/e_france.txt index 8ec66693..a910cee6 100644 --- a/history/provinces/e_france.txt +++ b/history/provinces/e_france.txt @@ -902,7 +902,7 @@ ###c_armagnac 2201 = { culture = gascon - religion = rocambolist + religion = carolingian holding = castle_holding } 2204 = { @@ -923,12 +923,12 @@ ###c_bigorre 2009 = { culture = gascon - religion = rocambolist + religion = carolingianc holding = castle_holding } 2010 = { culture = gascon - religion = rocambolist + religion = carolingian holding = castle_holding } ###c_albret @@ -949,7 +949,7 @@ ###c_marsan 2199 = { culture = gascon - religion = rocambolist + religion = carolingian holding = castle_holding } 2198 = { @@ -962,7 +962,7 @@ ###c_bordeaux 2142 = { culture = gascon - religion = rocambolist + religion = carolingian holding = castle_holding special_building = fort_de_bordeaux_01 867.1.1 = { @@ -989,7 +989,7 @@ ###c_libourne 2144 = { culture = gascon - religion = rocambolist + religion = carolingian holding = castle_holding } 2143 = { @@ -998,7 +998,7 @@ ###c_agenais 2232 = { culture = gascon - religion = rocambolist + religion = carolingian holding = castle_holding } 2235 = { @@ -1007,7 +1007,7 @@ ###c_perigord 2237 = { culture = axiton - religion = rocambolist + religion = ascensionist holding = castle_holding } 2239 = { @@ -1090,7 +1090,7 @@ ###c_gevaudan 2223 = { culture = occitan - religion = rocambolist + religion = carolingian holding = castle_holding } 2221 = { @@ -1099,7 +1099,7 @@ ###c_montpellier 2016 = { culture = axiton - religion = rocambolist + religion = carolingian holding = castle_holding } 2216 = { @@ -1154,7 +1154,7 @@ ###c_toulouse 2214 = { culture = axiton - religion = rocambolist + religion = carolingian holding = castle_holding special_building = capitole_toulouse_01 1066.1.1 = { @@ -1182,7 +1182,7 @@ 2233 = { holding = city_holding culture = axiton - religion = rocambolist + religion = carolingian } 2234 = { holding = church_holding @@ -1190,7 +1190,7 @@ ###c_tarn-et-garonne 2230 = { culture = axiton - religion = rocambolist + religion = carolingian holding = castle_holding } 2208 = { @@ -1233,7 +1233,7 @@ } 2307 = { culture = bourguignon - religion = rocambolist + religion = carolingian holding = castle_holding } ##d_auvergne