Skip to content

Commit

Permalink
Add some safety checks for wilderness
Browse files Browse the repository at this point in the history
  • Loading branch information
rquinio committed Jul 16, 2016
1 parent b9eb16a commit 4133c29
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 1 deletion.
43 changes: 43 additions & 0 deletions MOD/Witcher/common/cb_types/00_cb_types.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6523,6 +6523,9 @@ rivalry_cb = {
allowed_to_target_suzerains = no

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

ROOT = {
is_rival = FROM
}
Expand Down Expand Up @@ -6665,6 +6668,9 @@ tributary_cb = {
allowed_to_target_suzerains = no

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

has_dlc = "Horse Lords"
is_feudal = no

Expand Down Expand Up @@ -7043,6 +7049,9 @@ free_tributary_cb = {
can_ask_to_join_war = no

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

has_dlc = "Horse Lords"
is_feudal = no

Expand Down Expand Up @@ -7355,6 +7364,9 @@ cb_install_khan = {
major_revolt = yes

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

has_dlc = "Horse Lords"

ROOT = {
Expand Down Expand Up @@ -7475,6 +7487,9 @@ nomad_dispute = {
allowed_to_target_suzerains = no

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

has_dlc = "Horse Lords"

ROOT = {
Expand Down Expand Up @@ -7600,6 +7615,9 @@ cb_liberate_nomad_duchy = {
infamy_modifier = 0.75

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

FROM = {
is_nomadic = yes
}
Expand Down Expand Up @@ -7781,6 +7799,9 @@ cb_minor_clan_revolt = {
is_independence = yes

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

ROOT = {
primary_title = { temporary = yes } # Revolter or adventurer trigger
war = no
Expand Down Expand Up @@ -7913,6 +7934,11 @@ nomad_subjugation = {
allowed_to_target_tributaries = no
allowed_to_target_suzerains = no

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }
}

can_use_gui = {
#higher_tier_than between ROOT and FROM would be better but its tooltip doesn't say anything about comparing character tiers
OR = {
Expand Down Expand Up @@ -8155,6 +8181,9 @@ nomad_invasion = {
}

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

ROOT = {
is_nomadic = yes
}
Expand Down Expand Up @@ -8323,6 +8352,11 @@ nomad_expansion = {
allowed_to_target_tributaries = no
allowed_to_target_suzerains = no

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }
}

can_use_gui = {
ROOT = {
prestige = 300
Expand Down Expand Up @@ -8505,6 +8539,9 @@ increase_council_power_war = { # Started from faction
major_revolt = yes

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

ROOT = {
vassal_of = FROM
}
Expand Down Expand Up @@ -8700,6 +8737,9 @@ nomad_humiliate_cb = {
allowed_to_target_suzerains = no

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

has_dlc = "Horse Lords"

ROOT = {
Expand Down Expand Up @@ -8983,6 +9023,9 @@ powerful_vassal_takeover_war = { # Started from faction
major_revolt = yes

can_use = {
FROM = { NOT = { culture = wilderness } }
ROOT = { NOT = { culture = wilderness } }

ROOT = {
vassal_of = FROM
}
Expand Down
1 change: 1 addition & 0 deletions MOD/Witcher/common/objectives/00_ambitions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1827,6 +1827,7 @@ obj_gain_any_title = {
type = character

potential = {
NOT = { culture = wilderness }
has_dlc = "Zeus"
is_adult = yes
is_playable = yes
Expand Down
4 changes: 4 additions & 0 deletions MOD/Witcher/common/objectives/00_factions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5981,6 +5981,7 @@ faction_antiking = {

# Plotter scope
potential = {
NOT = { culture = wilderness }
prisoner = no
is_ruler = yes
independent = no
Expand Down Expand Up @@ -6451,6 +6452,7 @@ faction_overthrow = {

# Plotter scope
potential = {
NOT = { culture = wilderness }
prisoner = no
is_ruler = yes
independent = no
Expand Down Expand Up @@ -7340,6 +7342,7 @@ faction_increase_council_power = {

# Plotter scope
potential = {
NOT = { culture = wilderness }
has_dlc = "Zeus"
prisoner = no
is_ruler = yes
Expand Down Expand Up @@ -7935,6 +7938,7 @@ faction_powerful_vassal_takeover = {

# Plotter scope
potential = {
NOT = { culture = wilderness }
has_dlc = "Zeus"
prisoner = no
is_ruler = yes
Expand Down
4 changes: 4 additions & 0 deletions MOD/Witcher/common/objectives/00_zeus_ambitions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ obj_become_council_member = {
}

allow = {
NOT = { culture = wilderness }
liege = { independent = yes }
NOT = {
liege = { spouse = { character = ROOT } }
Expand Down Expand Up @@ -141,6 +142,7 @@ obj_land_for_son = {
}

allow = {
NOT = { culture = wilderness }
liege = { independent = yes }
has_dlc = "Zeus"
prisoner = no
Expand Down Expand Up @@ -246,6 +248,7 @@ obj_build_a_war_chest = {
type = character

potential = {
NOT = { culture = wilderness }
has_dlc = "Zeus"
NOT = { has_character_modifier = war_chest_timer }
is_nomadic = no
Expand Down Expand Up @@ -404,6 +407,7 @@ obj_groom_an_heir = {
fertility = 0.20

potential = {
NOT = { culture = wilderness }
has_dlc = "Conclave"
higher_tier_than = BARON
}
Expand Down
2 changes: 1 addition & 1 deletion MOD/Witcher/events/W_wilderness_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ character_event = {
ai_chance = { factor = 100 }
}
option = { # to liege's culture
name = ""
name = OK
trigger = {
liege = { NOT = { culture = magic } }
}
Expand Down
9 changes: 9 additions & 0 deletions MOD/Witcher/localisation/y_nobletitles.csv
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ HEADMASTER;Headmaster;;;;;;;;;;;;;x
HEADMISTRESS;Headmistress;;;;;;;;;;;;;x
COMMANDER;Commander;;;;;;;;;;;;;x
COMMANDER_FOA;Commander;;;;;;;;;;;;;x
#Wilderness
barony_of_wilderness;Ruins of;;;;;;;;;;;;;x
temple_barony_of_wilderness;Ruins of;;;;;;;;;;;;;x
city_barony_of_wilderness;Ruins of;;;;;;;;;;;;;x
tribal_barony_of_wilderness;Ruins of;;;;;;;;;;;;;x
nomadic_barony_of_wilderness;Ruins of;;;;;;;;;;;;;x
temple_county_of_wilderness;;;;;;;;;;;;;;x
temple_duchy_of_wilderness;;;;;;;;;;;;;;x
temple_kingdom_of_wilderness;;;;;;;;;;;;;;x
# Temples called temple
temple_barony_northern_religions;Temple;Temple;Tempel;;Templo;;;;;;;;;x;
temple_barony_evil_religions;Temple;Temple;Tempel;;Templo;;;;;;;;;x;
Expand Down

0 comments on commit 4133c29

Please sign in to comment.