From 1e0ab510e6768565a9e299397c34cb02425f1e27 Mon Sep 17 00:00:00 2001 From: Adam Chevalier Date: Wed, 10 Jan 2018 11:54:42 -0600 Subject: [PATCH] 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 --- .../common/cb_types/00_cb_types.txt | 7 + .../common/on_actions/ACR_on_actions.txt | 7 +- .../scripted_effects/00_scripted_effects.txt | 1 + .../ACR_scripted_triggers.txt | 10 + .../common/societies/ACR_secret_societies.txt | 2 +- .../decisions/conversion_decisions.txt | 1 + .../events/ACR_dionysus_events.txt | 51 +++ .../events/ACR_egyptian_events.txt | 1 - .../events/ACR_hellenic_revival_events.txt | 12 +- .../00_customizable_localisation.txt | 369 ++++++++++++++++++ 10 files changed, 452 insertions(+), 9 deletions(-) diff --git a/AncientReligions/common/cb_types/00_cb_types.txt b/AncientReligions/common/cb_types/00_cb_types.txt index 617b7f50..8af83173 100644 --- 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 index 092d43ec..903e869a 100644 --- 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 index ef2e3ce0..d1a41a75 100644 --- 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 index 87f1f22e..8c41fb14 100644 --- 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 + } } \ No newline at end of file diff --git a/AncientReligions/common/societies/ACR_secret_societies.txt b/AncientReligions/common/societies/ACR_secret_societies.txt index 1a5e4269..b8171a7c 100644 --- 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 index 2bef52f6..390965c6 100644 --- 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 index 9f1ecfe6..56881945 100644 --- 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 index 1d436c87..64467889 100644 --- 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 index 4081e20f..d429af07 100644 --- 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 = { diff --git a/AncientReligions/localisation/customizable_localisation/00_customizable_localisation.txt b/AncientReligions/localisation/customizable_localisation/00_customizable_localisation.txt index 4812123f..c4d9e8ed 100644 --- a/AncientReligions/localisation/customizable_localisation/00_customizable_localisation.txt +++ b/AncientReligions/localisation/customizable_localisation/00_customizable_localisation.txt @@ -2409,6 +2409,7 @@ defined_text = { trigger = { is_aztec_secret_religious_society_member_trigger = yes } } + text = { localisation_key = String_May_the_Ancestors_guide_you trigger = { @@ -5123,6 +5124,374 @@ defined_text = { } +defined_text = { + name = GetHermeticInvention + text = { + trigger = { has_character_flag = war_invention } + localisation_key = String_warfare + } + text = { + trigger = { has_character_flag = prosperity_invention } + localisation_key = String_prosperity + } + text = { + trigger = { has_character_flag = knowledge_invention } + localisation_key = String_scholarship + } +} + +defined_text = { + name = GetSocietyRankUpTooltip1 + + text = { + trigger = { society_rank == 1 } + localisation_key = GetSocietyRankUpTooltip1_Standard_Rank1 + } + text = { + trigger = { society_rank == 2 } + localisation_key = GetSocietyRankUpTooltip1_Standard_Rank2 + } + text = { + trigger = { society_rank == 3 } + localisation_key = GetSocietyRankUpTooltip1_Standard_Rank3 + } +} + +defined_text = { + name = GetSocietyRankUpTooltip2 + + text = { + trigger = { + NOR = { + society_member_of = monastic_order_jain + society_member_of = monastic_order_buddhist + } + } + localisation_key = "" + } + text = { + trigger = { + society_rank == 1 + OR = { + society_member_of = monastic_order_jain + society_member_of = monastic_order_buddhist + } + } + localisation_key = GetSocietyRankUpTooltip2_MOBuddhistJain_Rank1 + } + text = { + trigger = { + society_rank == 2 + OR = { + society_member_of = monastic_order_jain + society_member_of = monastic_order_buddhist + } + } + localisation_key = GetSocietyRankUpTooltip2_MOBuddhistJain_Rank2 + } + text = { + trigger = { + society_rank == 3 + OR = { + society_member_of = monastic_order_jain + society_member_of = monastic_order_buddhist + } + } + localisation_key = GetSocietyRankUpTooltip2_MOBuddhistJain_Rank3 + } +} + +defined_text = { + name = GetSocietyRankUpTooltip4 + + text = { + trigger = { + NOR = { + society_member_of = monastic_order_jain + society_member_of = monastic_order_buddhist + } + } + localisation_key = "" + } + text = { + trigger = { + society_rank == 1 + OR = { + piety = 1000 + trait = zealous + trait = content + } + NOT = { trait = cynical } + } + localisation_key = String_pious + } + text = { + trigger = { + OR = { + trait = just + AND = { + OR = { + trait = kind + trait = charitable + } + NOR = { + trait = arbitrary + trait = craven + trait = slothful + trait = content + } + } + } + } + localisation_key = String_righteous + } + text = { + trigger = { + OR = { + trait = just + trait = kind + trait = charitable + } + NOR = { + trait = wroth + trait = cruel + trait = impaler + } + } + localisation_key = String_benevolent + } + text = { + trigger = { trait = brave } + localisation_key = String_brave + } + text = { + trigger = { trait = honest } + localisation_key = String_sincere + } + text = { + trigger = { + is_female = yes + is_attractive_trigger = yes + } + localisation_key = String_lovely + } + text = { + trigger = { + OR = { + trait = fair + trait = gregarious + trait = socializer + } + has_unpleasant_trait_trigger = no + NOR = { + trait = ugly + trait = drunkard + trait = hedonist + trait = lustful + } + } + localisation_key = String_graceful + } + text = { + trigger = { + higher_tier_than = DUKE + } + localisation_key = String_great + } + text = { + trigger = { + higher_tier_than = DUKE + } + localisation_key = String_eminent + } + text = { + trigger = { + tier = EMPEROR + } + localisation_key = String_exalted + } + text = { + trigger = { + tier = EMPEROR + } + localisation_key = String_magnificent + } + text = { + trigger = { + is_offmap_ruler = yes + } + localisation_key = String_heavenly + } +} + +defined_text = { + name = GetChineseOffmapTributaryPrestigeCost + text = { + trigger = { FROM = { tier = COUNT } } + localisation_key = String_offmap_cost_prestige_count + } + text = { + trigger = { FROM = { tier = DUKE } } + localisation_key = String_offmap_cost_prestige_duke + } + text = { + trigger = { FROM = { tier = KING is_nomadic = no } } + localisation_key = String_offmap_cost_prestige_king + } + text = { + trigger = { FROM = { tier = EMPEROR is_nomadic = no } } + localisation_key = String_offmap_cost_prestige_emperor + } + text = { + trigger = { FROM = { tier = KING is_nomadic = yes } } + localisation_key = String_offmap_cost_prestige_king_nomad + } + text = { + trigger = { FROM = { tier = EMPEROR is_nomadic = yes } } + localisation_key = String_offmap_cost_prestige_emperor_nomad + } +} + +defined_text = { #being ordered context + name = GetChineseForceOpenDemand + text = { + trigger = { has_character_flag = force_open_china_demands_tribute } + localisation_key = String_force_open_china_demands_tribute + } + text = { + trigger = { has_character_flag = force_open_china_demands_trade_post } + localisation_key = String_force_open_china_demands_trade_post + } + text = { + trigger = { has_character_flag = force_open_china_demands_wealth } + localisation_key = String_force_open_china_demands_wealth + } + text = { + trigger = { has_character_flag = force_open_china_demands_eunuch } + localisation_key = String_force_open_china_demands_eunuch + } + text = { + trigger = { has_character_flag = force_open_china_demands_concubine } + localisation_key = String_force_open_china_demands_concubine + } + text = { + trigger = { has_character_flag = force_open_china_demands_return_chinese } + localisation_key = String_force_open_china_demands_chinese + } + text = { + trigger = { has_character_flag = force_open_china_demands_backup } + localisation_key = String_force_open_china_demands_wealth #backup does reduced wealth + } +} + +defined_text = { #third person context + name = GetChineseForceOpenDemandChina + text = { + trigger = { has_character_flag = force_open_china_demands_tribute } + localisation_key = String_force_open_china_demands_tribute_china + } + text = { + trigger = { has_character_flag = force_open_china_demands_trade_post } + localisation_key = String_force_open_china_demands_trade_post_china + } + text = { + trigger = { has_character_flag = force_open_china_demands_wealth } + localisation_key = String_force_open_china_demands_wealth_china + } + text = { + trigger = { has_character_flag = force_open_china_demands_eunuch } + localisation_key = String_force_open_china_demands_eunuch_china + } + text = { + trigger = { has_character_flag = force_open_china_demands_concubine } + localisation_key = String_force_open_china_demands_concubine_china + } + text = { + trigger = { has_character_flag = force_open_china_demands_return_chinese } + localisation_key = String_force_open_china_demands_chinese_china + } + text = { + trigger = { has_character_flag = force_open_china_demands_backup } + localisation_key = String_force_open_china_demands_wealth_china #backup does reduced wealth + } +} + + + + + + + + + + + +###NON-REUSABLE LOC KEYS### +defined_text = { + name = GetCGMission + text = { + trigger = { has_character_flag = cg_diplomatic_visit } + localisation_key = GetCGMission_diplomatic_visit + } + text = { + trigger = { has_character_flag = cg_oversee_troops } + localisation_key = GetCGMission_oversee_troops + } + text = { + trigger = { has_character_flag = cg_study_military } + localisation_key = GetCGMission_study_military + } + text = { + trigger = { has_character_flag = cg_oversee_tax_collection } + localisation_key = GetCGMission_oversee_tax_collection + } + text = { + trigger = { has_character_flag = cg_trade } + localisation_key = GetCGMission_trade + } + text = { + trigger = { has_character_flag = cg_preaching } + localisation_key = GetCGMission_preaching + } + text = { + trigger = { has_character_flag = cg_study_theology } + localisation_key = GetCGMission_study_theology + } +} + +defined_text = { + name = GetCGMissionOutcome + text = { + trigger = { has_character_flag = cg_diplomatic_visit } + localisation_key = GetCGMissionOutcome_diplomatic_visit + } + text = { + trigger = { has_character_flag = cg_oversee_troops } + localisation_key = GetCGMissionOutcome_oversee_troops + } + text = { + trigger = { has_character_flag = cg_study_military } + localisation_key = GetCGMissionOutcome_study_military + } + text = { + trigger = { has_character_flag = cg_oversee_tax_collection } + localisation_key = GetCGMissionOutcome_oversee_tax_collection + } + text = { + trigger = { has_character_flag = cg_trade } + localisation_key = GetCGMissionOutcome_trade + } + text = { + trigger = { has_character_flag = cg_preaching } + localisation_key = GetCGMissionOutcome_preaching + } + text = { + trigger = { has_character_flag = cg_study_theology } + localisation_key = GetCGMissionOutcome_study_theology + } +} + + defined_text = { name = GetHermeticInvention text = {