Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

common/coat_of_arms/coat_of_arms/france.txt

@@ -1,55 +1,28 @@
 e_france={
-	pattern="pattern_horizontal_split_01.dds"
-	color1=black
-	color2=black
-	colored_emblem={
-		color1=white
-		texture="ce_fleur.dds"
-		instance={position={1 1} scale={0.2 0.2}}
-		instance={position={0.8 1} scale={0.2 0.2}}
-		instance={position={0.6 1} scale={0.2 0.2}}
-		instance={position={0.4 1} scale={0.2 0.2}}
-		instance={position={0.2 1} scale={0.2 0.2}}
-		instance={position={0 1} scale={0.2 0.2}}
-		instance={position={0.9 0.8} scale={0.2 0.2}}
-		instance={position={0.7 0.8} scale={0.2 0.2}}
-		instance={position={0.5 0.8} scale={0.2 0.2}}
-		instance={position={0.3 0.8} scale={0.2 0.2}}
-		instance={position={0.1 0.8} scale={0.2 0.2}}
-		instance={position={1 0.6} scale={0.2 0.2}}
-		instance={position={0.8 0.6} scale={0.2 0.2}}
-		instance={position={0.6 0.6} scale={0.2 0.2}}
-		instance={position={0.4 0.6} scale={0.2 0.2}}
-		instance={position={0.2 0.6} scale={0.2 0.2}}
-		instance={position={0 0.6} scale={0.2 0.2}}
-		instance={position={0.9 0.4} scale={0.2 0.2}}
-		instance={position={0.7 0.4} scale={0.2 0.2}}
-		instance={position={0.5 0.4} scale={0.2 0.2}}
-		instance={position={0.3 0.4} scale={0.2 0.2}}
-		instance={position={0.1 0.4} scale={0.2 0.2}}
-		instance={position={1 0.2} scale={0.2 0.2}}
-		instance={position={0.8 0.2} scale={0.2 0.2}}
-		instance={position={0.6 0.2} scale={0.2 0.2}}
-		instance={position={0.4 0.2} scale={0.2 0.2}}
-		instance={position={0.2 0.2} scale={0.2 0.2}}
-		instance={position={0 0.2} scale={0.2 0.2}}
-		instance={position={0.9 0} scale={0.2 0.2}}
-		instance={position={0.7 0} scale={0.2 0.2}}
-		instance={position={0.5 0} scale={0.2 0.2}}
-		instance={position={0.3 0} scale={0.2 0.2}}
-		instance={position={0.1 0} scale={0.2 0.2}}
-	}
-}
-k_gondor={ # Flag for e_france if held by Numenoreans
-	pattern="pattern_solid.dds"
-	color1=black
-	color2=white
-	color3=black
-	colored_emblem={
-		color1=white
-		texture="NEOW_ce_gondor_tree.dds"
-		instance={scale={0.89 0.89}}
-	}
+    custom=yes
+    pattern="pattern_vertical_split_01.dds"
+    color1=blue
+    color2=red
+    color3=red
+    colored_emblem={
+        color1=yellow
+        texture="NEOW_ce_nap_eagle.dds"
+        instance={
+            scale={ 0.755000 0.755000 }
+        }
+
+    }
+
+    colored_emblem={
+        color1=white
+        texture="ce_block_01.dds"
+        instance={
+            depth=1.010000
+            rotation=90
+        }
+
+    }
+
 }
k_brittany={
 	pattern="pattern_horizontal_split_01.dds"
 	color1=white

common/coat_of_arms/dynamic_definitions/NEOW_cultural_coa.txt

@@ -15,5 +15,29 @@ e_france = {
 			holder.faith = faith:soleil_royal
 		}
 		coat_of_arms = e_france_soleil_royal
+	}
+	item = {
+		trigger = {
+			holder.faith = faith:communard
+		}
+		coat_of_arms = e_france_communist
 	}	
+	item = {
+		trigger = {
+			holder.faith = faith:jacobin
+		}
+		coat_of_arms = e_france_jacobin
+	}	
+	item = {
+		trigger = {
+			holder.faith = faith:orleaniste
+		}
+		coat_of_arms = e_france_johannic
+	}	
+	item = {
+		trigger = {
+			holder.faith = faith:carolingian
+		}
+		coat_of_arms = e_france_carolingian
+	}
 }

common/game_concepts/neow_religion_game_concepts.txt

@@ -63,4 +63,7 @@ neow_tsar = {
 }
 neow_tsar_nicholas = {
 	texture = "gfx/interface/icons/faith/tsarist.dds"
+}
+neow_sisu = {
+	texture = "gfx/interface/icons/faith/sisuist.dds"
 }

common/religion/religions/NEOW_finnic.txt

