Merge pull request #209 from xirsoi/develop

v0.44.1 Gwydion

Author: la-xirsoi

ACR_Changelog.md

@@ -1,4 +1,4 @@
-2019-07-11 v0.44.1 "Gwydion"
+2019-07-21 v0.44.1 "Gwydion"
 ===========================
 
 > Gwyddion, son of Don, is a Welsh mythic figure featured in the Fourth Branch of the Mabinogi. Magician, trickster, and hero, Gwydion's adventures are varied and long.
@@ -7,6 +7,10 @@ General:
 
 - Merges Irish history changes from CK2 3.2.1
 
+Celtic:
+
+- Fixed a bug where the headhunter and living legend events could fire seemingly simultaneously.
+
 Promethean:
 
 - Fixes bug that caused an event to be fired ~13,000 times after the First Academy is restored.

AncientReligions/events/ACR_celtic_headhunter_events.txt

@@ -28,16 +28,17 @@ character_event = {
 
 	trigger = {
 		is_alive = yes
-		NOT = { trait = head1 }
 		religion_openly_celtic_or_reformed_trigger = yes
 		OR = {
 			trait = brave
 			trait = fian
 			trait = celtic_knight
 			trait = wroth
 		}
-		NOT = {
+		NOR = {
 			has_religion_feature = religion_peaceful
+			trait = head1
+			trait = head2
 		}
 	}
 
@@ -152,6 +153,7 @@ character_event = {
 	option = {
 		name = celtic.10.a
 		add_trait = head1
+		set_character_flag = ancrel_headhunter
 	}
 }
 
@@ -182,6 +184,7 @@ character_event = {
 		}
 		NOT = { trait = head2 }
 		religion_openly_celtic_or_reformed_trigger = yes
+		had_character_flag = { flag = ancrel_headhunter days = 780 }
 	}
 
 	weight_multiplier = {
@@ -333,4 +336,8 @@ character_event = {
 			}
 		}
 	}
+
+	after = {
+		clr_character_flag = ancrel_headhunter
+	}
 }