Skip to content

Commit

Permalink
Merge branch 'master' into 6th-Localisation-Crusade-(English-only)
Browse files Browse the repository at this point in the history
  • Loading branch information
edmund-h committed Nov 21, 2023
2 parents fbe6821 + 8d7308d commit 9bcc524
Show file tree
Hide file tree
Showing 45 changed files with 2,606 additions and 40 deletions.
4 changes: 4 additions & 0 deletions common/artifacts/visuals/wc_historical.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@ dark_crystal = {
icon = "wc_dark_crystal.dds"
pedestal = "tall_pillow"
asset = ep1_generic_jewelry_01_a_entity
}
totem = {
icon = "wc_tauren_totem.dds"
asset = ep2_western_tun_barrel_01_a_entity
}
1 change: 1 addition & 0 deletions common/culture/innovations/wc_cultural_maa_innovations.txt
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ innovation_naga_army = {
unlock_maa = siren
unlock_maa = couatl
unlock_maa = sea_giant
unlock_maa = dragon_turtle

flag = global_maa
}
Expand Down
92 changes: 87 additions & 5 deletions common/decisions/wc_cen_kal_decisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ change_agamaggan_blessing = {

is_valid = {
custom_tooltip = {
text = change_agamaggan_blessing_req_tt
var:blood_shard_count >= 4
text = change_agamaggan_blessing_req_tt
has_variable = blood_shard_count
var:blood_shard_count >= 4
}
}

Expand Down Expand Up @@ -116,8 +117,9 @@ create_thorns_quilboar = {
is_valid = {
highest_held_title_tier >= tier_duchy
custom_tooltip = {
text = create_thorns_quilboar_req_tt
var:blood_shard_count >= 12
text = create_thorns_quilboar_req_tt
has_variable = blood_shard_count
var:blood_shard_count >= 12
}
}

Expand Down Expand Up @@ -251,7 +253,7 @@ take_the_walk_quilboar = {
has_trait = incapable
has_trait = blind
has_trait = one_legged
age > 60
age >= 60
}
is_imprisoned = no
}
Expand Down Expand Up @@ -344,6 +346,86 @@ create_centaur_empire = {
always = yes
}

ai_will_do = {
base = 100
}
}

begin_totem_creation = {
ai_check_interval = 12
picture = "gfx/interface/illustrations/decisions/begin_totem_creation.dds"
major = yes

cooldown = { years = 5 }

is_shown = {
NOT = { has_character_flag = has_totem }
OR = {
faith = faith:earth_mother_worship
culture = { has_cultural_pillar = heritage_tauren }
}
}

is_valid = {
AND = {
OR = {
has_trait = brave
has_trait = calm
has_trait = just
has_trait = humble
has_trait = compassionate
}
age >= 30
custom_tooltip = {
text = prowess_larger_than_15
prowess >= 15
}
}
}

is_valid_showing_failures_only = {
is_available_healthy_adult = yes
NOR = {
has_trait = arrogant
has_trait = sadistic
has_trait = torturer
has_trait = flagellant
has_trait = callous
}
}

cost = { prestige = 350 }

effect = { trigger_event = cen_kal.1069 }

ai_potential = {
always = yes
}

ai_will_do = {
base = 100
}
}

attack_wailing_caverns = {
ai_check_interval = 2
picture = "gfx/interface/illustrations/decisions/wc_wailing_caverns.dds"

cooldown = { days = 30 }

is_shown = {
is_landed = yes
is_imprisoned = no
title:c_wailing.holder.top_liege = root
has_global_variable = fanglords_revealed
}

effect = { trigger_event = cen_kal.1086 }

ai_potential = {
always = yes
}

ai_will_do = {
base = 100
}
Expand Down
48 changes: 48 additions & 0 deletions common/event_backgrounds/wc_event_backgrounds.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,52 @@ wc_stratholme = {
environment = "environment_character_wc_stratholme"
ambience = "event:/SFX/Events/Backgrounds/city_alley_night"
}
}

wc_background_tauren_tent_1 = {
background = {
reference = "gfx/interface/illustrations/event_scenes/tauren_tent.dds"
environment = "environment_indian_feast"
ambience = "event:/DLC/EP2/SFX/Events/Grand_Activities/Hunts/ep2_event_grand_hunt_praire"
}
}

wc_background_tauren_tent_2 = {
background = {
reference = "gfx/interface/illustrations/event_scenes/tauren_tent_2.dds"
environment = "environment_indian_feast"
ambience = "event:/DLC/EP2/SFX/Events/Grand_Activities/Hunts/ep2_event_grand_hunt_praire"
}
}

wc_background_tauren_cave = {
background = {
reference = "gfx/interface/illustrations/event_scenes/tauren_cave.dds"
environment = "environment_indian_feast"
ambience = "event:/SFX/Events/Backgrounds/mountains_day"
}
}

wc_background_spirit_world_plains = {
background = {
reference = "gfx/interface/illustrations/event_scenes/wc_spirit_world_plains.dds"
environment = "environment_character_wc_spirit_world"
ambience = "event:/SFX/Events/Backgrounds/city_alley_night"
}
}

wc_background_plains_red_rocks = {
background = {
reference = "gfx/interface/illustrations/event_scenes/red_rocks.dds"
environment = "environment_event_bp1_plains"
ambience = "event:/DLC/EP2/SFX/Events/Grand_Activities/Hunts/ep2_event_grand_hunt_praire"
}
}