@@ -42,8 +42,8 @@ finnic_religion = { #placeholder
 	doctrine = doctrine_no_anointment
 
 	traits = {
-		virtues = { forgiving compassionate chaste }
-		sins = { vengeful sadistic lustful }
+		virtues = { humble compassionate brave }
+		sins = { arrogant sadistic craven }
 	}
 
 	reserved_male_names = { #these might be alright?
@@ -267,6 +267,162 @@ finnic_religion = { #placeholder
 
 			doctrine = doctrine_pilgrimage_local_rites
 			doctrine = unreformed_faith_doctrine
+			doctrine = doctrine_pluralism_pluralistic
+					
+			localization = {
+				#HighGod
+				HighGodName = kalevalaist_high_god_name
+				HighGodNamePossessive = kalevalaist_high_god_name_possessive
+				HighGodNameSheHe = CHARACTER_SHEHE_HE
+				HighGodHerselfHimself = CHARACTER_HIMSELF
+				HighGodHerHis = CHARACTER_HERHIS_HIS
+				HighGodNameAlternate = kalevalaist_high_god_name_alternate
+				HighGodNameAlternatePossessive = kalevalaist_high_god_name_alternate_possessive
+
+				#Creator
+				CreatorName = kalevalaist_creator_god_name
+				CreatorNamePossessive = kalevalaist_creator_god_name_possessive
+				CreatorSheHe = CHARACTER_SHEHE_SHE
+				CreatorHerHis = CHARACTER_HERHIS_HER
+				CreatorHerHim = CHARACTER_HERHIM_HER
+
+				#HealthGod
+				HealthGodName = kalevalaist_health_god_name
+				HealthGodNamePossessive = kalevalaist_health_god_name_possessive
+				HealthGodSheHe = CHARACTER_SHEHE_SHE
+				HealthGodHerHis = CHARACTER_HERHIS_HER
+				HealthGodHerHim = CHARACTER_HERHIM_HER
+				
+				#FertilityGod
+				FertilityGodName = kalevalaist_fertility_god_name
+				FertilityGodNamePossessive = kalevalaist_fertility_god_name_possessive
+				FertilityGodSheHe = CHARACTER_SHEHE_SHE
+				FertilityGodHerHis = CHARACTER_HERHIS_HER
+				FertilityGodHerHim = CHARACTER_HERHIM_HER
+
+				#WealthGod
+				WealthGodName = kalevalaist_wealth_god_name
+				WealthGodNamePossessive = kalevalaist_wealth_god_name_possessive
+				WealthGodSheHe = CHARACTER_SHEHE_HE
+				WealthGodHerHis = CHARACTER_HERHIS_HIS
+				WealthGodHerHim = CHARACTER_HERHIM_HIM
+
+				#HouseholdGod
+				HouseholdGodName = kalevalaist_household_god_name
+				HouseholdGodNamePossessive = kalevalaist_household_god_name_possessive
+				HouseholdGodSheHe = CHARACTER_SHEHE_THEY
+				HouseholdGodHerHis = CHARACTER_HERHIS_THEIR
+				HouseholdGodHerHim = CHARACTER_HERHIM_THEM
+
+				#FateGod
+				FateGodName = kalevalaist_fate_god_name
+				FateGodNamePossessive = kalevalaist_fate_god_name_possessive
+				FateGodSheHe = CHARACTER_SHEHE_SHE
+				FateGodHerHis = CHARACTER_HERHIS_HER
+				FateGodHerHim = CHARACTER_HERHIM_HER
+
+				#KnowledgeGod
+				KnowledgeGodName = kalevalaist_knowledge_god_name
+				KnowledgeGodNamePossessive = kalevalaist_knowledge_god_name_possessive
+				KnowledgeGodSheHe = CHARACTER_SHEHE_HE
+				KnowledgeGodHerHis = CHARACTER_HERHIS_HIS
+				KnowledgeGodHerHim = CHARACTER_HERHIM_HIM
+
+				#WarGod
+				WarGodName = kalevalaist_war_god_name
+				WarGodNamePossessive = kalevalaist_war_god_name_possessive
+				WarGodSheHe = CHARACTER_SHEHE_HE
+				WarGodHerHis = CHARACTER_HERHIS_HIS
+				WarGodHerHim = CHARACTER_HERHIM_HIM
+
+				#TricksterGod
+				TricksterGodName = kalevalaist_trickster_god_name
+				TricksterGodNamePossessive = kalevalaist_trickster_god_name_possessive
+				TricksterGodSheHe = CHARACTER_SHEHE_HE
+				TricksterGodHerHis = CHARACTER_HERHIS_HIS
+				TricksterGodHerHim = CHARACTER_HERHIM_HIM
+
+				#NightGod
+				NightGodName = kalevalaist_night_god_name
+				NightGodNamePossessive = kalevalaist_night_god_name_possessive
+				NightGodSheHe = CHARACTER_SHEHE_SHE
+				NightGodHerHis = CHARACTER_HERHIS_HER
+				NightGodHerHim = CHARACTER_HERHIM_HER
+
+				#WaterGod
+				WaterGodName = kalevalaist_water_god_name
+				WaterGodNamePossessive = kalevalaist_water_god_name_possessive
+				WaterGodSheHe = CHARACTER_SHEHE_HE
+				WaterGodHerHis = CHARACTER_HERHIS_HIS
+				WaterGodHerHim = CHARACTER_HERHIM_HIM
+
+				PantheonTerm = kalevalaist_high_god_name
+				PantheonTermHasHave = pantheon_term_has
+				GoodGodNames = {
+					kalevalaist_high_god_name
+					kalevalaist_creator_god_name
+					kalevalaist_high_god_name_alternate
+					kalevalaist_wealth_god_name
+					kalevalaist_fertility_god_name
+					kalevalaist_health_god_name
+					kalevalaist_trickster_god_name
+					kalevalaist_water_god_name
+				}
+				DevilName = kalevalaist_devil_name
+				DevilNamePossessive = kalevalaist_devil_name_possessive
+				DevilSheHe = CHARACTER_SHEHE_HE
+				DevilHerHis = CHARACTER_HERHIS_HIS
+				DevilHerHis = CHARACTER_HERHIS_HIS
+				DevilHerselfHimself = CHARACTER_HIMSELF
+				EvilGodNames = {
+					kalevalaist_devil_name
+					kalevalaist_war_god_name
+				}
+				HouseOfWorship = kalevalaist_house_of_worship
+				HouseOfWorshipPlural = kalevalaist_house_of_worship_plural
+				ReligiousSymbol = kalevalaist_religious_symbol
+				ReligiousText = kalevalaist_religious_text
+				ReligiousHeadName = kalevalaist_religious_head_title
+				ReligiousHeadTitleName = kalevalaist_religious_head_title_name
+				DevoteeMale = kalevalaist_devotee
+				DevoteeMalePlural = kalevalaist_devotee_plural
+				DevoteeFemale = kalevalaist_devotee
+				DevoteeFemalePlural = kalevalaist_devotee_plural
+				DevoteeNeuter = kalevalaist_devotee
+				DevoteeNeuterPlural = kalevalaist_devotee_plural
+				PriestMale = kalevalaist_priest
+				PriestMalePlural = kalevalaist_priest_plural
+				PriestFemale = kalevalaist_priest
+				PriestFemalePlural = kalevalaist_priest_plural
+				PriestNeuter = kalevalaist_priest
+				PriestNeuterPlural = kalevalaist_priest_plural
+				BishopMale = kalevalaist_bishop
+				BishopMalePlural = kalevalaist_bishop_plural
+				BishopFemale = kalevalaist_bishop
+				BishopFemalePlural = kalevalaist_bishop_plural
+				BishopNeuter = kalevalaist_bishop
+				BishopNeuterPlural = kalevalaist_bishop_plural
+				DivineRealm = kalevalaist_positive_afterlife
+				PositiveAfterLife = kalevalaist_positive_afterlife
+				NegativeAfterLife = kalevalaist_negative_afterlife
+				DeathDeityName = kalevalaist_death_deity_name
+				DeathDeityNamePossessive = kalevalaist_death_deity_name_possessive
+				DeathDeitySheHe = CHARACTER_SHEHE_SHE
+				DeathDeityHerHis = CHARACTER_HERHIS_HER
+				DeathDeityHerHim = CHARACTER_HERHIM_HER
+				WitchGodName = kalevalaist_witch_god_name
+				WitchGodNamePossessive = kalevalaist_witch_god_name_possessive
+				WitchGodHerHis = CHARACTER_HERHIS_HER
+				WitchGodSheHe = CHARACTER_SHEHE_SHE
+				WitchGodHerHim = CHARACTER_HERHIM_HER
+				WitchGodMistressMaster = mistress
+				WitchGodMotherFather = mother
+
+
+				GHWName = ghw_crusade
+				GHWNamePlural = ghw_crusades
+
+			}
 		}
 		sami_pagan = {
 			color = { 204 195 102 }
@@ -282,7 +438,7 @@ finnic_religion = { #placeholder
 
 			#Tenets
 			doctrine = tenet_communal_identity
-			doctrine = tenet_druidry
+			doctrine = tenet_sun_worship
 			doctrine_selection_pair = {
 				requires_dlc_flag = all_under_heaven
 				doctrine = tenet_takamin
@@ -310,6 +466,7 @@ finnic_religion = { #placeholder
 			doctrine = tenet_militant_vows
 
 			doctrine = doctrine_pilgrimage_local_rites
+			doctrine = doctrine_pluralism_fundamentalist
 		}
 	}
 }