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.

Sign up for GitHub

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

Arcane scrying tenet #1370

Open
wants to merge 10 commits into
base: magic-2024
Choose a base branch
from
Open

Arcane scrying tenet #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
42b1ca3
replace astrology with new trait + loc fixes
edmund-h Dec 24, 2023
7e2c24f
add icon, change how old tenet was removed
edmund-h Dec 24, 2023
2f2b625
update scrying for m2024, add aquatic ver for TM
edmund-h Feb 17, 2024
5ecd265
add perk selection logic from new doctrines
edmund-h Feb 17, 2024
f5d410b
add AI selection weights for magic
edmund-h Feb 17, 2024
4100559
rearrange values because you cant pass in params
edmund-h Feb 18, 2024
cbe9ff5
move new selection values to focuses
edmund-h Feb 21, 2024
6b4c21d
add selection values for elemental control
edmund-h Feb 21, 2024
e31451e
Merge branch 'magic-2024' into arcane_scrying_tenet
edmund-h Feb 23, 2024
8b54baf
switch akkoroc over to aquatic divination tenet
edmund-h Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions common/focuses/wc_lifestyle_focuses.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ order_magic_focus_1 = {

auto_selection_weight = {
value = wc_order_magic_auto_selection_value
if = {
limit = { faith = { has_doctrine = tenet_arcane_scrying } }
multiply = wc_lifestyle_focus_auto_selection_weight_multiply_from_doctrine_value
}
}

focus_id = 24
Expand All @@ -217,6 +221,10 @@ order_magic_focus_2 = {

auto_selection_weight = {
value = wc_order_magic_auto_selection_value
if = {
limit = { faith = { has_doctrine = tenet_arcane_scrying } }
multiply = wc_lifestyle_focus_auto_selection_weight_multiply_from_doctrine_value
}
}

focus_id = 25
Expand All @@ -237,6 +245,10 @@ order_magic_focus_3 = {

auto_selection_weight = {
value = wc_order_magic_auto_selection_value
if = {
limit = { faith = { has_doctrine = tenet_arcane_scrying } }
multiply = wc_lifestyle_focus_auto_selection_weight_multiply_from_doctrine_value
}
}

focus_id = 26
Expand Down Expand Up @@ -441,6 +453,9 @@ elemental_water_magic_focus_1 = {

auto_selection_weight = {
value = wc_elemental_water_spirit_magic_auto_selection_value
if = { limit = { faith = { has_doctrine = tenet_aquatic_divination } }
multiply = wc_lifestyle_focus_auto_selection_weight_multiply_from_doctrine_value
}
}

focus_id = 36
Expand All @@ -461,6 +476,9 @@ elemental_water_magic_focus_2 = {

auto_selection_weight = {
value = wc_elemental_water_magic_auto_selection_value
if = { limit = { faith = { has_doctrine = tenet_aquatic_divination } }
multiply = wc_lifestyle_focus_auto_selection_weight_multiply_from_doctrine_value
}
}

focus_id = 37
Expand All @@ -481,6 +499,9 @@ elemental_water_magic_focus_3 = {

auto_selection_weight = {
value = wc_elemental_water_decay_magic_auto_selection_value
if = { limit = { faith = { has_doctrine = tenet_aquatic_divination } }
multiply = wc_lifestyle_focus_auto_selection_weight_multiply_from_doctrine_value
}
}

focus_id = 38
Expand Down
106 changes: 95 additions & 11 deletions common/religion/doctrines/00_core_tenets.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,6 +1786,7 @@
}
}

# Warcraft (we have better ways of telling the future, but not everyone likes them...)
tenet_astrology = {
icon = core_tenet_astrology

Expand All @@ -1798,21 +1799,12 @@
like_judaism_religion_trigger = yes
like_islam_religion_trigger = yes
}
has_doctrine = doctrine_order_magic_approved
}
value = faith_tenet_cost_high
}
else_if = {
limit = {
OR = {
# Warcraft
like_zoroastrianism_religion_trigger = yes
like_pagan_religion_trigger = yes
}
}
value = faith_tenet_cost_low
}
else = {
value = faith_tenet_cost_mid
value = faith_tenet_cost_low
}

# Multiplier for keeping same tenet
Expand All @@ -1824,9 +1816,14 @@

# Warcraft
is_shown = {
tenet_aquatic_divination_allowed_trigger = no
tenet_moon_worship_allowed_trigger = no
}

can_pick = {
NOT = { has_doctrine = tenet_arcane_scrying }
}

parameters = {
divine_the_stars_active = yes
}
Expand Down Expand Up @@ -3896,4 +3893,91 @@
cannibalism_legal = yes
}
}

