Skip to content

Commit

Permalink
Fix validation errors #25
Browse files Browse the repository at this point in the history
  • Loading branch information
rquinio committed Dec 17, 2016
1 parent 799e548 commit 0b060cc
Show file tree
Hide file tree
Showing 27 changed files with 111 additions and 170 deletions.
2 changes: 1 addition & 1 deletion MOD/Witcher/ValidatorSettings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ AddFlag = ContextValidator.IgnoreAlreadyInAndClauseWarning
###########################################

# Disables check that all keys are found in the localization file. This assumes that you use keys everywhere. If not you'll get lots of false positives.
#AddFlag = NoCheckKey
AddFlag = NoCheckKey
# Don't check for the existence of a "_adj" entry for titles
#AddFlag = NoTitleAdjCheckKey
# If localization keys appear in both vanilla and in a mod, don't report an error.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,6 @@ physician_bad_trigger = {
physician_good_trigger = {
OR = {
is_learned_trigger = yes
religion_group = jewish_group
}
}

Expand Down
2 changes: 1 addition & 1 deletion MOD/Witcher/decisions/minor_decisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ decisions = {
}
modifier = {
factor = 0
NOT = { has_character_modifer = old_age }
NOT = { has_character_modifier = old_age }
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions MOD/Witcher/events/adventures_the_old_gods.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ character_event = {
is_female = no
liege = { has_law = status_of_women_4 }
liege = { has_law = true_cognatic_succession }
liege = { religion = cathar }
liege = { religion = messalian }
liege = { religion = druidic }
liege = { religion = dryad }
has_game_rule = {
name = gender
value = all
Expand Down Expand Up @@ -783,8 +783,8 @@ character_event = {
is_female = no
liege = { has_law = status_of_women_4 }
liege = { has_law = true_cognatic_succession }
liege = { religion = cathar }
liege = { religion = messalian }
liege = { religion = druidic }
liege = { religion = dryad }
has_game_rule = {
name = gender
value = all
Expand Down
24 changes: 0 additions & 24 deletions MOD/Witcher/events/court_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -224,29 +224,6 @@ character_event = {
}
}
}
option = {
name = {
text = EVTOPTC73001 # These are books created by satan!
trigger = {
religion_group = christian
}
}
name = {
text = EVTOPTD73001 # These are books created by Shaytan!
trigger = {
religion_group = muslim
}
}

ai_chance = {
factor = 1
modifier = {
factor = 0
NOT= { trait = zealous }
}
}
piety = 10
}
}

#The Church wants to organise a Miracle play for a local saint
Expand Down Expand Up @@ -314,7 +291,6 @@ character_event = {
min_age = 15
only_playable = yes
prisoner = no
religion_group = christian

trigger = {
in_command = no
Expand Down
2 changes: 1 addition & 1 deletion MOD/Witcher/events/family_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ character_event = {
ai = no
capable_only = yes
prisoner = no
religion_group = christian

war = no

trigger = {
Expand Down
10 changes: 1 addition & 9 deletions MOD/Witcher/events/feast_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1919,10 +1919,6 @@ character_event = {
}
NOT = { trait = chaste }
}
OR = {
religion_group = christian
religion_group = jewish_group
}
has_lover = no
NOT = { trait = shy }
fertility = 0.4
Expand Down Expand Up @@ -2000,10 +1996,6 @@ character_event = {
}
NOT = { trait = chaste }
}
OR = {
religion_group = christian
religion_group = jewish_group
}
has_lover = no
NOT = { trait = shy }
fertility = 0.4
Expand Down Expand Up @@ -2519,7 +2511,7 @@ character_event = {
}
}
NOT = {
is_friend ROOT
is_friend = ROOT
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions MOD/Witcher/events/female_councillor_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,8 @@ character_event = {
NOR = {
primary_title = { has_law = status_of_women_3 }
primary_title = { has_law = status_of_women_4 }
religion = cathar
religion = messalian
religion = dryad
religion = druidic
has_game_rule = {
name = gender
value = all
Expand Down Expand Up @@ -1293,8 +1293,8 @@ character_event = {
NOR = {
primary_title = { has_law = status_of_women_3 }
primary_title = { has_law = status_of_women_4 }
religion = cathar
religion = messalian
religion = druidic
religion = dryad
has_game_rule = {
name = gender
value = all
Expand Down
8 changes: 4 additions & 4 deletions MOD/Witcher/events/feudal_life_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2495,7 +2495,7 @@ character_event = {
only_playable = yes
capable_only = yes
prisoner = no
religion_group = christian

war = no
friends = yes
rivals = yes
Expand Down Expand Up @@ -2615,7 +2615,7 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
religion_group = christian

war = no

trigger = {
Expand Down Expand Up @@ -3140,7 +3140,7 @@ character_event = {
only_men = yes
capable_only = yes
prisoner = no
religion_group = christian

war = no

trigger = {
Expand Down Expand Up @@ -3259,7 +3259,7 @@ character_event = {
only_playable = yes
capable_only = yes
prisoner = no
religion_group = christian

war = no

trigger = {
Expand Down
1 change: 0 additions & 1 deletion MOD/Witcher/events/friends_rivals_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3255,7 +3255,6 @@ character_event = {
prisoner = no
only_capable = yes
only_playable = yes
religion_group = christian

trigger = {
is_inaccessible_trigger = no
Expand Down
6 changes: 2 additions & 4 deletions MOD/Witcher/events/game_rule_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ character_event = {
is_titular = no
is_landless_type_title = no
NOR = {
title = k_papal_state
title = k_orthodox
title = k_eternal_fire
}
NOT = {
ROOT = {
Expand All @@ -47,8 +46,7 @@ character_event = {
is_titular = no
is_landless_type_title = no
NOR = {
title = k_papal_state
title = k_orthodox
title = k_eternal_fire
}
NOT = {
ROOT = {
Expand Down
6 changes: 3 additions & 3 deletions MOD/Witcher/events/health_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2537,20 +2537,20 @@ character_event = {
text = EVTDESC_WOL_40_NC
trigger = {
is_female = yes
has_DLC = "Sons of Abraham"
has_dlc = "Sons of Abraham"
}
picture = GFX_evt_bad_news_female
}
desc = {
text = EVTDESC_WOL_40_NC
trigger = {
is_female = no
has_DLC = "Sons of Abraham"
has_dlc = "Sons of Abraham"
}
picture = GFX_evt_bad_news
}
desc = {
trigger = { NOT = { has_DLC = "Sons of Abraham" } }
trigger = { NOT = { has_dlc = "Sons of Abraham" } }
text = EVTDESC_WOL_40_NC
picture = GFX_evt_recovery
}
Expand Down
66 changes: 33 additions & 33 deletions MOD/Witcher/events/hunting_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -249,18 +249,17 @@ character_event = {
death_reason = death_murder_unknown_arrow
killer = event_target:killer_target
}
any_courtier = {
limit = {
has_plot = plot_kill_character
plot_target_char = {
character = ROOT
}
}
character_event = {
id = 36002
days = 1
any_courtier = {
limit = {
has_plot = plot_kill_character
plot_target_char = {
character = ROOT
}
}
character_event = {
id = 36002
days = 1
}
}
}
}
Expand All @@ -277,38 +276,39 @@ character_event = {
5 = {
if = {
limit = { NOT = { has_character_modifier = protection_spell } }
any_courtier = {
limit = {
is_adult = yes
NOT = {
has_plot = plot_kill_character
plot_target_char = {
character = root
any_courtier = {
limit = {
is_adult = yes
NOT = {
has_plot = plot_kill_character
plot_target_char = {
character = root
}
}
}
}
character_event = {
id = 36005
days = 1
tooltip = "EVTTOOLTIP36004"
character_event = {
id = 36005
days = 1
tooltip = "EVTTOOLTIP36004"
}
}
}
}
}
5 = {
if = {
limit = { NOT = { has_character_modifier = protection_spell } }
any_courtier = {
limit = {
has_plot = plot_kill_character
plot_target_char = {
character = root
limit = {
has_plot = plot_kill_character
plot_target_char = {
character = root
}
}
character_event = {
id = 36004
days = 1
tooltip = "EVTTOOLTIP36004"
}
}
character_event = {
id = 36004
days = 1
tooltip = "EVTTOOLTIP36004"
}
}
}
Expand All @@ -324,7 +324,7 @@ character_event = {
}
save_event_target_as = killer_target
}
death = {
death = {
death_reason = death_murder_unknown_arrow
killer = event_target:killer_target
}
Expand Down
10 changes: 2 additions & 8 deletions MOD/Witcher/events/lifestyle_event.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1107,13 +1107,7 @@ character_event = {
desc = {
text = "EVTDESC5042"

}
desc = {
text = "EVTDESC5047"
trigger = {
religion_group = muslim
}
}
}

picture = "GFX_evt_hunt"

Expand Down Expand Up @@ -1571,7 +1565,7 @@ character_event = {
min_age = 25
capable_only = yes
prisoner = no
religion_group = christian

lacks_dlc = "Way of Life"

trigger = {
Expand Down
13 changes: 3 additions & 10 deletions MOD/Witcher/events/pet_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,7 @@ character_event = {
trait = impaler
AND = {
NOR = {
any_demesne_title = { region = world_india }
any_demesne_title = { region = world_africa }
any_demesne_title = { region = world_the_south }
}
OR = {
trait = wroth
Expand All @@ -504,8 +503,7 @@ character_event = {
trigger = {
event_target:cat_hater = { liege = { character = ROOT } }
OR = {
any_demesne_title = { region = world_india }
any_demesne_title = { region = world_africa }
any_demesne_title = { region = world_the_south }
}
OR = {
trait = wroth
Expand All @@ -519,13 +517,8 @@ character_event = {
custom_tooltip = { text = EVTOPTD_77851_TOOLTIP }

if = {
limit = { any_demesne_title = { region = world_india } }
limit = { any_demesne_title = { region = world_the_south } }
event_target:cat_hater = { death = { death_reason = death_execution_tiger killer = ROOT } }
break = yes
}
if = {
limit = { any_demesne_title = { region = world_africa } }
event_target:cat_hater = { death = { death_reason = death_execution_lion killer = ROOT } }
}
}
}
Expand Down
Loading

0 comments on commit 0b060cc

Please sign in to comment.