From 3c6fbf7bff37919ff356e7349f834f3771806e8c Mon Sep 17 00:00:00 2001
From: Andrettin <6322423+Andrettin@users.noreply.github.com>
Date: Fri, 14 Jan 2022 07:38:51 +0100
Subject: [PATCH] Updated epithets

---
 .../norse/danes/ivar_the_boneless.txt         |  2 +-
 .../norse/ynglings/dag_the_wise.txt           |  2 +-
 .../norse/ynglings/dyggve_the_brave.txt       |  2 +-
 .../norse/ynglings/gudrod_the_magnificent.txt |  2 +-
 .../norse/ynglings/halfdan_the_mild.txt       |  2 +-
 .../ynglings/ingiald_the_evil_adviser.txt     |  2 +-
 data/characters/norse/ynglings/on_the_old.txt |  2 +-
 data/epithets/epithets.txt                    | 21 +++++++++++++++++++
 8 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/data/characters/norse/danes/ivar_the_boneless.txt b/data/characters/norse/danes/ivar_the_boneless.txt
index ac7c9fe5df..2b738f1e6d 100644
--- a/data/characters/norse/danes/ivar_the_boneless.txt
+++ b/data/characters/norse/danes/ivar_the_boneless.txt
@@ -1,6 +1,6 @@
 ivar_the_boneless = {
 	name = "Ivar"
-	surname = "the Boneless"
+	epithet = the_boneless
 	unit_type = unit_norse_heroic_swordsman
 	civilization = norse
 	default_faction = denmark
diff --git a/data/characters/norse/ynglings/dag_the_wise.txt b/data/characters/norse/ynglings/dag_the_wise.txt
index d3f549a08f..b090cef8c3 100644
--- a/data/characters/norse/ynglings/dag_the_wise.txt
+++ b/data/characters/norse/ynglings/dag_the_wise.txt
@@ -1,6 +1,6 @@
 dag_the_wise_yngling = { #Source: Snorri Sturlson, "Heimskringla", 1844, vol. 1, pp. 231-233.
 	name_word = dagr
-	surname = "the Wise"
+	epithet = the_wise
 	dynasty = yngling
 	unit_type = unit_norse_heroic_swordsman #king
 	civilization = norse
diff --git a/data/characters/norse/ynglings/dyggve_the_brave.txt b/data/characters/norse/ynglings/dyggve_the_brave.txt
index 7ea5df7d57..41dedc8fff 100644
--- a/data/characters/norse/ynglings/dyggve_the_brave.txt
+++ b/data/characters/norse/ynglings/dyggve_the_brave.txt
@@ -1,6 +1,6 @@
 dyggve_the_brave_yngling = { #Source: Snorri Sturlson, "Heimskringla", 1844, vol. 1, pp. 230-231.
 	name = "Dyggve"
-	surname = "the Brave"
+	epithet = the_brave
 	dynasty = yngling
 	unit_type = unit_norse_heroic_swordsman #king
 	civilization = norse
diff --git a/data/characters/norse/ynglings/gudrod_the_magnificent.txt b/data/characters/norse/ynglings/gudrod_the_magnificent.txt
index ffddfa0ed4..6d94710329 100644
--- a/data/characters/norse/ynglings/gudrod_the_magnificent.txt
+++ b/data/characters/norse/ynglings/gudrod_the_magnificent.txt
@@ -1,6 +1,6 @@
 gudrod_the_magnificent_yngling = { #Source: Snorri Sturlson, "Heimskringla", 1844, vol. 1, pp. 259-260, 262.
 	name = "Gudrod"
-	surname = "the Magnificent" #also known as "the Hunter"
+	epithet = the_magnificent #also known as "the Hunter"
 	dynasty = yngling
 	unit_type = unit_norse_swordsman
 	civilization = norse
diff --git a/data/characters/norse/ynglings/halfdan_the_mild.txt b/data/characters/norse/ynglings/halfdan_the_mild.txt
index 4ee0e528e5..97215f7c87 100644
--- a/data/characters/norse/ynglings/halfdan_the_mild.txt
+++ b/data/characters/norse/ynglings/halfdan_the_mild.txt
@@ -1,6 +1,6 @@
 halfdan_the_mild_yngling = { #Source: Snorri Sturlson, "Heimskringla", 1844, vol. 1, p. 259.
 	name = "Halfdan"
-	surname = "the Mild" #also known as "the Bad Entertainer"
+	epithet = the_mild #also known as "the Bad Entertainer"
 	dynasty = yngling
 	unit_type = unit_norse_swordsman
 	civilization = norse
diff --git a/data/characters/norse/ynglings/ingiald_the_evil_adviser.txt b/data/characters/norse/ynglings/ingiald_the_evil_adviser.txt
index 0d33dbd323..778e8d6dd1 100644
--- a/data/characters/norse/ynglings/ingiald_the_evil_adviser.txt
+++ b/data/characters/norse/ynglings/ingiald_the_evil_adviser.txt
@@ -1,6 +1,6 @@
 ingiald_the_evil_adviser_yngling = { #Source: Snorri Sturlson, "Heimskringla", 1844, vol. 1, pp. 248-254.
 	name = "Ingiald"
-	surname = "the Evil-Adviser"
+	epithet = the_evil_adviser
 	dynasty = yngling
 	unit_type = unit_norse_heroic_swordsman
 	civilization = norse
diff --git a/data/characters/norse/ynglings/on_the_old.txt b/data/characters/norse/ynglings/on_the_old.txt
index 2d78f0bb0c..9f6143345c 100644
--- a/data/characters/norse/ynglings/on_the_old.txt
+++ b/data/characters/norse/ynglings/on_the_old.txt
@@ -1,6 +1,6 @@
 on_the_old_yngling = { #Source: Snorri Sturlson, "Heimskringla", 1844, vol. 1, pp. 239-240.
 	name = "On" #also known as Ane
-	surname = "the Old"
+	epithet = the_old
 	dynasty = yngling
 	unit_type = unit_norse_heroic_swordsman #king
 	civilization = norse
diff --git a/data/epithets/epithets.txt b/data/epithets/epithets.txt
index 8277b954a3..4feb44d524 100644
--- a/data/epithets/epithets.txt
+++ b/data/epithets/epithets.txt
@@ -25,6 +25,11 @@ the_blind = {
 	weight = 0
 }
 
+the_boneless = {
+	name = "the Boneless"
+	weight = 0
+}
+
 the_bulwark = {
 	name = "the Bulwark"
 	conditions = {
@@ -42,6 +47,16 @@ the_bold = {
 	}
 }
 
+the_brave = {
+	name = "the Brave"
+	conditions = {
+		or = {
+			trait = upgrade_ambitious
+			trait = upgrade_reckless
+		}
+	}
+}
+
 the_butcher = {
 	name = "the Butcher"
 	conditions = {
@@ -73,6 +88,7 @@ the_dim = {
 the_evil_adviser = {
 	name = "the Evil-Adviser"
 	conditions = {
+		civilization = norse
 		or = {
 			trait = upgrade_cruel
 			trait = upgrade_harsh
@@ -137,6 +153,11 @@ the_iron_shield = {
 	}
 }
 
+the_magnificent = {
+	name = "the Magnificent"
+	weight = 0
+}
+
 the_mighty = {
 	name = "the Mighty"
 	conditions = {