tenet_arcane_scrying = {
icon = tenet_arcane_scrying

piety_cost = {
if = {
value = faith_tenet_cost_high
}


# Multiplier for keeping same tenet
if = {
limit = { has_doctrine = tenet_arcane_scrying }
multiply = faith_unchanged_doctrine_cost_mult
}
}

is_shown = {
tenet_moon_worship_allowed_trigger = no
tenet_aquatic_divination_allowed_trigger = no
}

can_pick = {
incompatible_tenet_MAGIC_magic_not_accepted_trigger = { MAGIC = elemental_water }
NOT = { has_doctrine = tenet_astrology }
}

parameters = {
divine_the_stars_active = yes
arcane_scrying_opinion_active = yes
opinion_of_arcane_scrying_opinion_active = 15
arcane_lifestyle_exp_bonus = 0.05
}

character_modifier = {
naval_movement_speed_mult = 0.15
character_travel_safety_mult = 0.5
intrigue_scheme_resistance = 0.1
diplomacy_scheme_power = -0.1
}
}

tenet_aquatic_divination = {
icon = tenet_aquatic_divination

piety_cost = {
if = {
limit = {
OR = {
has_doctrine = doctrine_elemental_water_decay_magic_approved
has_doctrine = doctrine_elemental_water_spirit_magic_approved
}
}
value = faith_tenet_cost_low
}
else = {
value = faith_tenet_cost_high
}

# Multiplier for keeping same tenet
if = {
limit = { has_doctrine = tenet_aquatic_divination }
multiply = faith_unchanged_doctrine_cost_mult
}
}

is_shown = {
tenet_aquatic_divination_allowed_trigger = yes
}

can_pick = {
incompatible_tenet_MAGIC_magic_not_accepted_trigger = { MAGIC = order }
}

parameters = {
divine_the_stars_active = yes
elemental_water_lifestyle_exp_bonus = 0.05
}

character_modifier = {
naval_movement_speed_mult = 0.25
character_travel_safety_mult = 0.5
intrigue_scheme_resistance = 0.1
diplomacy_scheme_power = -0.1
}
}

}
6 changes: 3 additions & 3 deletions common/religion/religions/arcane_group.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@

doctrine = tenet_aniconism
doctrine = tenet_hedonistic
doctrine = tenet_astrology
doctrine = tenet_arcane_scrying

