Merge branch 'magic-2024' of https://github.com/Warcraft-GoA-Developm…

…ent-Team/Warcraft-Guardians-of-Azeroth-2 into magic-2024

common/casus_belli_types/00_civil_war.txt

@@ -782,7 +782,7 @@ populist_war = {
 					limit = {
 						has_character_flag = peasant_faction_random_peasant
 					}
-					death = {
+					override_death_effect = {
 						death_reason = death_vanished
 					}
 				}

common/character_interactions/00_debug_interactions.txt

@@ -818,17 +818,17 @@ slay_character_interaction = {
 						save_scope_as = rando
 					}
 					hidden_effect = {
-						death = {
+						override_death_killer_effect = {
 							death_reason = death_duel
 							killer = scope:rando
 						}
 					}
 				}
 				scope:no_slayer = {
-					death = { death_reason = death_natural_causes }
+					override_death_effect = { death_reason = death_natural_causes }
 				}
 				scope:actor_slayer = {
-					death = {
+					override_death_killer_effect = {
 						death_reason = death_duel
 						killer = scope:actor
 					}

common/combat_phase_events/00_commander_phase_events.txt

@@ -89,6 +89,7 @@ commander_wounded = {
 			factor = 0
 			has_trait_with_flag = unkillable
 		}
+		# End Warcraft
 	}
 
 	effect = {
@@ -354,6 +355,14 @@ commander_killed = {
 			factor = 0.8
 			has_character_modifier = wc_frost_armor_modifier
 		}
+		modifier = {
+			factor = 0.9
+			has_character_modifier = wc_divine_purpose_modifier
+		}
+		modifier = {
+			factor = 0
+			has_character_modifier = wc_divine_shield_modifier
+		}
 		# End Warcraft
 		modifier = {
 			factor = 0

common/combat_phase_events/00_knight_phase_events.txt

@@ -1119,6 +1119,46 @@ knight_killed = {
 				}
 			}
 		}
+
+		#Warcraft 
+		modifier = {
+			factor = 0.9
+			has_character_modifier = wc_divine_purpose_modifier
+		}
+		modifier = {
+			factor = 0.8
+			has_character_modifier = wc_frost_armor_modifier
+		}
+		modifier = {
+			factor = 0.9
+			has_character_modifier = wc_divine_purpose_modifier
+		}
+		modifier = {
+			factor = 0
+			has_character_modifier = wc_divine_shield_modifier
+		}
+		modifier = {
+			factor = 0
+			has_trait_with_flag = unkillable
+		}
+		modifier = {
+			factor = 0.95
+			is_knight = yes
+			exists = liege
+			liege = {
+				has_perk = order_magic_tree_3_perk_4
+			}
+		}
+		modifier = {
+			factor = 2
+			# Warcraft
+			has_trait_with_flag = higher_chance_of_dying_in_battle
+		}
+		modifier = {
+			factor = 0.5
+			# Warcraft
+			has_trait_with_flag = lower_chance_of_dying_in_combat
+		}
 	}
 
 	effect = {

common/council_tasks/00_court_chaplain_tasks.txt

@@ -427,6 +427,14 @@ task_conversion = {
 				desc = minimum_conversion
 			}
 		}
+		#Warcraft
+		if = {
+			limit = { scope:councillor_liege = { has_perk = light_magic_tree_1_perk_2 } }
+			add = {
+				value = scope:councillor.court_chaplain_fabricate_claim_divine_service_perk
+				desc = COURT_CHAPLAIN_FABRICATE_CLAIM_DIVINE_SERVICE_PERK
+			}
+		}
 		if = {
 			limit = {
 				scope:councillor_liege = {
@@ -943,6 +951,13 @@ task_fabricate_claim = {
 				desc = COURT_CHAPLAIN_FABRICATE_CLAIM_INNOVATION_BONUS_EXPANSIONISM
 			}
 		}
+		if = {
+			limit = { scope:councillor.liege = { has_perk = light_magic_tree_1_perk_2 } }
+			add = {
+				value = scope:councillor.court_chaplain_fabricate_claim_divine_service_perk
+				desc = COURT_CHAPLAIN_FABRICATE_CLAIM_DIVINE_SERVICE_PERK
+			}
+		}
 		if = {
 			limit = {
 				exists = scope:county

common/deathreasons/wc_event_deaths.txt

@@ -16,4 +16,14 @@ death_adventurers = {
 }
 death_merge = {
 	icon = "death_unknown.dds"
+}
+death_salvation = {
+	icon = "death_unknown.dds"
+}
+death_salvation_killer = {
+	icon = "death_unknown.dds"
+}
+death_divine_storm = {
+	public_knowledge = yes
+	icon = "death_unknown.dds"
 }

common/decisions/wc_magic_decisions.txt

@@ -54,6 +54,8 @@
 restore_chronomancy_decision = {
 	major = yes
 
+	ai_check_interval = 60
+
 	is_shown = {
 		has_character_flag = chronomancy_active
 		OR = {
@@ -71,6 +73,8 @@ restore_chronomancy_decision = {
 activate_presence_of_mind_decision = {
 	major = yes
 
+	ai_check_interval = 60
+
 	is_shown = {
 		has_variable = wc_presence_of_mind_available
 	}
@@ -93,6 +97,8 @@ activate_presence_of_mind_decision = {
 deactivate_presence_of_mind_decision = {
 	major = yes
 
+	ai_check_interval = 60
+
 	is_shown = {
 		has_variable = wc_presence_of_mind_activated
 	}
@@ -108,6 +114,8 @@ deactivate_presence_of_mind_decision = {
 activate_reverse_causality_decision = {
 	major = yes
 
+	ai_check_interval = 60
+
 	is_shown = {
 		has_variable = wc_reverse_causality_available
 		NOT = {
@@ -133,6 +141,8 @@ activate_reverse_causality_decision = {
 deactivate_reverse_causality_decision = {
 	major = yes
 
+	ai_check_interval = 60
+
 	is_shown = {
 		has_variable = wc_reverse_causality_activated
 	}

common/effect_localization/wc_ep1_effects.txt

@@ -1,4 +1,4 @@
-equip_artifact_to_owner_replace = {
+equip_artifact_to_owner_replace = {
     global = EQUIP_ARTIFACT_TO_OWNER
     global_past = EQUIP_ARTIFACT_TO_OWNER_PAST
     first = EQUIP_ARTIFACT_TO_OWNER_FIRST

common/event_themes/wc_event_themes.txt

@@ -30,4 +30,16 @@ order = {
 	background = {
 		reference = throne_room
 	}
+}
+
+light = {
+	icon = {
+		reference = "gfx/interface/icons/icon_light_magic.dds"
+	}
+	sound = {
+		reference = "event:/SFX/Events/Themes/sfx_event_theme_type_learning"
+	}
+	background = {
+		reference = throne_room
+	}
 }

common/game_concepts/wc_magic_spells_concepts.txt

@@ -24,6 +24,47 @@ wc_spell_type_defend = {
 	texture = "gfx/interface/icons/icon_spellbook.dds"
 }
 
+wc_spell_type_heal = {
+	parent = wc_spell_type
+	texture = "gfx/interface/icons/icon_spellbook.dds"
+}
+
+wc_spell_type_dispel = {
+	parent = wc_spell_type_heal
+	texture = "gfx/interface/icons/icon_spellbook.dds"
+}
+
+wc_magic_illness = {
+	parent = illness
+}
+
+wc_major_illness = {
+	parent = illness
+}
+
+wc_magic_injury = {
+	parent = wc_injury
+}
+
+wc_major_injury = {
+	parent = wc_injury
+}
+
+wc_injury = {
+}
+
+wc_poison = {
+	parent = wc_magic_injury
+}
+
+wc_psych_illness = {
+	parent = illness
+}
+
+wc_illness = {
+	parent = illness
+}
+
 wc_spell_type_summon = {
 	parent = wc_spell_type
 	texture = "gfx/interface/icons/icon_spellbook.dds"
@@ -125,40 +166,68 @@ wc_spell_vernal_solstice = {
 	parent = wc_spell_school_elemental_fire
 }
 
-wc_spell_frostbolt = {
+wc_spell_frostfire_bolt = {
 	parent = wc_spell_school_order
 }
 
-wc_spell_frost_armor = {
-	parent = wc_spell_school_order
+wc_spell_flash_of_light = {
+	parent = wc_spell_school_light
 }
 
-wc_spell_frost_nova = {
-	parent = wc_spell_school_order
+wc_spell_dispel = {
+	parent = wc_spell_school_light
 }
 
-wc_spell_blizzard = {
-	parent = wc_spell_school_order
+wc_spell_lightwell = {
+	parent = wc_spell_school_light
 }
 
-wc_spell_scorch = {
-	parent = wc_spell_school_order
+wc_spell_holy_fire = {
+	parent = wc_spell_school_light
 }
 
-wc_spell_pyroblast = {
-	parent = wc_spell_school_order
+wc_spell_salvation = {
+	parent = wc_spell_school_light
 }
 
-wc_spell_fire_shield = {
-	parent = wc_spell_school_order
+wc_spell_judgement = {
+	parent = wc_spell_school_light
 }
 
-wc_spell_flamestrike = {
-	parent = wc_spell_school_order
+wc_spell_exorcism = {
+	parent = wc_spell_school_light
 }
 
-wc_spell_frostfire_bolt = {
-	parent = wc_spell_school_order
+wc_spell_expulsion = {
+	parent = wc_spell_school_light
+}
+
+wc_spell_avenging_wrath = {
+	parent = wc_spell_school_light
+}
+
+wc_spell_bless = {
+	parent = wc_spell_school_light
+}
+
+wc_spell_divine_shield = {
+	parent = wc_spell_school_light
+}
+
+wc_spell_consecration = {
+	parent = wc_spell_school_light
+}
+
+wc_spell_rebuke = {
+	parent = wc_spell_school_light
+}
+
+wc_spell_blessed_bastion = {
+	parent = wc_spell_school_light
+}
+
+wc_spell_divine_storm = {
+	parent = wc_spell_school_light
 }
 
 wc_cosmos = {