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

1.11.1 update #1239

Merged
merged 84 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
27bbcfe
update
Grekopithikos Nov 10, 2023
35f4345
.
Grekopithikos Nov 11, 2023
b412e93
events
Grekopithikos Nov 12, 2023
e6f1853
traits
Grekopithikos Nov 12, 2023
852c83a
building update
Grekopithikos Nov 12, 2023
f602e8a
Create 03_fp3_traditions.txt
Grekopithikos Nov 12, 2023
fd2612b
scripted effects
Grekopithikos Nov 14, 2023
88d1691
scripted modifiers
Grekopithikos Nov 15, 2023
de6fce9
decisions
Grekopithikos Nov 15, 2023
6cdcfb6
defines
Grekopithikos Nov 16, 2023
6e78124
fixes
Grekopithikos Nov 19, 2023
a6f74f0
Update great_holy_war_events.txt
Grekopithikos Nov 19, 2023
67ff343
Merge branch 'master' into 1.11-update
sumankun Nov 21, 2023
bbb7e56
common/accolade_types 1.11
sumankun Nov 22, 2023
e45b68b
common/achievements 1.11
sumankun Nov 22, 2023
29eee34
common/activities 1.11
sumankun Nov 22, 2023
85de5b2
common/artifacts 1.11
sumankun Nov 22, 2023
6f99603
common/buildings 1.11
sumankun Nov 22, 2023
a90df3d
common/casus_belli_types 1.11
sumankun Nov 22, 2023
b92f371
common/character_interactions 1.11
sumankun Nov 22, 2023
79e79b7
common/character_memory_types 1.11
sumankun Nov 23, 2023
9a8996f
common/coat_of_arms 1.11
sumankun Nov 23, 2023
eb3e042
common/combat_phase_events 1.11
sumankun Nov 23, 2023
e70a15a
common/council_positions 1.11
sumankun Nov 23, 2023
f9eaac6
common/council_tasks 1.11
sumankun Nov 23, 2023
ecf3346
common/court_amenities 1.11
sumankun Nov 23, 2023
de974c5
common/court_positions 1.11
sumankun Nov 23, 2023
853f4d8
common/culture 1.11
sumankun Nov 23, 2023
6ebd387
deleted all unedited vanilla files in mod
sumankun Nov 23, 2023
e9ac28b
common/customizable_localization 1.11
sumankun Nov 23, 2023
fa1a421
common/decisions 1.11
sumankun Nov 23, 2023
acedfa2
common/defines 1.11
sumankun Nov 23, 2023
ce94b79
common/diarchies 1.11
sumankun Nov 23, 2023
eec5dd4
common/dynasty_legacies 1.11
sumankun Nov 23, 2023
344e06e
common/effect_localization 1.11
sumankun Nov 23, 2023
7360e43
common/event_backgrounds 1.11
sumankun Nov 23, 2023
2ac9a10
common/factions 1.11
sumankun Nov 23, 2023
a9b7185
common/game_concepts 1.11
sumankun Nov 23, 2023
85cd379
common/game_rules 1.11
sumankun Nov 23, 2023
4465c4f
common/genes 1.11
sumankun Nov 23, 2023
c9aefc6
common/governments 1.11
sumankun Nov 23, 2023
23bda5f
common/holdings 1.11
sumankun Nov 23, 2023
581468b
common/house_unities 1.11
sumankun Nov 23, 2023
2a1027e
common/inspirations 1.11
sumankun Nov 23, 2023
03aacee
common/laws 1.11
sumankun Nov 23, 2023
865f09c
common/lifestyle_perks 1.11
sumankun Nov 23, 2023
55084f3
common/men_at_arms_types 1.11
sumankun Nov 23, 2023
6a0ae16
common/messages 1.11
sumankun Nov 23, 2023
d7992b8
common/modifiers 1.11
sumankun Nov 23, 2023
9d3747a
common/names_colors 1.11
sumankun Nov 23, 2023
29777c2
common/on_action 1.11
sumankun Nov 23, 2023
58bf810
common/religions 1.11
sumankun Nov 23, 2023
472148b
common/schemes 1.11
sumankun Nov 23, 2023
dff21d1
common/script_values 1.11
sumankun Nov 23, 2023
75092bb
common/scripted_character_templates 1.11
sumankun Nov 23, 2023
ec8409d
common/scripted_effects 1.11
sumankun Nov 24, 2023
e739d64
common/scripted_modifiers 1.11
sumankun Nov 24, 2023
8621eb4
common/scripted_rules 1.11
sumankun Nov 24, 2023
94a4025
common/scripted_triggers 1.11
sumankun Nov 24, 2023
28519f9
common/secret_types 1.11
sumankun Nov 24, 2023
a61319e
common/story_cycles 1.11
sumankun Nov 24, 2023
dd6e266
some loc adaptation
sumankun Nov 24, 2023
3b1da8a
common/struggle 1.11
sumankun Nov 24, 2023
10fe12a
common/succession_election 1.11
sumankun Nov 24, 2023
0c732a5
common/traits 1.11
sumankun Nov 24, 2023
cea520d
common/travel 1.11
sumankun Nov 24, 2023
836ffff
common/vassal_contracts 1.11
sumankun Nov 24, 2023
3736c9d
common folder 1.11.1 patch (23 nov)
sumankun Nov 24, 2023
f9241c9
deleted all unedited vanilla events
sumankun Nov 24, 2023
5eb9818
common fixes
sumankun Nov 24, 2023
aa63931
events folder 1.11.1
sumankun Nov 24, 2023
cf42d18
gui folder 1.11
sumankun Nov 24, 2023
fb8b452
gfx folder 1.11
sumankun Nov 24, 2023
3c6cdde
history folder 1.11
sumankun Nov 24, 2023
670f181
mod version
sumankun Nov 24, 2023
cc7aafd
error.log
sumankun Nov 25, 2023
9b9e867
error.log cleaning 1
sumankun Nov 25, 2023
f097818
error.log cleaning 2
sumankun Nov 25, 2023
35703fb
Update window_manage_tax_slots.gui
sumankun Nov 25, 2023
348ee66
old clan mechanic for necro
sumankun Nov 25, 2023
999e13f
frontier tradition update
sumankun Nov 25, 2023
a7e0c2a
Merge branch 'master' into 1.11-update
sumankun Nov 26, 2023
5fdc801
some updates
sumankun Nov 26, 2023
75cf546
Update wc_core_tenets_l_english.yml
sumankun Nov 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions Warcraft-Guardians-of-Azeroth-2.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name="Warcraft: Guardians of Azeroth Reforged (Release Alpha)"
version="0.3.2"
version="0.4"
picture="thumbnail.png"
tags={
"Total Conversion"
Expand All @@ -17,6 +17,7 @@ replace_path="history/characters"
replace_path="history/cultures"
replace_path="history/province_mapping"
replace_path="history/provinces"
replace_path="history/struggles"
replace_path="history/titles"
replace_path="history/wars"
replace_path="common/culture/cultures"
Expand All @@ -26,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.10.2"
supported_version="1.11.1"
path="mod/Warcraft-Guardians-of-Azeroth-2"
4 changes: 2 additions & 2 deletions common/accolade_types/04_ep2_common_attributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,15 +226,15 @@ marauder_attribute = {
uncontrolled_province_advantage = 5
}
liege_modifier = {
monthly_prestige_gain_per_dread_mult = 0.005
monthly_prestige_gain_per_dread_mult = 0.003
}
}
2100 = { # rank 6
knight_army_modifier = {
uncontrolled_province_advantage = 5
}
liege_modifier = {
monthly_prestige_gain_per_dread_mult = 0.005
monthly_prestige_gain_per_dread_mult = 0.003
}
}
}
Expand Down
1 change: 1 addition & 0 deletions common/achievements/fp3_achievements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Warcraft
124 changes: 122 additions & 2 deletions common/achievements/msgrdk_achievements.json
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,126 @@
{
"pdx_id": "fp2_el_cid_achievement",
"xbla_id": "97"
}
},
{
"pdx_id": "ep2_01_the_grandest_tour_achievement",
"xbla_id": "98"
},
{
"pdx_id": "ep2_02_your_eternal_reward_achievement",
"xbla_id": "99"
},
{
"pdx_id": "ep2_03_imperial_march_achievement",
"xbla_id": "100"
},
{
"pdx_id": "ep2_04_black_dinner_achievement",
"xbla_id": "101"
},
{
"pdx_id": "ep2_05_there_and_back_again_achievement",
"xbla_id": "102"
},
{
"pdx_id": "ep2_06_the_very_best_achievement",
"xbla_id": "103"
},
{
"pdx_id": "ep2_07_like_no_one_ever_was_achievement",
"xbla_id": "104"
},
{
"pdx_id": "ep2_08_a_thousand_and_one_nights_achievement",
"xbla_id": "105"
},
{
"pdx_id": "ep2_09_a_knights_tale_achievement",
"xbla_id": "106"
},
{
"pdx_id": "ep2_10_hunting_accident_achievement",
"xbla_id": "107"
},
{
"pdx_id": "ep2_11_lions_and_tigers_and_bears_oh_my_achievement",
"xbla_id": "108"
},
{
"pdx_id": "ep2_12_fly_my_pretty_achievement",
"xbla_id": "109"
},
{
"pdx_id": "ep2_13_pathway_to_heaven_achievement",
"xbla_id": "110"
},
{
"pdx_id": "ep2_14_sir_lance_a_lot_achievement",
"xbla_id": "111"
},
{
"pdx_id": "ep2_15_im_in_my_elements_achievement",
"xbla_id": "112"
},
{
"pdx_id": "ep2_16_ahab_achievement",
"xbla_id": "113"
},
{
"pdx_id": "ep2_17_little_william_marshal_achievement",
"xbla_id": "114"
},
{
"pdx_id": "ep2_18_a_true_and_perfect_knight_achievement",
"xbla_id": "115"
},
{
"pdx_id": "ep2_19_a_e_i_o_u_and_me_achievement",
"xbla_id": "116"
},
{
"pdx_id": "ep2_20_the_iron_and_golden_king_achievement",
"xbla_id": "117"
},
{
"pdx_id": "fp3_rich_in_diversity_achievement",
"xbla_id": "118"
},
{
"pdx_id": "fp3_abassid_strong_achievement",
"xbla_id": "119"
},
{
"pdx_id": "fp3_royal_flush_achievement",
"xbla_id": "120"
},
{
"pdx_id": "fp3_rekindle_iran_achievement",
"xbla_id": "121"
},
{
"pdx_id": "fp3_challenger_caliphate_achievement",
"xbla_id": "122"
},
{
"pdx_id": "fp3_vassalize_the_caliph_achievement",
"xbla_id": "123"
},
{
"pdx_id": "fp3_mulct_them_dry_achievement",
"xbla_id": "124"
},
{
"pdx_id": "fp3_fiscal_res_achievement",
"xbla_id": "125"
},
{
"pdx_id": "fp3_the_umma_strikes_back_achievement",
"xbla_id": "126"
},
{
"pdx_id": "fp3_darius_revenge_achievement",
"xbla_id": "127"
}
]
}
}
6 changes: 6 additions & 0 deletions common/activities/activity_locales/tournament_locales.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ tournament_locale_tournament_grounds = {
activity_location.culture = {
OR = {
has_graphical_mena_culture_group_trigger = yes
has_graphical_iranian_culture_group_trigger = yes
has_graphical_african_culture_group_trigger = yes
has_graphical_steppe_culture_group_trigger = yes
}
Expand All @@ -88,6 +89,7 @@ tournament_locale_tournament_grounds = {
activity_location.culture = {
OR = {
has_graphical_mena_culture_group_trigger = yes
has_graphical_iranian_culture_group_trigger = yes
has_graphical_african_culture_group_trigger = yes
has_graphical_steppe_culture_group_trigger = yes
}
Expand Down Expand Up @@ -136,6 +138,7 @@ tournament_locale_settlement = {
activity_location.culture = {
OR = {
has_graphical_mena_culture_group_trigger = yes
has_graphical_iranian_culture_group_trigger = yes
has_graphical_african_culture_group_trigger = yes
has_graphical_steppe_culture_group_trigger = yes
}
Expand Down Expand Up @@ -198,6 +201,7 @@ tournament_locale_visitor_camp = {
activity_location.culture = {
OR = {
has_graphical_mena_culture_group_trigger = yes
has_graphical_iranian_culture_group_trigger = yes
has_graphical_african_culture_group_trigger = yes
has_graphical_steppe_culture_group_trigger = yes
}
Expand Down Expand Up @@ -320,6 +324,7 @@ tournament_locale_tavern = {
activity_location.culture = {
OR = {
has_graphical_mena_culture_group_trigger = yes
has_graphical_iranian_culture_group_trigger = yes
has_graphical_african_culture_group_trigger = yes
has_graphical_steppe_culture_group_trigger = yes
}
Expand Down Expand Up @@ -382,6 +387,7 @@ tournament_locale_artisans = {
activity_location.culture = {
OR = {
has_graphical_mena_culture_group_trigger = yes
has_graphical_iranian_culture_group_trigger = yes
has_graphical_african_culture_group_trigger = yes
has_graphical_steppe_culture_group_trigger = yes
}
Expand Down
6 changes: 4 additions & 2 deletions common/activities/activity_types/feast.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ activity_feast = {
is_ai = yes
}
is_at_war = no
short_term_gold >= feast_activity_cost
OR = {
has_character_flag = feasts_a_lot
short_term_gold >= feast_activity_cost
}
}
}

Expand Down Expand Up @@ -3142,7 +3145,6 @@ activity_feast = {
# is_diff_faith_or_culture_trigger = {
# CHAR = scope:host
# STATUS = involved
# STRUGGLE_TYPE = iberian_struggle
# }
# }
# }
Expand Down
Loading
Loading