holy_order_names = {
{ name = "holy_order_shendralar" }
Expand All @@ -285,7 +285,7 @@

doctrine = tenet_sun_worship
doctrine = tenet_esotericism
doctrine = tenet_astrology
doctrine = tenet_arcane_scrying

#Main Group
doctrine = doctrine_spiritual_head
Expand Down Expand Up @@ -319,7 +319,7 @@
holy_site = sunwell_plateau
holy_site = nordrassil

doctrine = tenet_astrology
doctrine = tenet_arcane_scrying
doctrine = tenet_communal_identity
doctrine = tenet_hedonistic

Expand Down
2 changes: 1 addition & 1 deletion common/religion/religions/avian_group.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@

doctrine = tenet_sun_worship
doctrine = tenet_sky_burials
doctrine = tenet_astrology
doctrine = tenet_arcane_scrying

#Main Group
doctrine = doctrine_pluralism_fundamentalist
Expand Down
2 changes: 1 addition & 1 deletion common/religion/religions/light_group.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
doctrine = special_doctrine_eastern_kingdoms_syncretism

doctrine = tenet_esotericism
doctrine = tenet_astrology
doctrine = tenet_arcane_scrying
doctrine = tenet_order_syncretism

localization = {
Expand Down
4 changes: 2 additions & 2 deletions common/religion/religions/naarism.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
holy_site = lordaeron
holy_site = sunwell_plateau

doctrine = tenet_astrology
doctrine = tenet_arcane_scrying
doctrine = tenet_pacifism
doctrine = tenet_unrelenting_faith

Expand All @@ -291,7 +291,7 @@
#Main Group
doctrine = doctrine_pluralism_fundamentalist

doctrine = tenet_astrology
doctrine = tenet_monasticism
doctrine = tenet_armed_pilgrimages
doctrine = tenet_unrelenting_faith

Expand Down
2 changes: 1 addition & 1 deletion common/religion/religions/shadow_group.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@

doctrine = tenet_esotericism #most arcane religions have this
doctrine = tenet_communal_identity #forsaken group identity
doctrine = tenet_astrology #most arcane religions have this
doctrine = tenet_arcane_scrying #most arcane religions have this

doctrine = doctrine_no_head
doctrine = doctrine_theocracy_lay_clergy
Expand Down
2 changes: 1 addition & 1 deletion common/religion/religions/shathgral_group.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@

doctrine = tenet_sacred_shadows
doctrine = tenet_ritual_cannibalism
doctrine = tenet_astrology
doctrine = tenet_arcane_scrying

localization = {
#HighGod
Expand Down
4 changes: 2 additions & 2 deletions common/religion/religions/titanic_group.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
holy_site = dun_niffelem

doctrine = tenet_progressivism
doctrine = tenet_astrology
doctrine = tenet_arcane_scrying
doctrine = tenet_pacifism

holy_order_names = {
Expand Down Expand Up @@ -344,7 +344,7 @@

doctrine = tenet_warmonger
# doctrine = tenet_sun_worship
doctrine = tenet_astrology
doctrine = tenet_arcane_scrying
doctrine = tenet_progressivism

#Magic
Expand Down
2 changes: 1 addition & 1 deletion common/religion/religions/void_group.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
holy_site = andaroth
holy_site = dalaran

doctrine = tenet_astrology
doctrine = tenet_arcane_scrying
doctrine = tenet_esotericism
doctrine = tenet_mendicant_preachers

Expand Down
4 changes: 2 additions & 2 deletions common/religion/religions/water_group.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
doctrine = doctrine_temporal_head
doctrine = doctrine_gender_male_dominated

doctrine = tenet_astrology
doctrine = tenet_aquatic_divination
doctrine = tenet_ancestor_worship
doctrine = tenet_communal_identity

Expand Down Expand Up @@ -515,7 +515,7 @@
#Special
doctrine = special_doctrine_eastern_kingdoms_syncretism

doctrine = tenet_astrology
doctrine = tenet_aquatic_divination
doctrine = tenet_monasticism
doctrine = tenet_mendicant_preachers

Expand Down
4 changes: 2 additions & 2 deletions common/religion/religions/wc_draconism.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
holy_site = sunwell_plateau
holy_site = azurewing_rest

doctrine = tenet_astrology
doctrine = tenet_arcane_scrying
doctrine = tenet_unrelenting_faith
doctrine = tenet_esotericism

Expand Down Expand Up @@ -405,7 +405,7 @@

doctrine = tenet_unrelenting_faith
doctrine = tenet_communal_identity
doctrine = tenet_astrology
doctrine = tenet_arcane_scrying

localization = {
#Creator
Expand Down
Loading