Merge pull request #1279 from Warcraft-GoA-Development-Team/tweaks-an…

…d-hotfixes

Tweaks and hotfixes

common/accolade_types/04_ep2_maa_attributes.txt

@@ -2488,7 +2488,7 @@ massive_infantry_attribute = {
 				has_innovation = innovation_demon_tactics
 				has_innovation = innovation_titan_tactics
 				has_innovation = innovation_night_elf_ground
-				has_innovation = innovation_naga_army
+				has_innovation = innovation_sea_giant
 				has_innovation = innovation_goblin_mechanics
 				has_innovation = innovation_silithid_colossus
 				has_innovation = innovation_gnome_mechanics

common/buildings/wc_special_buildings.txt

@@ -368,9 +368,9 @@ stormwind_harbor_01 = {
 
 	character_modifier = {
 		monthly_income_mult = 0.15
-		monthly_war_income_mult = 0.35 
+		monthly_war_income_mult = 0.35
 		diplomatic_range_mult = 0.5
-		development_growth_factor = 0.25 
+		development_growth_factor = 0.25
 		diplomacy_per_prestige_level = 1
 		embarkation_cost_mult = -0.4
 	}
@@ -383,6 +383,30 @@ stormwind_harbor_01 = {
 	flag = travel_point_of_interest_diplomatic
 }
 
+########
+# Boralus Harbor
+
+boralus_harbor_01 = {
+	type_icon = "icon_structure_stormwind_harbor.dds"
+
+	character_modifier = {
+		monthly_income_mult = 0.15
+		monthly_war_income_mult = -0.3
+		monthly_dynasty_prestige_mult = 0.05
+		diplomatic_range_mult = 0.5
+		development_growth_factor = 0.25
+		republic_government_tax_contribution_mult = 0.6
+		embarkation_cost_mult = -1
+	}
+
+	province_modifier = {
+		travel_danger = -15
+	}
+
+	type = special
+	flag = travel_point_of_interest_diplomatic
+}
+
 ########
 # Sulfuron Spire
 
@@ -551,16 +575,14 @@ scarlet_monastery_01 = {
 	type_icon = "icon_structure_cologne_cathedral.dds"
 
 	character_modifier = {
-		monthly_piety_gain_mult = 0.1
-		monthly_piety_gain_per_knight_add = 0.05
-		learning_scheme_power = 1
-		theocracy_government_vassal_opinion = 10
+		clergy_opinion = 15
+		theocracy_government_vassal_opinion = 15
+		learning_per_piety_level = 1
+		monthly_piety_gain_mult = 0.05
 	}
 
 	province_modifier = {
-		stationed_archers_damage_mult = normal_maa_damage_tier_2
-		stationed_caster_damage_mult = normal_maa_damage_tier_2
-		travel_danger = -10
+		monthly_county_control_change_factor = 0.1
 	}
 
 	next_building = scarlet_monastery_02
@@ -575,21 +597,32 @@ scarlet_monastery_02 = {
 		name = "building_special_cathedral_generic_mesh"
 	}
 
-	construction_time = very_slow_construction_time
+	construction_time = very_quick_construction_time
+	cost_gold = 200
+
+	can_construct = {
+		faith = faith:scarlet_light
+	}
 
 	type_icon = "icon_structure_cologne_cathedral.dds"
 
 	character_modifier = {
 		monthly_piety_gain_mult = 0.1
 		monthly_piety_gain_per_knight_add = 0.1
-		learning_scheme_power = 1
-		theocracy_government_vassal_opinion = 10
+		clergy_opinion = 15
+		theocracy_government_vassal_opinion = 15
+		learning_per_piety_level = 2
+		monthly_piety_gain_mult = 0.05
+
+		different_faith_opinion = -5
+		faith_creation_piety_cost_mult = -0.25
 	}
 
 	province_modifier = {
 		stationed_archers_damage_mult = normal_maa_damage_tier_4
 		stationed_caster_damage_mult = normal_maa_damage_tier_4
 		travel_danger = -10
+		monthly_county_control_change_factor = 0.1
 	}
 
 	type = special
@@ -1057,15 +1090,14 @@ shado_pan_monastery_01 = {
 	type_icon = "icon_structure_cologne_cathedral.dds"
 
 	character_modifier = {
-		monthly_piety_gain_mult = 0.1
-		monthly_piety_gain_per_knight_add = 0.05
-		learning_scheme_power = 1
-		theocracy_government_vassal_opinion = 10
+		men_at_arms_maintenance = -0.05
+		prowess_per_prestige_level = 1
+		skirmishers_damage_mult = 0.55
+		owned_scheme_secrecy_add = 2
+		intrigue_per_piety_level = 1
 	}
 
 	province_modifier = {
-		stationed_archers_damage_mult = 0.25
-		stationed_caster_damage_mult = 0.4
 		travel_danger = -10
 	}
 
@@ -1781,7 +1813,7 @@ nordrassil = {
 	}
 
 	type = special
-	flag = travel_point_of_interest_learning
+	flag = travel_point_of_interest_natural_feature
 }
 
 teldrassil = {
@@ -1801,7 +1833,7 @@ teldrassil = {
 	}
 
 	type = special
-	flag = travel_point_of_interest_learning
+	flag = travel_point_of_interest_natural_feature
 }
 teldrassil_corrupted = {
 	type_icon = "icon_structure_mount_damavand.dds"
@@ -1821,7 +1853,7 @@ teldrassil_corrupted = {
 	next_building = teldrassil
 
 	type = special
-	flag = travel_point_of_interest_learning
+	flag = travel_point_of_interest_natural_feature
 }
 andrassil = {
 	type_icon = "icon_structure_mount_damavand.dds"
@@ -1848,7 +1880,7 @@ andrassil = {
 	cost_gold = expensive_building_tier_8_cost
 
 	type = special
-	flag = travel_point_of_interest_learning
+	flag = travel_point_of_interest_natural_feature
 }
 vordrassil = {
 	type_icon = "icon_structure_mount_damavand.dds"
@@ -1870,7 +1902,7 @@ vordrassil = {
 	next_building = andrassil
 
 	type = special
-	flag = travel_point_of_interest_learning
+	flag = travel_point_of_interest_natural_feature
 }
 shaladrassil = {
 	type_icon = "icon_structure_shaladrassil.dds"
@@ -1888,7 +1920,7 @@ shaladrassil = {
 	}
 
 	type = special
-	flag = travel_point_of_interest_learning
+	flag = travel_point_of_interest_natural_feature
 }
 
 ##########

common/coat_of_arms/coat_of_arms/wc_dynasties.txt

@@ -302,6 +302,15 @@ house_shadowmoon = {
 #		color1 = "purple"
 #	}
 #}
+10009 = {
+	pattern = "pattern_solid.dds" 
+	color1 = rgb { 26 46 53 } 
+	colored_emblem = {
+		texture = "ce_gnome_arcforged.dds"
+		color1 = rgb { 64 178 182 }
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
 
 ### Dwarfs ###
 
@@ -424,6 +433,18 @@ house_shadowmoon = {
 	}
 }
 
+witherbark = { 
+	pattern = "pattern_solid.dds"
+	color1 = hsv360 { 68 83 41 }
+	colored_emblem = {
+		texture = "ce_witherbark.dds" 
+		color1 = hsv360 { 40 74 47 }
+		color2 = hsv360 { 68 83 100 }
+		color3 = rgb { 255 231 167 }
+		instance = { position = { 0.5 @single_charge_position } }
+	}
+}
+
 ### High Elf ###
 
 20001 = { # Sunstrider

common/culture/cultures/wc_apexis.txt

@@ -10,7 +10,12 @@
 		tradition_storytellers
 		tradition_isolationist
 		tradition_ruling_caste
-		tradition_philosopher_culture
+	}
+
+	dlc_tradition = {
+		trait = tradition_fp3_beacon_of_learning
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_philosopher_culture
 	}
 
 	name_list = name_list_arakkoa

common/culture/cultures/wc_aqir.txt

@@ -41,7 +41,7 @@ nerubian = {
 		tradition_stalwart_defenders
 		tradition_philosopher_culture
 		tradition_city_keepers
-		tradition_strength_in_numbers 
+		tradition_strength_in_numbers
 	}
 
 	name_list = name_list_nerubian

common/culture/cultures/wc_arathi.txt

@@ -156,12 +156,21 @@ dalaranian = {
 	traditions = {
 		tradition_legalistic
 		tradition_republican_legacy
-		tradition_philosopher_culture
 		tradition_hard_working
-		tradition_poetry
 		tradition_sorcerous_metallurgy
 	}
 
+	dlc_tradition = {
+		trait = tradition_fp3_beacon_of_learning
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_philosopher_culture
+	}
+	dlc_tradition = {
+		trait = tradition_fp3_enlightened_magnates
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_poetry
+	}
+
 	name_list = name_list_dalaranian
 
 	coa_gfx = { kirintor_coa_gfx western_coa_gfx } 
@@ -261,10 +270,10 @@ azerothian = {
 		tradition_reverence_for_veterans
 	}
 
-	dlc_tradition = {						#Update to tradition_malleable_subjects in 1.6
-		trait = tradition_culture_blending
-		requires_dlc_flag = royal_court
-		fallback = tradition_astute_diplomats
+	dlc_tradition = {
+		trait = tradition_fp2_malleable_subjects
+		requires_dlc_flag = the_fate_of_iberia
+		fallback = tradition_language_scholars
 	}
 
 	name_list = name_list_azerothian

common/culture/cultures/wc_highborne.txt

@@ -7,7 +7,6 @@
 	martial_custom = martial_custom_equal
 	traditions = {
 		tradition_ruling_caste
-		tradition_philosopher_culture
 		tradition_festivities
 		tradition_castle_keepers
 	}
@@ -23,6 +22,11 @@
 		requires_dlc_flag = royal_court
 		fallback = tradition_sorcerous_metallurgy
 	}
+	dlc_tradition = {
+		trait = tradition_fp3_beacon_of_learning
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_philosopher_culture
+	}
 
 	name_list = name_list_highborne
 
@@ -50,10 +54,15 @@ high_elf = {
 		tradition_hereditary_hierarchy
 		tradition_hunters
 		tradition_gardening
-		tradition_philosopher_culture
 		tradition_religion_blending
 		tradition_festivities
 	}
+
+	dlc_tradition = {
+		trait = tradition_fp3_beacon_of_learning
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_philosopher_culture
+	}
 
 	name_list = name_list_quel_dorei
 
@@ -80,11 +89,16 @@ blood_elf = {
 	traditions = {
 		tradition_religion_blending
 		tradition_hunters
-		tradition_philosopher_culture
 		tradition_stalwart_defenders
 		tradition_eye_for_an_eye
 		tradition_sorcerous_metallurgy
 	}
+
+	dlc_tradition = {
+		trait = tradition_fp3_beacon_of_learning
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_philosopher_culture
+	}
 
 	name_list = name_list_sin_dorei
 
@@ -132,15 +146,15 @@ faldorei = {
 	color = rgb { 112 112 112 }
 
 	ethos = ethos_stoic
-	heritage = heritage_aqir
+	heritage = heritage_highborne
 	language = language_nerubian
 	martial_custom = martial_custom_equal
 	traditions = {
 		tradition_isolationist
 		tradition_eye_for_an_eye
 		tradition_stalwart_defenders
-		tradition_philosopher_culture
-		tradition_city_keepers
+		tradition_quarrelsome
+		tradition_hunters
 		tradition_strength_in_numbers 
 	}
 

common/culture/cultures/wc_orcish.txt

@@ -41,13 +41,18 @@ shadowmoon = {
 	language = language_orcish
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_philosopher_culture
 		tradition_sorcerous_metallurgy
 		tradition_zealous_people
 		tradition_mendicant_mystics
 		tradition_warrior_monks
 	}
 
+	dlc_tradition = {
+		trait = tradition_fp3_beacon_of_learning
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_philosopher_culture
+	}
+
 	name_list = name_list_shadowmoon
 
 	coa_gfx = { orcish_coa_gfx western_coa_gfx }
@@ -448,8 +453,8 @@ durotaric = {
 	}
 
 	dlc_tradition = {
-		trait = tradition_culture_blending		#Update to tradition_malleable_subjects in 1.6
-		requires_dlc_flag = royal_court
+		trait = tradition_fp2_malleable_subjects
+		requires_dlc_flag = the_fate_of_iberia
 		fallback = tradition_language_scholars
 	}