diff --git a/After the End Fan Fork/common/cb_types/00_cb_types.txt b/After the End Fan Fork/common/cb_types/00_cb_types.txt index 57ccacdaf..36c2156f9 100644 --- a/After the End Fan Fork/common/cb_types/00_cb_types.txt +++ b/After the End Fan Fork/common/cb_types/00_cb_types.txt @@ -3518,6 +3518,15 @@ crusade = { can_use_gui = { ROOT = { + custom_tooltip = { + text = CRUSADE_COOLDOWN + religion_scope = { + OR = { + NOT = { has_flag = crusade_fired } + had_flag = { flag = crusade_fired days = 3650 } + } + } + } uses_new_crusade = no has_called_crusade = no religion_authority = 0.05 @@ -3565,6 +3574,7 @@ crusade = { religion = midewiwin_reformed religion = raven_tales_reformed } + pacifist = no custom_tooltip = { text = CTT_PAGAN_GHWS_UNLOCKED has_global_flag = pagan_ghws_unlocked @@ -3644,6 +3654,17 @@ crusade = { ROOT = { uses_new_crusade = no can_call_crusade = yes + trigger_if = { + limit = { religion = americanist } + NOT = { + any_independent_ruler = { + any_war = { + attacker = { religion = americanist } + using_cb = crusade + } + } + } + } } FROM = { @@ -3687,7 +3708,10 @@ crusade = { is_valid = { ROOT = { - can_call_crusade = yes + OR = { + can_call_crusade = yes + religion = americanist + } } FROM = { OR = { @@ -3715,7 +3739,20 @@ crusade = { } on_add = { - hidden_tooltip = { fire_haruspicy_event_effect = yes } + hidden_tooltip = { + fire_haruspicy_event_effect = yes + if = { + limit = { + has_game_rule = { name = holy_war_cooldown_rule value = off } + } + ROOT = { + religion_scope = { + clr_flag = crusade_fired + set_flag = crusade_fired + } + } + } + } if = { limit = { defender = { is_offmap_governor = offmap_china } } attacker = { @@ -3999,9 +4036,11 @@ crusade = { hidden_tooltip = { if = { - OR = { - this_has_lame_nickname_trigger = yes - has_nickname = no + limit = { + OR = { + this_has_lame_nickname_trigger = yes + has_nickname = no + } } random_list = { 10 = { give_nickname = nick_the_holy } @@ -4991,13 +5030,9 @@ new_crusade = { character_event = { id = HFP.41090 days = 1 } if = { limit = { - NOR = { - trait = crusader - trait = crusader_king - trait = crusader_queen - } + has_crusade_trait_trigger = no } - add_trait = crusader + add_crusade_trait_effect = yes } } character_event = { id = HFP.41007 } @@ -5216,6 +5251,7 @@ new_crusade = { NOR = { has_character_flag = grandCrusader trait = crusader_king + trait = crusader_queen } } set_character_flag = grandCrusader @@ -5225,6 +5261,7 @@ new_crusade = { OR = { has_character_flag = grandCrusader trait = crusader_king + trait = crusader_queen } } narrative_event = { id = HF.49020 } diff --git a/After the End Fan Fork/common/heir_text/00_heir_text.txt b/After the End Fan Fork/common/heir_text/00_heir_text.txt index 089f7ced5..87092d9e3 100644 --- a/After the End Fan Fork/common/heir_text/00_heir_text.txt +++ b/After the End Fan Fork/common/heir_text/00_heir_text.txt @@ -1589,20 +1589,7 @@ heir_text_crusader = { # Crusader/Other GHW trait } modifier = { factor = 0 - NOR = { - trait = valhalla_bound - trait = sword_of_the_lamb - trait = fords_striker - trait = knight_templar - trait = lughs_own - trait = danite - trait = order_of_the_garter - trait = crusader - trait = shaddai - trait = jaguar_warrior - trait = thunderbird_warrior - trait = raven_warrior - } + has_crusade_trait_trigger = no } } } diff --git a/After the End Fan Fork/common/on_actions/00_on_actions.txt b/After the End Fan Fork/common/on_actions/00_on_actions.txt index 24e82f62b..0a7a94404 100644 --- a/After the End Fan Fork/common/on_actions/00_on_actions.txt +++ b/After the End Fan Fork/common/on_actions/00_on_actions.txt @@ -1776,6 +1776,7 @@ on_crusade_creation = { consumer.4 # Consumerist Marketing Campaigns event_atomicist.200 # Atomicist First Strikes rustcultist.2 # Rust Cultist Industrial Action + americanist_crusade.1 # Americanist Liberation War CM.10015 # Chronicle entry } diff --git a/After the End Fan Fork/common/religions/00_religions.txt b/After the End Fan Fork/common/religions/00_religions.txt index 316005af7..11d36f3e5 100644 --- a/After the End Fan Fork/common/religions/00_religions.txt +++ b/After the End Fan Fork/common/religions/00_religions.txt @@ -2333,9 +2333,10 @@ oldworld = { can_excommunicate = yes can_grant_claim = yes can_grant_divorce = yes - allow_viking_invasion = yes - can_grant_invasion_cb = invasion + #allow_viking_invasion = yes + #can_grant_invasion_cb = invasion allow_rivermovement = yes + can_call_crusade = yes #female_temple_holders = yes #feminist = yes diff --git a/After the End Fan Fork/common/scripted_effects/00_scripted_effects.txt b/After the End Fan Fork/common/scripted_effects/00_scripted_effects.txt index 1a224de1f..ba24e1164 100644 --- a/After the End Fan Fork/common/scripted_effects/00_scripted_effects.txt +++ b/After the End Fan Fork/common/scripted_effects/00_scripted_effects.txt @@ -4099,6 +4099,17 @@ add_crusade_trait_effect = { add_trait = hivernant break = yes } + if = { + limit = { + OR = { + religion = americanist + religion = hamiltonian + religion = jeffersonian + } + } + add_trait = service_cross + break = yes + } } ###MONKS & MYSTICS### diff --git a/After the End Fan Fork/common/scripted_triggers/00_scripted_triggers.txt b/After the End Fan Fork/common/scripted_triggers/00_scripted_triggers.txt index 2e4e865d3..704370691 100644 --- a/After the End Fan Fork/common/scripted_triggers/00_scripted_triggers.txt +++ b/After the End Fan Fork/common/scripted_triggers/00_scripted_triggers.txt @@ -813,6 +813,14 @@ has_crusade_trait_trigger = { religion = exovedate trait = hivernant } + AND = { + OR = { + religion = americanist + religion = hamiltonian + religion = jeffersonian + } + trait = service_cross + } } } diff --git a/After the End Fan Fork/common/traits/00_traits.txt b/After the End Fan Fork/common/traits/00_traits.txt index 21e184fb8..ff7446400 100644 --- a/After the End Fan Fork/common/traits/00_traits.txt +++ b/After the End Fan Fork/common/traits/00_traits.txt @@ -720,6 +720,7 @@ crusader = { raven_warrior dragon_soldier hivernant + service_cross } martial = 2 diff --git a/After the End Fan Fork/common/traits/01_traits.txt b/After the End Fan Fork/common/traits/01_traits.txt index fc0c8d894..33e9234e8 100644 --- a/After the End Fan Fork/common/traits/01_traits.txt +++ b/After the End Fan Fork/common/traits/01_traits.txt @@ -6,6 +6,8 @@ mujahid = { opposites = { crusader + crusader_king + crusader_queen valhalla_bound jaguar_warrior fords_striker @@ -18,6 +20,8 @@ mujahid = { thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 diff --git a/After the End Fan Fork/common/traits/02_traits.txt b/After the End Fan Fork/common/traits/02_traits.txt index 833e667ac..582e1c1ef 100644 --- a/After the End Fan Fork/common/traits/02_traits.txt +++ b/After the End Fan Fork/common/traits/02_traits.txt @@ -1861,18 +1861,22 @@ immortal = { valhalla_bound = { opposites = { crusader + crusader_king + crusader_queen mujahid + jaguar_warrior fords_striker sword_of_the_lamb knight_templar order_of_the_garter danite - lughs_own shaddai - jaguar_warrior + lughs_own thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -2106,19 +2110,22 @@ sea_queen = { shaddai = { opposites = { + crusader_king + crusader_queen mujahid valhalla_bound - crusader + jaguar_warrior fords_striker sword_of_the_lamb knight_templar order_of_the_garter danite lughs_own - jaguar_warrior thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -3554,14 +3561,19 @@ crusader_king = { crusader_queen mujahid valhalla_bound + jaguar_warrior fords_striker sword_of_the_lamb knight_templar order_of_the_garter + danite shaddai lughs_own - jaguar_warrior + thunderbird_warrior + raven_warrior dragon_soldier + hivernant + service_cross } ai_zeal = 20 @@ -3586,14 +3598,19 @@ crusader_queen = { crusader_king mujahid valhalla_bound + jaguar_warrior fords_striker sword_of_the_lamb knight_templar order_of_the_garter + danite shaddai lughs_own - jaguar_warrior + thunderbird_warrior + raven_warrior dragon_soldier + hivernant + service_cross } ai_zeal = 20 diff --git a/After the End Fan Fork/common/traits/ARR_traits.txt b/After the End Fan Fork/common/traits/ARR_traits.txt index 9dc4af07f..b852db6c0 100644 --- a/After the End Fan Fork/common/traits/ARR_traits.txt +++ b/After the End Fan Fork/common/traits/ARR_traits.txt @@ -206,18 +206,22 @@ wolf = { jaguar_warrior = { opposites = { crusader + crusader_king + crusader_queen mujahid - shaddai - fords_striker valhalla_bound + fords_striker sword_of_the_lamb knight_templar order_of_the_garter danite + shaddai lughs_own thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -242,18 +246,22 @@ jaguar_warrior = { dragon_soldier = { opposites = { crusader + crusader_king + crusader_queen mujahid - shaddai - fords_striker valhalla_bound + jaguar_warrior + fords_striker sword_of_the_lamb knight_templar order_of_the_garter danite + shaddai lughs_own thunderbird_warrior raven_warrior - jaguar_warrior + hivernant + service_cross } martial = 2 diff --git a/After the End Fan Fork/common/traits/am_traits.txt b/After the End Fan Fork/common/traits/am_traits.txt index f956e5d69..bd73dd0a9 100644 --- a/After the End Fan Fork/common/traits/am_traits.txt +++ b/After the End Fan Fork/common/traits/am_traits.txt @@ -894,18 +894,22 @@ gracia_libertador = { fords_striker = { opposites = { crusader + crusader_king + crusader_queen mujahid - jaguar_warrior - shaddai valhalla_bound + jaguar_warrior sword_of_the_lamb knight_templar order_of_the_garter danite + shaddai lughs_own thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -928,17 +932,22 @@ fords_striker = { sword_of_the_lamb = { opposites = { crusader + crusader_king + crusader_queen mujahid - jaguar_warrior - shaddai valhalla_bound + jaguar_warrior fords_striker knight_templar order_of_the_garter + danite + shaddai lughs_own thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -961,18 +970,22 @@ sword_of_the_lamb = { knight_templar = { opposites = { crusader + crusader_king + crusader_queen mujahid - jaguar_warrior - shaddai valhalla_bound + jaguar_warrior fords_striker sword_of_the_lamb order_of_the_garter danite + shaddai lughs_own thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -995,18 +1008,22 @@ knight_templar = { order_of_the_garter = { opposites = { crusader + crusader_king + crusader_queen mujahid - jaguar_warrior - shaddai valhalla_bound + jaguar_warrior fords_striker sword_of_the_lamb knight_templar danite + shaddai lughs_own thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -1040,18 +1057,22 @@ libertador_descendant = { danite = { opposites = { crusader + crusader_king + crusader_queen mujahid - jaguar_warrior - shaddai valhalla_bound + jaguar_warrior fords_striker sword_of_the_lamb knight_templar order_of_the_garter + shaddai lughs_own thunderbird_warrior raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -1074,18 +1095,22 @@ danite = { thunderbird_warrior = { opposites = { crusader + crusader_king + crusader_queen mujahid - jaguar_warrior - shaddai valhalla_bound + jaguar_warrior fords_striker sword_of_the_lamb knight_templar order_of_the_garter - lughs_own danite + shaddai + lughs_own raven_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -1108,18 +1133,22 @@ thunderbird_warrior = { raven_warrior = { opposites = { crusader + crusader_king + crusader_queen mujahid - jaguar_warrior - shaddai valhalla_bound + jaguar_warrior fords_striker sword_of_the_lamb knight_templar order_of_the_garter - lughs_own danite + shaddai + lughs_own thunderbird_warrior dragon_soldier + hivernant + service_cross } martial = 2 @@ -1990,6 +2019,40 @@ tire_machet = { customizer = no } +service_cross = { + opposites = { + crusader + crusader_king + crusader_queen + mujahid + valhalla_bound + jaguar_warrior + fords_striker + sword_of_the_lamb + knight_templar + order_of_the_garter + danite + shaddai + lughs_own + thunderbird_warrior + raven_warrior + dragon_soldier + hivernant + } + + martial = 2 + combat_rating = 10 #old value: 1 + + church_opinion = 15 + same_opinion_if_same_religion = 15 + + ai_zeal = 10 + customizer = no + + male_compliment_adj = COMPL_DECORATED + female_compliment_adj = COMPL_DECORATED +} + #Commented these out because I have no idea what these are supposed to do. #fair_credit = { @@ -2075,4 +2138,4 @@ tire_machet = { # religious = yes # religious_branch = yes # customizer = no -#} +#} \ No newline at end of file diff --git a/After the End Fan Fork/common/traits/exometis.txt b/After the End Fan Fork/common/traits/exometis.txt index f87aa6dbe..b7f64e58b 100644 --- a/After the End Fan Fork/common/traits/exometis.txt +++ b/After the End Fan Fork/common/traits/exometis.txt @@ -1,19 +1,22 @@ hivernant = { opposites = { crusader + crusader_king + crusader_queen mujahid - shaddai - fords_striker valhalla_bound + jaguar_warrior + fords_striker sword_of_the_lamb knight_templar order_of_the_garter danite + shaddai lughs_own thunderbird_warrior raven_warrior - jaguar_warrior dragon_soldier + service_cross } martial = 2 diff --git a/After the End Fan Fork/events/HF_alternate_start_events.txt b/After the End Fan Fork/events/HF_alternate_start_events.txt index 7cef06286..8405a7c00 100644 --- a/After the End Fan Fork/events/HF_alternate_start_events.txt +++ b/After the End Fan Fork/events/HF_alternate_start_events.txt @@ -380,7 +380,7 @@ narrative_event = { # Activate GHW's and holy orders when running randomized rel set_global_flag = ghw_activated set_global_flag = christian_crusades_unlocked set_global_flag = ursuline_crusades_unlocked - #set_global_flag = liberation_wars_unlocked #Disabled till these get fixed + set_global_flag = liberation_wars_unlocked set_global_flag = mormon_expeditions_unlocked set_global_flag = pagan_ghws_unlocked set_global_flag = muslim_jihads_unlocked diff --git a/After the End Fan Fork/events/americanist_crusade_events.txt b/After the End Fan Fork/events/americanist_crusade_events.txt new file mode 100644 index 000000000..be43faea6 --- /dev/null +++ b/After the End Fan Fork/events/americanist_crusade_events.txt @@ -0,0 +1,271 @@ + +namespace = americanist_crusade + +# AMERICANIST LIBERATION WAR +# Called from 'on_crusade_creation' +# new_character is the targetted enemy +# ROOT is the religious head +# FROM is the attacked kingdom title +narrative_event = { + id = americanist_crusade.1 + title = EVTNAME200 + picture = GFX_evt_battle + border = GFX_event_narrative_frame_war + + desc = { + text = EVTDESC_liberation_war + trigger = { + OR = { + new_character = { + NOT = { religion_group = christian } + NOT = { religion_group = pagan_group } + } + has_alternate_start_parameter = { key = religion_names value = random } + } + } + } + desc = { + text = EVTDESC_liberation_war_pagan + trigger = { + new_character = { + religion_group = pagan_group + } + NOT = { + has_alternate_start_parameter = { key = religion_names value = random } + } + } + } + desc = { + text = EVTDESC_liberation_war_christ + trigger = { + new_character = { + religion_group = christian + } + NOT = { + has_alternate_start_parameter = { key = religion_names value = random } + } + } + } + + is_triggered_only = yes + major = yes + show_ROOT = yes + hide_new = yes + + trigger = { + can_call_crusade = yes + ROOT = { + religion = americanist + } + } + + option = { + name = EVTOPTA324 # For [God Name]! + trigger = { religion = ROOT } + } + option = { + name = EVTOPTB200 # No concern of ours + trigger = { + NOT = { religion = ROOT } + new_character = { + NOT = { religion = PREV } + NOT = { character = PREV } + } + } + } + option = { + name = EVTOPTD200 # To Arms! + trigger = { + new_character = { + character = PREV + } + } + } + option = { + name = EVTOPTE200 # Terrible News! + trigger = { + new_character = { + religion = PREV + NOT = { character = PREV } + } + } + } +} + +narrative_event = { + id = americanist_crusade.2 + title = EVTNAME39690 + desc = EVTDESC39690 + picture = GFX_evt_battle + border = GFX_event_narrative_frame_religion + + major = yes + + show_ROOT = yes + hide_new = yes + + only_playable = yes + min_age = 16 + + religion = americanist + + trigger = { + NOT = { #immersion-breaking + has_alternate_start_parameter = { key = religion_names value = random } + } + religion = americanist + controls_religion = yes + year = 2675 + + NOT = { has_global_flag = liberation_wars_unlocked } + } + + is_triggered_only = yes + + immediate = { + set_global_flag = liberation_wars_unlocked + } + + option = { + name = EVTOPTA39690 + trigger = { + religion_openly_americanist_or_heresy_trigger = yes + } + } + + option = { + name = EVTOPTB39690 + trigger = { + NOT = { religion_openly_americanist_or_heresy_trigger = yes } + } + } +} + +narrative_event = { + id = americanist_crusade.3 + title = EVTNAME39690 + desc = EVTDESC39693 + picture = GFX_evt_battle + border = GFX_event_narrative_frame_religion + + major = yes + + show_ROOT = yes + hide_new = yes + + only_playable = yes + min_age = 16 + + religion = americanist + + trigger = { + NOT = { #immersion-breaking + has_alternate_start_parameter = { key = religion_names value = random } + } + religion = americanist + controls_religion = yes + NOT = { has_global_flag = liberation_wars_unlocked } + + calc_true_if = { + amount = 2 + AND = { + 3 = { # manhattan + owner = { + NOT = { religion_openly_americanist_or_heresy_trigger = yes } + } + } + } + AND = { + 27 = { # philadelphia + owner = { + NOT = { religion_openly_americanist_or_heresy_trigger = yes } + } + } + } + AND = { + 383 = { # rushmore + owner = { + NOT = { religion_openly_americanist_or_heresy_trigger = yes } + } + } + } + } + } + + mean_time_to_happen = { + months = 3 + } + + immediate = { + set_global_flag = liberation_wars_unlocked + } + + option = { + name = EVTOPTA39690 + trigger = { + religion_openly_americanist_or_heresy_trigger = yes + } + } + + option = { + name = EVTOPTB39690 + trigger = { + NOT = { religion_openly_americanist_or_heresy_trigger = yes } + } + } +} + +narrative_event = { + id = americanist_crusade.4 + title = EVTNAME39690 + desc = EVTDESC39692 + picture = GFX_evt_battle + border = GFX_event_narrative_frame_religion + + major = yes + + show_ROOT = yes + hide_new = yes + + religion = americanist + + only_playable = yes + min_age = 16 + + trigger = { + NOT = { #immersion-breaking + has_alternate_start_parameter = { key = religion_names value = random } + } + religion = americanist + controls_religion = yes + NOT = { has_global_flag = liberation_wars_unlocked } + + 63 = { # DC + owner = { + NOT = { religion_openly_americanist_or_heresy_trigger = yes } + } + } + } + + mean_time_to_happen = { + months = 3 + } + + immediate = { + set_global_flag = liberation_wars_unlocked + } + + option = { + name = EVTOPTA39690 + trigger = { + religion_openly_americanist_or_heresy_trigger = yes + } + } + + option = { + name = EVTOPTB39690 + trigger = { + NOT = { religion_openly_americanist_or_heresy_trigger = yes } + } + } +} \ No newline at end of file diff --git a/After the End Fan Fork/gfx/traits/service_cross.dds b/After the End Fan Fork/gfx/traits/service_cross.dds new file mode 100644 index 000000000..af82f122f Binary files /dev/null and b/After the End Fan Fork/gfx/traits/service_cross.dds differ diff --git a/After the End Fan Fork/interface/000_ate.gfx b/After the End Fan Fork/interface/000_ate.gfx index 6e9b63f26..826c12d9d 100644 --- a/After the End Fan Fork/interface/000_ate.gfx +++ b/After the End Fan Fork/interface/000_ate.gfx @@ -4121,4 +4121,11 @@ spriteTypes = { name = "GFX_hunt_for_whale" texturefile = "gfx\\interface\\decision_icon_whale_hunt.dds" } + spriteType = { + name = "GFX_trait_service_cross" + texturefile = "gfx/traits/service_cross.dds" + noOfFrames = 1 + norefcount = yes + effectFile = "gfx/FX/buttonstate.lua" + } } \ No newline at end of file diff --git a/After the End Fan Fork/localisation/00_AMERICA.csv b/After the End Fan Fork/localisation/00_AMERICA.csv index 89c220f5a..1b733be07 100644 --- a/After the End Fan Fork/localisation/00_AMERICA.csv +++ b/After the End Fan Fork/localisation/00_AMERICA.csv @@ -635,6 +635,8 @@ scholar_desc;This character leads the life of a scholar, poring over books and c CAMPAIGN_FUND_MORMON;Tithing Donation;;;;;;;;;;;;;x CAMPAIGN_FUND_CARDINALS_DESC;Money given as a tithing donation will increase your influence with the church and make your candidate more likely to called as the next $RULER_TITLE$. You can freely adjust the amount until the next $RULER_TITLE$ is called, when the donation will be used.;;;;;;;;;;;;;x +CRUSADE_COOLDOWN;A [Root.Religion.GetCrusadeName] for the [Root.Religion.GetName] faith has not been called in the last 10 years\n;;;;;;;;;x + ###########Traits########### sympathy_afro_syncretic;Sympathy for [afro_syncretic.GetGroupName];;;;;;;;;;;;;x @@ -763,6 +765,8 @@ broad_anglican;Broad Church;;;;;;;;;;;;;x broad_anglican_desc;This character is a follower of the Broad Church, believing in a middle ground on principles of church authority and rituals.;;;;;;;;;;;;;x low_anglican;Low Church;;;;;;;;;;;;;x low_anglican_desc;This character is a follower of the Low Church, believing in a decentralized church and less emphasis on rituals.;;;;;;;;;;;;;x +service_cross;Service Cross;;;;;;;;;;;;;x +service_cross_desc;This character has fought to retake holy American land.;;;;;;;;;;;;; ###########Bloodlines########### yudkow;Blood of the Lawgiver;;;;;;;;;;;;;x