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

7th Small Improvments #834

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions common/culture/cultures/demonic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@
nathrezim = {
graphical_cultures = {
creature_nathrezim_gfx
always_armor_gfx
no_hair_gfx
no_beard_gfx
}
Expand Down
6 changes: 6 additions & 0 deletions common/effect_localization/00_scheme_effects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@

force_add_to_scheme = {
third = FORCE_ADD_TO_SCHEME_THIRD

# Warcraft
global = force_add_to_scheme_global
}

add_to_scheme = {
third = ADD_TO_SCHEME_THIRD

# Warcraft
global = add_to_scheme_global
}

forbid_from_scheme = {
Expand Down
7 changes: 7 additions & 0 deletions common/scripted_triggers/00_clothing_triggers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ portrait_wear_armor_trigger = {
}
}
has_character_flag = is_currently_varangian

# Warcraft
trigger_if = {
limit = { exists = culture }
culture = { has_graphical_culture = always_armor_gfx }
}
has_trait_with_flag = always_armor
}
}

Expand Down
2 changes: 2 additions & 0 deletions common/traits/wc_race_traits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,8 @@ creature_nathrezim = {

flag = demon_class

flag = always_armor

intrigue = 1
learning = 1
prowess = 4
Expand Down
2 changes: 1 addition & 1 deletion history/characters/60000_63000_lordaeronian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
effect={
set_relation_lover = character:60676 # Married a lowborn soldier in secret (Kiril, non-canon name)
}
add_spouse=60676 # Married a lowborn soldier in secret (Kiril, non-canon name)
add_matrilineal_spouse=60676 # Married a lowborn soldier in secret (Kiril, non-canon name)
}
603.5.1 = {
employer = 53053 # Fled to Southshore during the Fall of Capital City
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
l_english:
plague_maintenance_100_TITLE:1 "Death must thrive"
plague_maintenance_100_TITLE:2 "Death Must Thrive"
plague_maintenance_100_DESC:1 "It is time to unleash a plague that will not only decimate, but also empower my armies. For that, I first need to choose the starting place of this disease..."

plague_maintenance_100_A:0 "The [first_county.GetName] is very densely populated, the perfect choice!"
Expand Down
5 changes: 4 additions & 1 deletion localization/english/wc_effects_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,7 @@
raise_undead_by_vassal_effect_third_past:1 "[CHARACTER.GetShortUIName|U] became [GetTrait('being_undead').GetName(GetNullCharacter)|V] and converted to [TARGET_CHARACTER.GetFaith.GetName|V]"

raise_undead_by_vassal_effect_global:1 "Becomes [GetTrait('being_undead').GetName(GetNullCharacter)|V] and converts to [TARGET_CHARACTER.GetFaith.GetName|V]"
raise_undead_by_vassal_effect_global_past:1 "Became [GetTrait('being_undead').GetName(GetNullCharacter)|V] and converted to [TARGET_CHARACTER.GetFaith.GetName|V]"
raise_undead_by_vassal_effect_global_past:1 "Became [GetTrait('being_undead').GetName(GetNullCharacter)|V] and converted to [TARGET_CHARACTER.GetFaith.GetName|V]"

add_to_scheme_global:0 "Joins the [SCHEME.GetName] against [SCHEME.GetTarget.GetShortUIName]"
force_add_to_scheme_global:0 "Is forced to join the [SCHEME.GetName] against [SCHEME.GetTarget.GetShortUIName] until $DURATION$"