Skip to content

Commit

Permalink
Merge branch 'dev' into velius-drust-crisis
Browse files Browse the repository at this point in the history
  • Loading branch information
@Malicos
Malicos committed Oct 16, 2024
2 parents 60d752d + b98bde8 commit 34546d9
Show file tree
Hide file tree
Showing 1,689 changed files with 591,789 additions and 187,699 deletions.
Binary file added .artist_resources/model bodies/newSkeletonFemaleblend.blend
View file
Binary file not shown.
Binary file added .artist_resources/model bodies/newSkeletonMaleblend.blend
View file
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
.vs/
*/.DS_Store
.DS_Store
ck3-tiger.conf
2 changes: 1 addition & 1 deletion Warcraft-Guardians-of-Azeroth-2.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ replace_path="common/religion/religion_families"
replace_path="common/religion/holy_sites"
replace_path="common/bookmark_portraits"
replace_path="common/bookmarks"
supported_version="1.12.4"
supported_version="1.13.0"
path="mod/Warcraft-Guardians-of-Azeroth-2"
58 changes: 29 additions & 29 deletions common/accolade_names/00_accolade_names.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ accolade_the_knight_of_the_animal = {
}
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = dull
has_trait = intellect_bad
}
Expand Down Expand Up @@ -94,7 +94,7 @@ accolade_the_knight_of_the_animal = {
}
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = strong
}
}
Expand Down Expand Up @@ -168,7 +168,7 @@ accolade_the_knight_of_the_animal = {
}
}
OR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
has_trait = physique_good
has_trait = strong
Expand Down Expand Up @@ -221,7 +221,7 @@ accolade_the_knight_of_the_animal = {
}
}
OR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
has_trait = physique_good
has_trait = strong
Expand All @@ -246,7 +246,7 @@ accolade_the_knight_of_the_animal = {
}
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = dull
has_trait = honest
}
Expand Down Expand Up @@ -322,7 +322,7 @@ accolade_the_knight_of_the_animal = {
jungle_region_trigger = no
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
}
}
Expand All @@ -344,7 +344,7 @@ accolade_the_knight_of_the_animal = {
geographical_region = hunt_animal_antelope_region
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
}
}
Expand All @@ -365,7 +365,7 @@ accolade_the_knight_of_the_animal = {
geographical_region = world_northrend
}
OR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
has_trait = physique_good
has_trait = strong
Expand Down Expand Up @@ -510,7 +510,7 @@ accolade_the_knight_of_the_animal = {

potential = {
liege ?= {
is_landed = yes
is_playable_character = yes
}
scope:accolade_type = {
OR = {
Expand Down Expand Up @@ -557,7 +557,7 @@ accolade_the_animal_of_capital = {
}
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = dull
has_trait = intellect_bad
}
Expand Down Expand Up @@ -626,7 +626,7 @@ accolade_the_animal_of_capital = {
}
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = strong
}
}
Expand Down Expand Up @@ -700,7 +700,7 @@ accolade_the_animal_of_capital = {
}
}
OR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
has_trait = physique_good
has_trait = strong
Expand Down Expand Up @@ -753,7 +753,7 @@ accolade_the_animal_of_capital = {
}
}
OR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
has_trait = physique_good
has_trait = strong
Expand All @@ -778,7 +778,7 @@ accolade_the_animal_of_capital = {
}
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = dull
has_trait = honest
}
Expand Down Expand Up @@ -855,7 +855,7 @@ accolade_the_animal_of_capital = {
jungle_region_trigger = no
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
}
}
Expand All @@ -877,7 +877,7 @@ accolade_the_animal_of_capital = {
geographical_region = hunt_animal_antelope_region
}
NOR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
}
}
Expand All @@ -898,7 +898,7 @@ accolade_the_animal_of_capital = {
geographical_region = world_northrend
}
OR = {
has_trait = giant
has_dire_or_giant_trigger = yes
has_trait = gluttonous
has_trait = physique_good
has_trait = strong
Expand Down Expand Up @@ -1068,14 +1068,14 @@ accolade_the_animal_of_capital = {
random_valid = {
triggered_desc = {
trigger = {
is_landed = no
is_playable_character = no
exists = liege
}
desc = accolade_lieges_capital
}
triggered_desc = {
trigger = {
is_landed = yes
is_playable_character = yes
}
desc = accolade_knights_capital
}
Expand All @@ -1085,9 +1085,9 @@ accolade_the_animal_of_capital = {
potential = {
OR = {
liege ?= {
is_landed = yes
is_playable_character = yes
}
is_landed = yes
is_playable_character = yes
}
}
}
Expand Down Expand Up @@ -1565,7 +1565,7 @@ accolade_leader_of_the_culture_maa = {

potential = {
liege ?= {
is_landed = yes
is_playable_character = yes
}
NOT = {
culture = liege.culture
Expand Down Expand Up @@ -3576,14 +3576,14 @@ accolade_the_warrior_in_the_terrain = {
random_valid = {
triggered_desc = {
trigger = {
is_landed = no
is_playable_character = no
exists = liege
}
desc = accolade_lieges_capital_terrain
}
triggered_desc = {
trigger = {
is_landed = yes
is_playable_character = yes
}
desc = accolade_knights_capital_terrain
}
Expand All @@ -3593,9 +3593,9 @@ accolade_the_warrior_in_the_terrain = {
potential = {
OR = {
liege ?= {
is_landed = yes
is_playable_character = yes
}
is_landed = yes
is_playable_character = yes
}
}
}
Expand Down Expand Up @@ -4049,7 +4049,7 @@ accolade_the_foe_of_enemy_faith = {

potential = {
liege ?= {
is_landed = yes
is_playable_character = yes
}
faith = liege.faith
faith = {
Expand Down Expand Up @@ -4371,7 +4371,7 @@ accolade_goodest_of_knights = {
has_trait = physique_good
has_trait = athletic
has_trait = strong
has_trait = giant
has_dire_or_giant_trigger = yes
}
}
desc = accolade_strongest
Expand Down Expand Up @@ -4988,7 +4988,7 @@ accolade_the_material_knight = {
}
triggered_desc = {
trigger = {
has_trait = giant
has_dire_or_giant_trigger = yes
}
desc = accolade_giant
}
Expand Down
15 changes: 9 additions & 6 deletions common/accolade_types/04_ep2_common_attributes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,23 +626,23 @@ charmer_attribute = {
# glory_requirement = { modifiers and unlocks }
100 = { # rank 1
liege_modifier = {
seduce_scheme_power_add = 10
seduce_scheme_phase_duration_add = minor_scheme_phase_duration_bonus_value
}
accolade_parameters = {
accolade_court_seduction_vulnerability
}
}
300 = { # rank 2
liege_modifier = {
seduce_scheme_power_add = 10
seduce_scheme_phase_duration_add = minor_scheme_phase_duration_bonus_value
}
accolade_parameters = {
accolade_court_seduction_vulnerability
}
}
600 = { # rank 3
liege_modifier = {
seduce_scheme_power_add = 20
seduce_scheme_phase_duration_add = medium_scheme_phase_duration_bonus_value
}
accolade_parameters = {
accolade_court_seduction_vulnerability
Expand All @@ -651,7 +651,7 @@ charmer_attribute = {
}
1000 = { # rank 4
liege_modifier = {
seduce_scheme_power_add = 20
seduce_scheme_phase_duration_add = medium_scheme_phase_duration_bonus_value
}
accolade_parameters = {
accolade_court_seduction_vulnerability
Expand All @@ -660,7 +660,7 @@ charmer_attribute = {
}
1500 = { # rank 5
liege_modifier = {
seduce_scheme_power_add = 30
seduce_scheme_phase_duration_add = major_scheme_phase_duration_bonus_value
}
accolade_parameters = {
accolade_court_seduction_vulnerability
Expand All @@ -669,7 +669,7 @@ charmer_attribute = {
}
2100 = { # rank 6
liege_modifier = {
seduce_scheme_power_add = 30
seduce_scheme_phase_duration_add = major_scheme_phase_duration_bonus_value
}
accolade_parameters = {
accolade_court_seduction_vulnerability
Expand Down Expand Up @@ -1495,6 +1495,7 @@ valiant_attribute = {
has_cultural_tradition = tradition_modest
has_cultural_tradition = tradition_forbearing
has_cultural_tradition = tradition_byzantine_succession
has_cultural_tradition = tradition_ep3_palace_politics
}
}
}
Expand Down Expand Up @@ -1869,6 +1870,7 @@ scoundrel_attribute = {
has_cultural_tradition = tradition_swords_for_hire
has_cultural_tradition = tradition_life_is_just_a_joke
has_cultural_tradition = tradition_practiced_pirates
has_cultural_tradition = tradition_ep3_audacious_cadets
}
}
}
Expand All @@ -1885,6 +1887,7 @@ scoundrel_attribute = {
has_cultural_tradition = tradition_fp1_coastal_warriors
has_cultural_tradition = tradition_fp2_state_ransoming
has_cultural_tradition = tradition_practiced_pirates
has_cultural_tradition = tradition_ep3_audacious_cadets
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions common/accolade_types/04_ep2_maa_attributes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
@respected_culture_for_maa_type_value = 100
@disinterested_culture_for_maa_type_value = -100

@number_maa_regiments_increment_1 = 2
@number_maa_regiments_increment_2 = 4
@number_maa_regiments_increment_3 = 6
@number_maa_regiments_increment_4 = 8
@number_maa_regiments_increment_1 = 1
@number_maa_regiments_increment_2 = 2
@number_maa_regiments_increment_3 = 4
@number_maa_regiments_increment_4 = 6

@accolade_maa_maint_1 = -0.1
@accolade_maa_maint_2 = -0.15
Expand Down Expand Up @@ -1592,7 +1592,7 @@ crossbowmen_attribute = {
besieger_attribute = {
adjective = accolade_besieging
noun = accolade_besieger
accolade_categories = { men_at_arms army_bonus militant aggressive subtle leader ranged_fighter }
accolade_categories = { men_at_arms army_bonus militant aggressive subtle leader ranged_fighter siege }

potential = {
prowess >= accolade_prowess_requirement_value
Expand Down
Loading

0 comments on commit 34546d9

Please sign in to comment.