Light lifestyle (#1420)

* Spell Hack: sgui * Spell Hack: Removing un-eeded buttons * Spell Hack: New loc, revert vis change * Spell Hack: u can close window now * Spell Hack: cant hack trigger desc * Spell Hack: Can't select certain spells for hacking * Update wc_magic_guis.txt * Spell Hack: Effect * Spell Hack: loc to clarify * Init order spells * Cyromancer spells localization * Pyromancer spells localization * Pyro and Cryomancy tree backgrounds * New tree backgrounds * Add spell game concepts * Cyromancer spells localization * Pyromancer spells localization * Arcane elemental spells (#1408) * Scorch spell * Make Scorch Order, not Fire * Clear Scorch cooldown when hit with elemental or fel hostile magic * Use burned effect * Use normal order bonuses * Scorch doesn't have ranks * Pyroblast * Fix errors * Fix broken tooltips * Toast for hit * Make tooltip smaller * Correct pyroblast values * Flamestrike * Flamestrike better duration and tooltip * Fire Shield * Correct loc * Frostfire bolt * Frostbite traits * Name * Frostbolt * Names once again * Naaameees * Frost Nova modifier and Frostbolt chance modifier * Frost Nova * Make Flamestrike loop simpler * Frost Armor pt1 * Frost Armor pt2 * Frost Armor pt3 * Finish up Frost Armor * Improve ice block * Blizzard pt1 * Blizzard pt2 * Blizzard pt3 * Finish up Blizzard * Flame synergy name * Mana values * Duration values * Fixed blizzard duration not applying * sexier loc * sexier loc part 2 * hi * Fix flamestrike duration and remove dupe loc * Update to match fire branch and fix errors * Fix loc file and bom * Fix error * Fix another error * Fix errors * Fix last errors --------- Co-authored-by: d <[email protected]> * Netherburned perk * Netherburn cooldown * Flame and Frost synergy * Flame armor perk * Icy Veins perk * Freezerburn perk * Elemental master perk warning loc * Fix loc * Simplify event effects * Twin Flame perk (excluding event loc) * Twin Flame event loc * Master Pyromancer and Cryomancer * remove mana cost from spell desc * Revert "remove mana cost from spell desc" This reverts commit a0184ae. * remove mana cost from spell desc - rea; * Freeze Timer perk * Move to character on_action * Make fire shield giving a character interaction * Fire shield is granted when casting is finished * Prowess to Netherburn * Mostly working ice block model * Fixed ice block shader * Court shaders * Include spouse in twin flame loc * Don't apply opinion to yourself * Fix frostbite and burned tt * Lowercase SheHe for burned and frostbite * Master Pyro/Cryomancer loc * Fix Burned and Frostbite loc * Flame Synergy applies to cooldown, not cost * Fix game concept * Add compression on iceblock * Move iceblock files * Correct wrong value * Update ice block * Fix var name * tree loc * Flash of Light Init * Add game concepts and loc * Update wc_magic_spell_values.txt * triggers * update * New injury triggers * Clean some errors * Update wc_game_concepts_magic_spells_l_english.yml * update traits and triggers for new injury/illness system * start working on effect * effect pt2 * Update wc_magic_spell_values.txt * standardize mana costs for arcane * Revert flag change * Set up dispelling system * Aether Tap Perk * Buying Time Perk * Arcane Explosion Perk * Magical Procrastination Perk * Mirror Image Perk * Arcane Intellect Perk * Scheme Reflect pt1 * Scheme Reflect pt2 * Scheme Reflect pt3 AI fix and Fabricate Hook scheme * Scheme Reflect pt4 Murder and Steal Artifact schemes * Scheme Reflect pt5 Claim Throne and Overthrow Regent schemes * Arcane Spells (#1422) * Arcane values * Init order spells * Chronomancy duration value * Chronomancy spell trigger * Fix broken trigger * Polymorph static model * Polymorph Spell * Counterspell Spell * Remove modifier from correct character * Remove var correctly * Polymorphed are unable to be harmed in combat * Add counterspell to trigger * Spellsteal Spell * Scrying Spell * Haste / Slow spell * Conjure Refreshment pt1 * Conjure Refreshment pt2 * Conjure Refreshment Spell * Make the if/else from hell less hellish * Include the modifier * Chronomancy pt1 * Chronomancy pt2 * Chronomancy spell * Arcane Elemental Lifestyle * Pyro and Cryomancy tree backgrounds * Consistent tree size * New tree backgrounds * Localize lifestyle trees * Add spell game concepts * Cyromancer spells localization * Pyromancer spells localization * Pyro and Cryomancy tree backgrounds * New tree backgrounds * Add spell game concepts * Cyromancer spells localization * Pyromancer spells localization * Arcane elemental spells (#1408) * Scorch spell * Make Scorch Order, not Fire * Clear Scorch cooldown when hit with elemental or fel hostile magic * Use burned effect * Use normal order bonuses * Scorch doesn't have ranks * Pyroblast * Fix errors * Fix broken tooltips * Toast for hit * Make tooltip smaller * Correct pyroblast values * Flamestrike * Flamestrike better duration and tooltip * Fire Shield * Correct loc * Frostfire bolt * Frostbite traits * Name * Frostbolt * Names once again * Naaameees * Frost Nova modifier and Frostbolt chance modifier * Frost Nova * Make Flamestrike loop simpler * Frost Armor pt1 * Frost Armor pt2 * Frost Armor pt3 * Finish up Frost Armor * Improve ice block * Blizzard pt1 * Blizzard pt2 * Blizzard pt3 * Finish up Blizzard * Flame synergy name * Mana values * Duration values * Fixed blizzard duration not applying * sexier loc * sexier loc part 2 * hi * Fix flamestrike duration and remove dupe loc * Update to match fire branch and fix errors * Fix loc file and bom * Fix error * Fix another error * Fix errors * Fix last errors --------- Co-authored-by: d <[email protected]> * Netherburned perk * Netherburn cooldown * Flame and Frost synergy * Flame armor perk * Icy Veins perk * Freezerburn perk * Elemental master perk warning loc * Fix loc * Simplify event effects * Twin Flame perk (excluding event loc) * Master Pyromancer and Cryomancer * remove mana cost from spell desc * Revert "remove mana cost from spell desc" This reverts commit a0184ae. * remove mana cost from spell desc - rea; * Freeze Timer perk * Move to character on_action * Make fire shield giving a character interaction * Fire shield is granted when casting is finished * Fire shield loc * Prowess to Netherburn * Mostly working ice block model * Fixed ice block shader * Court shaders * Include spouse in twin flame loc * Don't apply opinion to yourself * Fix frostbite and burned tt * Ice block has no animations * Lowercase SheHe for burned and frostbite * Master Pyro/Cryomancer loc * Fix Burned and Frostbite loc * Flame Synergy applies to cooldown, not cost * Fix shader * Fix game concept * Add iceblock gene everywhere * Add compression on iceblock * Move iceblock files * Correct wrong value * Update ice block * Fix var name * Frostbite trait icons * Fix merge --------- Co-authored-by: d <[email protected]> * Add elemental spells to trigger * Evocation Ritual * Fix minor errors * Arcane Dome pt1 * Arcane Dome Ritual * Double cast due to Evocation * Fix Haste/Slow effect loc * Update wc_magic_spells_triggers.txt * Fix loc * Fix double casting rituals * Fix evocation errors * Add proper punctuation * Chronomancy countdown * Chronomancy tooltip --------- Co-authored-by: d <[email protected]> * Make spell tooltip names uppercase * Use short UI name * Minor loc errors * Scheme Reflect Perk * Quickening and Synergistic Alacrity Perks * Empowered Scrying Perk * Time Warping Perk * Fix gain/gains * Fix gain/gains 2.0 * Frost Synergy value desc * Presence of Mind pt1 * Presence of Mind Perk * Arcane Dialectics fix * Reverse Causality Perk and fixes * Fix Reverse Causality being overridable * Ice modifier icon * Dispel game concepts part 1 * Dispel game concepts part 2 * adjust flash of light mana cost * Dispels localization * Fix dispels triggers to make more sense * More trigger cleanup * Fix generic dispel effect * More dispel localization * Flash of Light effect * Flash of light fixes + loc * Dispel personal cooldowns * Init Spell: Dispel * dispel changes * add the shit back wtf lol * fix errors1 * fix merge * Update spellbook_widget.gui * Init Holy Light & Holy Fire * change holy light to lightwell * remove lightwell and holy fire ranks * fix cauterize ctd * Lightwell / Holy Fire * flash of light fix * add holy fire dodge chance * Judgement + Fixes * Expulsion * Expulsion / Exorcism / fixes * New magic injury: Holy Wrath * Avenging Wrath * holy wrath desc * New helpful modifier for dispels * change cauterize wound dispel to match new system * add avenging wrath to perk tree * Fixes - remove opinion from urself * Holy wrath values fix * update dispels concepts * add holy wrath to dispel * Init Spell: Salvation * Update wc_magic_effects.txt * Increase Salvation mana cost * Setup Salvation events * Add Salvation death mechanic * Make sure all deaths go thru override effect * prevent some natural deaths * Add Salvation monitor * Can't cast salvation on demons * Add Salvation to perk tree * Fix salvation triggers * New negative salvation modifier * Salvation effects * First Salvation Event * Add option to die anyways + events * Salvation on an undead person just removes undead trait * Merge branch 'magic-2024' into light-lifestyle-new * has_negative_spell_modifier * add mods to spell_modifier_trigger * add mods to every_spell_modifier_effect * Revamp dispel effect to match spellsteal * Change the way magic resistance works for modifiers * Update wc_magic_spells_triggers.txt * Fix dispel stakcs * Fix dispel * dispel tooltip + interface toast * Update wc_magic_light_effects.txt * salvation events * More event fixes + make debug death work * Finish Salvation events * Spell: Bless * remove modifiers that wont have any effect from positive list * Spell: Divine Shield * fix error * Fix salvation event ai_chance * Update consecration loc * Consecration modifiers * Spell: Consecration * Update wc_magic_effects.txt * fix * Fix dispel template * Update consecration duration * Consecration GUI * Make consecration county * update consecration cost * move consecration effect * error sweep 1 * make Bless cd less * update consecration tt * Rebuke * rebuke cant kick rebuke * Divine storm * add more opinion if spell is ritual * Update wc_magic_light_effects.txt * Blessed Bastion * fix ctd and errors * Fix expulsion and FoL * Fix all loc issues * Fix arcane spells not working * fix magical prowess modifier application and scaling * Divine service perk * Blessed Blood * Echo of light perk * radiant hearth * Struggle perk * Seal of command * Holy wrath effects * give exorcism a rank 2 * add gui for multiple character targets * exorcism rank 2 effect * make sure character finder goes back to normal * Might fix ctd * Re-add removed triggers * Remove dupe loc * fix exorcism * Create holy_wrath.dds * divine purpose * holy retribution * virtue part 1 * Update holy_wrath.dds * Inner fire + virtue tt * choose an aura event * final stand * remove dispel template effect * fix dispel bug * Fix vengeance, ret aura, echo of light, and holy wrath effect * Fix judgement tooltip * Add notifcation text for magic secrets * update exorcism tooltip * Add divine storm death reason * change virtue * fix divine shield tooltip * add missing modifiers to water magic resistance * Fix final stand when heir is designated * fix rebuke dodge tootlip * fix rebuke * fix gay little british tooltip * Update wc_magic_effects.txt * Add 2 new salvation notification events * error sweep * implement robfart suggestions --------- Co-authored-by: Robmart <[email protected]>
Warcraft-GoA-Development-Team · Sep 18, 2024 · cea1b5e · cea1b5e
1 parent 1c04ffb
commit cea1b5e
Show file tree

Hide file tree

Showing 62 changed files with 7,493 additions and 1,316 deletions.
diff --git a/common/casus_belli_types/00_civil_war.txt b/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
 					}
 				}

diff --git a/common/character_interactions/00_debug_interactions.txt b/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
 					}

diff --git a/common/combat_phase_events/00_commander_phase_events.txt b/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

diff --git a/common/combat_phase_events/00_knight_phase_events.txt b/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 = {

diff --git a/common/council_tasks/00_court_chaplain_tasks.txt b/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

diff --git a/common/deathreasons/wc_event_deaths.txt b/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"
 }
diff --git a/common/decisions/wc_magic_decisions.txt b/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
 	}

diff --git a/common/effect_localization/wc_ep1_effects.txt b/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

diff --git a/common/event_themes/wc_event_themes.txt b/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
+	}
 }
diff --git a/common/game_concepts/wc_magic_spells_concepts.txt b/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 = {