wc_background_underground_caverns = {
background = {
reference = "gfx/interface/illustrations/event_scenes/wc_underground_cavern.dds"
environment = "environment_event_bp1_jungle"
ambience = "event:/DLC/EP2/SFX/Events/Backgrounds/evn_background_jungle"
}
}
62 changes: 62 additions & 0 deletions common/men_at_arms_types/wc_cultural_maa_types.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2202,3 +2202,65 @@ zeppelin = {
ai_quality = { value = @cultural_maa_extra_ai_score }
icon = zepplin
}

fang_druids = {
type = caster

damage = 65
toughness = 20
pursuit = 25
screen = 10

terrain_bonus = {
jungle = { damage = 20 toughness = 20 pursuit = 10 }
forest = { damage = 15 toughness = 15 pursuit = 10 }
}

can_recruit = {
religion = { is_in_family = rf_shadow }
OR = {
culture = { has_cultural_pillar = heritage_darnassian }
culture = { has_cultural_pillar = heritage_cenaric }
}
}

counters = {
pikemen = 2
massive_infantry = 2
heavy_infantry = 2
}

buy_cost = { gold = cost_120_recruitment_cost }
low_maintenance_cost = { gold = cost_120_low_maint_cost }
high_maintenance_cost = { gold = cost_120_high_maint_cost }

stack = 75
ai_quality = { value = @cultural_maa_extra_ai_score }
icon = fang_druids
}

dragon_turtle = {
type = massive_infantry

damage = 145
toughness = 135
pursuit = 0
screen = 30

terrain_bonus = {
wetlands = { damage = -15 }
mountains = { damage = -15 }
}

counters = {
skirmishers = 3
}

buy_cost = { gold = cost_180_recruitment_cost }
low_maintenance_cost = { gold = cost_180_low_maint_cost }
high_maintenance_cost = { gold = cost_180_high_maint_cost }

stack = 50
ai_quality = { value = @cultural_maa_extra_ai_score }
icon = dragon_turtle
}
10 changes: 10 additions & 0 deletions common/modifiers/wc_event_modifiers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,13 @@ goblin_buisness = {
icon = stewardship_positive
monthly_income = 10
}

wc_earth_mother_prowess = {
icon = magic_positive
prowess = 2
}

wc_saw_white_kodo = {
icon = wc_tauren_kodo_neg
enemy_hostile_scheme_success_chance_add = 50
}
36 changes: 36 additions & 0 deletions common/modifiers/wc_historical_artifact_modifiers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,40 @@ dark_crystal_modifier = {
learning = 2
prowess = 8
monthly_prestige = 0.7
}
totem_1 = {
learning = 2
diplomacy = 1
monthly_learning_lifestyle_xp_gain_mult = 0.10
monthly_prestige = 0.1
}
totem_2 = {
prowess = 2
learning = 1
monthly_piety = 0.7
monthly_prestige = 0.1
}
totem_3 = {
martial = 2
diplomacy = 1
monthly_martial_lifestyle_xp_gain_mult = 0.10
monthly_prestige = 0.1
}
totem_4 = {
stewardship = 2
prowess = 1
monthly_stewardship_lifestyle_xp_gain_mult = 0.10
monthly_prestige = 0.1
}
totem_5 = {
martial = 1
diplomacy = 2
monthly_diplomacy_lifestyle_xp_gain_mult = 0.10
monthly_prestige = 0.1
}
totem_6 = {
intrigue = 2
learning = 1
monthly_intrigue_lifestyle_xp_gain_mult = 0.10
monthly_prestige = 0.1
}
2 changes: 2 additions & 0 deletions common/nicknames/wc_nicknames.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ nick_the_stormspeaker = {}
nick_yorg = {}
nick_the_banished = {}
nick_the_soulripper = {}
nick_brave = {}
nick_fanglord = {}

### From Lifestyle
nick_the_ice_hearted = {}
Expand Down
53 changes: 52 additions & 1 deletion common/on_action/wc_central_kal_events_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ wc_earth_faith_on_character_faith_change = {
}
}

on_game_start_after_lobby = { on_actions = { quilboar_add_blood_shards_trait_all_chars } }
on_game_start_after_lobby = {
on_actions = {
quilboar_add_blood_shards_trait_all_chars
tauren_add_random_braves
}
}

on_birth_child = { on_actions = { quilboar_add_blood_shards_trait } }

Expand Down Expand Up @@ -62,6 +67,7 @@ central_kal_events.1 = {
1 = cen_kal.1010
1 = cen_kal.1025
1 = cen_kal.1053
1 = cen_kal.1085 #Wailing Caverns
}
}
earth_mother_events.1 = {
Expand Down Expand Up @@ -296,3 +302,48 @@ goblin_depot_flag_updates = {
}
}
}

wailing_caverns_trigger = {
random_events = {
125 = cen_kal.1088 #Begin Attack
25 = cen_kal.1090 #Crisis averted
}
}

wailing_caverns_trigger_risky = {
random_events = {
85 = cen_kal.1088 #Begin Attack
25 = cen_kal.1090 #Crisis averted
}
}
#Add totems and brave title to random selection of taurens who are worthy (From testing this only made 18 tauren braves in TFT bookmark so its quite balanced
tauren_add_random_braves = {
effect = {
every_living_character = {
if = {
limit = {
OR = {
has_trait = brave
has_trait = calm
has_trait = just
has_trait = humble
has_trait = compassionate
}
NOR = {
has_trait = sadistic
has_trait = torturer
has_trait = flagellant
has_trait = callous
}
is_ai = yes
age >= 30
prowess >= 12
is_available_healthy_adult = yes
culture = { has_cultural_pillar = heritage_tauren }
}
add_character_flag = has_totem
trigger_event = cen_kal.1092
}
}
}
}
Loading

0 comments on commit 9bcc524

Please sign in to comment.