Feature/#146 wines and oils (#163)

* prepare changelog for next version * get started with wine and oil artifacts * stuff and things * add skeleton of dionysian mysteries for #152 * more #152 work * add localisations and start dionysia work * merge vanilla 2.8 changes cleanup still to be done, but i must sleep * fixing of the things * lol, updates generalstuff.gfx * fixes religious icons fixes atenic government fixes the Convert to Swedish decision being deleted disables some in development decisions * update readme * removes unnecessary on_actions entry * increase likelihood of Philosopher appearing and fixes the lost in sandstorm event
xirsoi · Jan 10, 2018 · 1e0ab51 · 1e0ab51
1 parent 412f249
commit 1e0ab51
Show file tree

Hide file tree

Showing 10 changed files with 452 additions and 9 deletions.
diff --git a/AncientReligions/common/cb_types/00_cb_types.txt b/AncientReligions/common/cb_types/00_cb_types.txt
@@ -3010,6 +3010,13 @@ tribal_invasion = {
 						10 = { give_nickname = nick_the_avenger }
 						10 = { give_nickname = nick_the_lion }
 						10 = { give_nickname = nick_the_bold }
+						20 = {
+							modifier = {
+								factor = 0
+								religion_group = christian
+							}
+							give_nickname = nick_the_sword_of_god
+						}
 					}
 				}
 			}

diff --git a/AncientReligions/common/on_actions/ACR_on_actions.txt b/AncientReligions/common/on_actions/ACR_on_actions.txt
@@ -5,6 +5,12 @@ on_startup = {
 	}
 }
 
+on_character_ask_to_join_society = {
+	events = {
+		ancrel.3200 # mysteries of dionysus
+	}
+}
+
 #character
 on_yearly_pulse = {
 	events = {
@@ -23,7 +29,6 @@ on_yearly_pulse = {
 
 	random_events = {
 		#The Philosopher
-		150 = ancrel.2000 # Philosopher approaches the Emperor
 		300 = ancrel.2006 # Research Project
 		300 = ancrel.2011 # Imperial Chronicle
 		300 = ancrel.2014 # Streamline the Beaurocracy

diff --git a/AncientReligions/common/scripted_effects/00_scripted_effects.txt b/AncientReligions/common/scripted_effects/00_scripted_effects.txt
@@ -13141,6 +13141,7 @@ destroy_all_ingredients_effect = {
 }
 
 
+
 calculate_health_level_of_ingredient_1_effect = {
 	hidden_effect = {
         set_variable = { # Reset potion quality

diff --git a/AncientReligions/common/scripted_triggers/ACR_scripted_triggers.txt b/AncientReligions/common/scripted_triggers/ACR_scripted_triggers.txt
@@ -316,4 +316,14 @@ has_sand_snakes_prerequisites = {
 		religion_openly_in_egyptian_subgroup_trigger = yes
 		religion_secretly_in_egyptian_subgroup_trigger = yes
 	}
+}
+
+has_dionysus_prerequisites = {
+	age = 16
+	OR = {
+		true_religion = hellenic_pagan
+		trait = mystic
+		trait = hedonist
+		trait = decadent
+	}
 }
diff --git a/AncientReligions/common/societies/ACR_secret_societies.txt b/AncientReligions/common/societies/ACR_secret_societies.txt
@@ -981,7 +981,7 @@ mysteries_dionysus = {
 
 	show_society = {
 		age = 16
-		true_religion_in_hellenic_subgroup_trigger = yes
+		has_dionysus_prerequisites = yes
 		has_global_flag = ancrel_debug
 	}
 

diff --git a/AncientReligions/decisions/conversion_decisions.txt b/AncientReligions/decisions/conversion_decisions.txt
@@ -738,6 +738,7 @@ targetted_decisions = {
 			}
 		}
 	}
+
 	convert_to_norwegian = {
 		only_playable = yes
 

diff --git a/AncientReligions/events/ACR_dionysus_events.txt b/AncientReligions/events/ACR_dionysus_events.txt
@@ -13,6 +13,57 @@ namespace = ancrel
 ####################
 # ancrel.3200 - 3249
 
+# ask to join society
+character_event = {
+	id = ancrel.3200
+	hide_window = yes
+	is_triggered_only = yes
+
+	trigger = {
+		FROM = { leader = { society_member_of = mysteries_dionysus}}
+	}
+
+	immediate = {
+		FROM = { leader = { character_event = { id = ancrel.3201 } } }
+	}
+}
+
+# bounce invite off leader
+character_event = {
+	id = ancrel.3201
+	hide_window = yes
+
+	is_triggered_only = yes
+
+	immediate = { # bounce it back
+		FROM = { character_event = { id = ancrel.3202 } }
+	}
+}
+
+# ask if they are ready for the initiation
+# FROM is society leader
+character_event = {
+	id = ancrel.3202
+	desc = ancrel.3202.desc
+	picture = GFX_evt_whisper
+
+	is_triggered_only = yes
+
+	option = { # i'm ready
+		name = ancrel.3202.a
+		custom_tooltip = {
+			text = ancrel.3202.tooltip
+			hidden_tooltip = {
+				character_event = { id = ancrel.3203 }
+			}
+		}
+	}
+
+	option = { # on second thought...
+		name = ancrel.3202.b
+	}
+}
+
 #####################
 ## Dionysia events ##
 #####################

diff --git a/AncientReligions/events/ACR_egyptian_events.txt b/AncientReligions/events/ACR_egyptian_events.txt
@@ -2981,7 +2981,6 @@ character_event = {
 	only_capable = yes
 
 	trigger = {
-		is_inaccessible_trigger = no
 		NOR = { 
 			has_character_flag = lost_in_sandstorm
 			has_character_flag = awaiting_the_tribes

diff --git a/AncientReligions/events/ACR_hellenic_revival_events.txt b/AncientReligions/events/ACR_hellenic_revival_events.txt
@@ -47,7 +47,7 @@ character_event = {
 		}
 
 		NOR = {
-			realm_size = 131 						# empire is in big trouble, like at the alexiad start date
+			realm_size = 180 						# empire is in big trouble, like at the alexiad start date
 			has_character_flag = ancrel_philosopher # hasn't had the event already
 			religion_group = pagan_group 			# is still christian
 			any_courtier = {
@@ -1509,11 +1509,11 @@ character_event = {
 		name = EVTOPTCancrel.2101
 		trigger = {
 			OR = {
-			  trait = arbitrary
-			  trait = scholar
-			  trait = mystic
-			  trait = lunatic
-			  trait = possessed
+				trait = arbitrary
+				trait = scholar
+				trait = mystic
+				trait = lunatic
+				trait = possessed
 		    }
 		}
 		if = {