Merge pull request #1239 from Warcraft-GoA-Development-Team/1.11-update

1.11.1 update
Warcraft-GoA-Development-Team · Nov 27, 2023 · 6f30e6c · 6f30e6c
2 parents aa6fa84 + 75cf546
commit 6f30e6c
Show file tree

Hide file tree

Showing 1,084 changed files with 55,190 additions and 273,745 deletions.
diff --git a/Warcraft-Guardians-of-Azeroth-2.mod b/Warcraft-Guardians-of-Azeroth-2.mod
@@ -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"
@@ -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"
@@ -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"
diff --git a/common/accolade_types/04_ep2_common_attributes.txt b/common/accolade_types/04_ep2_common_attributes.txt
@@ -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
 			}
 		}
 	}

diff --git a/common/achievements/fp3_achievements.txt b/common/achievements/fp3_achievements.txt
@@ -0,0 +1 @@
+# Warcraft
diff --git a/common/achievements/msgrdk_achievements.json b/common/achievements/msgrdk_achievements.json
@@ -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"
+        }
     ]
-}
+}
diff --git a/common/activities/activity_locales/tournament_locales.txt b/common/activities/activity_locales/tournament_locales.txt
@@ -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
 				}
@@ -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
 				}
@@ -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
 				}
@@ -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
 				}
@@ -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
 				}
@@ -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
 				}

diff --git a/common/activities/activity_types/feast.txt b/common/activities/activity_types/feast.txt
@@ -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
+			}
 		}
 	}
 
@@ -3142,7 +3145,6 @@ activity_feast = {
 						#				is_diff_faith_or_culture_trigger = {
 						#					CHAR = scope:host
 						#					STATUS = involved
-						#					STRUGGLE_TYPE = iberian_struggle
 						#				}
 						#			}
 						#		}