Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/#146 wines and oils #163

Merged
merged 16 commits into from
Jan 10, 2018
7 changes: 7 additions & 0 deletions AncientReligions/common/cb_types/00_cb_types.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion AncientReligions/common/on_actions/ACR_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ on_startup = {
}
}

on_character_ask_to_join_society = {
events = {
ancrel.3200 # mysteries of dionysus
}
}

#character
on_yearly_pulse = {
events = {
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13141,6 +13141,7 @@ destroy_all_ingredients_effect = {
}



calculate_health_level_of_ingredient_1_effect = {
hidden_effect = {
set_variable = { # Reset potion quality
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion AncientReligions/common/societies/ACR_secret_societies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
1 change: 1 addition & 0 deletions AncientReligions/decisions/conversion_decisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,7 @@ targetted_decisions = {
}
}
}

convert_to_norwegian = {
only_playable = yes

Expand Down
51 changes: 51 additions & 0 deletions AncientReligions/events/ACR_dionysus_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
#####################
Expand Down
1 change: 0 additions & 1 deletion AncientReligions/events/ACR_egyptian_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions AncientReligions/events/ACR_hellenic_revival_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down
Loading