Updated abilities for the scoped condition rework, and moved many of …

…their definitions to GSML

data/upgrades/abilities/barkskin.txt

@@ -3,7 +3,7 @@ upgrade_barkskin = {
 	icon = icon_barkskin
 	ability = true
 
-	conditions = {
+	unit_conditions = {
 		upgrade = upgrade_deity_frey
 	}
 }

data/upgrades/abilities/blessing.txt

@@ -0,0 +1,9 @@
+upgrade_blessing = {
+	name = "Blessing"
+	icon = icon_blessing
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_christian_god
+	}
+}

data/upgrades/abilities/deadly_precision.txt

@@ -0,0 +1,10 @@
+upgrade_deadly_precision = {
+	name = "Deadly Precision"
+	icon = icon_deadly_precision
+	ability = true
+	requirements_string = "Critical Strike"
+
+	unit_conditions = {
+		upgrade = upgrade_critical_strike
+	}
+}

data/upgrades/abilities/far_sight.txt

@@ -0,0 +1,9 @@
+upgrade_far_sight = {
+	name = "Far Sight"
+	icon = icon_far_sight
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_odin
+	}
+}

data/upgrades/abilities/healing.txt

@@ -0,0 +1,9 @@
+upgrade_healing = {
+	name = "Healing"
+	icon = icon_healing
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_christian_god
+	}
+}

data/upgrades/abilities/inspire.txt

@@ -0,0 +1,9 @@
+upgrade_inspire = {
+	name = "Inspire"
+	icon = icon_inspire
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_tyr
+	}
+}

data/upgrades/abilities/precision.txt

@@ -0,0 +1,9 @@
+upgrade_precision = {
+	name = "Precision"
+	icon = icon_precision
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_heimdall
+	}
+}

data/upgrades/abilities/regeneration.txt

@@ -3,7 +3,7 @@ upgrade_regeneration = {
 	icon = icon_regeneration
 	ability = true
 
-	conditions = {
+	unit_conditions = {
 		upgrade = upgrade_deity_freyja
 	}
 }

data/upgrades/abilities/shocking_grasp.txt

@@ -0,0 +1,9 @@
+upgrade_shocking_grasp = {
+	name = "Shocking Grasp"
+	icon = icon_shocking_grasp
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_thor
+	}
+}

data/upgrades/abilities/slow.txt

@@ -0,0 +1,9 @@
+upgrade_slow_ability = {
+	name = "Slow"
+	icon = icon_slow
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_loki
+	}
+}

data/upgrades/abilities/terror.txt

@@ -0,0 +1,9 @@
+upgrade_terror = {
+	name = "Terror"
+	icon = icon_terror
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_gathaarl
+	}
+}

data/upgrades/abilities/wither.txt

@@ -0,0 +1,9 @@
+upgrade_wither = {
+	name = "Wither"
+	icon = icon_wither
+	ability = true
+
+	unit_conditions = {
+		upgrade = upgrade_deity_hel
+	}
+}

scripts/abilities.lua

@@ -33,12 +33,6 @@ DefineUpgrade("upgrade-axe-mastery", {
 	MaxLimit = 5
 })
 
-DefineUpgrade("upgrade-blessing", {
-	Name = "Blessing",
-	Icon = "icon-blessing",
-	Ability = true
-})
-
 DefineUpgrade("upgrade-bow-mastery", {
 	Name = "Bow Mastery",
 	Icon = "icon-bow-mastery",
@@ -53,13 +47,6 @@ DefineUpgrade("upgrade-critical-strike", {
 	Ability = true
 })
 
-DefineUpgrade("upgrade-deadly-precision", {
-	Name = "Deadly Precision",
-	Icon = "icon-deadly-precision",
-	Ability = true,
-	RequirementsString = "Critical Strike"
-})
-
 DefineUpgrade("upgrade-eagle-eye", {
 	Name = "Eagle Eye",
 	Icon = "icon-eagle-eye",
@@ -73,12 +60,6 @@ DefineUpgrade("upgrade-ethereal-vision", {
 	Ability = true
 })
 
-DefineUpgrade("upgrade-far-sight", {
-	Name = "Far Sight",
-	Icon = "icon-far-sight",
-	Ability = true
-})
-
 DefineUpgrade("upgrade-gun-mastery", {
 	Name = "Gun Mastery",
 	Icon = "icon-gun-mastery",
@@ -87,18 +68,6 @@ DefineUpgrade("upgrade-gun-mastery", {
 	MaxLimit = 5
 })
 
-DefineUpgrade("upgrade-healing", {
-	Name = "Healing",
-	Icon = "icon-healing",
-	Ability = true
-})
-
-DefineUpgrade("upgrade-inspire", {
-	Name = "Inspire",
-	Icon = "icon-inspire",
-	Ability = true
-})
-
 DefineUpgrade("upgrade-leadership", {
 	Name = "Leadership",
 	Icon = "icon-leadership",
@@ -125,12 +94,6 @@ DefineUpgrade("upgrade-precise-shot", {
 	Ability = true
 })
 
-DefineUpgrade("upgrade-precision", {
-	Name = "Precision",
-	Icon = "icon-precision",
-	Ability = true
-})
-
 DefineUpgrade("upgrade-puncture", {
 	Name = "Puncture",
 	Icon = "icon-puncture",
@@ -143,18 +106,6 @@ DefineUpgrade("upgrade-scouting", {
 	Ability = true
 })
 
-DefineUpgrade("upgrade-shocking-grasp", {
-	Name = "Shocking Grasp",
-	Icon = "icon-shocking-grasp",
-	Ability = true
-})
-
-DefineUpgrade("upgrade-slow-ability", {
-	Name = "Slow",
-	Icon = "icon-slow",
-	Ability = true
-})
-
 DefineUpgrade("upgrade-spear-mastery", {
 	Name = "Spear Mastery",
 	Icon = "icon-spear-mastery",
@@ -177,12 +128,6 @@ DefineUpgrade("upgrade-sword-mastery", {
 	MaxLimit = 5
 })
 
-DefineUpgrade("upgrade-terror", {
-	Name = "Terror",
-	Icon = "icon-terror",
-	Ability = true
-})
-
 DefineUpgrade("upgrade-throwing-mastery", {
 	Name = "Throwing Mastery",
 	Icon = "icon-throwing-mastery",
@@ -198,12 +143,6 @@ DefineUpgrade("upgrade-toughness", {
 	MaxLimit = 100
 })
 
-DefineUpgrade("upgrade-wither", {
-	Name = "Wither",
-	Icon = "icon-wither",
-	Ability = true
-})
-
 DefineModifier("upgrade-axe-mastery",
 	{"BasicDamage", 2}
 )

scripts/buttons.lua

@@ -204,14 +204,14 @@ DefineButton( { Pos = 10, Level = "choose-individual-upgrade-level", Icon = "ico
 
 --[[
 DefineButton( { Pos = 1, Level = "choose-individual-upgrade-level", Icon = "icon-healing",
-	Action = "learn-ability", Value = "upgrade-healing",
+	Action = "learn-ability", Value = "upgrade_healing",
 	Description = "Healing is an active ability that heals an organic unit.",
 	Key = "h", Hint = "Learn ~!Healing", Popup = "popup_learn_ability",
 	ForUnit = {"unit-dwarven-loremaster"}
 })
 
 DefineButton( { Pos = 2, Level = "choose-individual-upgrade-level", Icon = "icon-precision",
-	Action = "learn-ability", Value = "upgrade-precision",
+	Action = "learn-ability", Value = "upgrade_precision",
 	Key = "r", Hint = "Learn P~!recision", Popup = "popup_learn_ability",
 	Description = "Precision is an active ability that doubles the accuracy of an organic unit while in combat.",
 	ForUnit = {"unit-germanic-priest", "unit-teuton-priest", "unit-elven-priest", "unit-dwarven-loremaster"}

scripts/civilizations/dwarf/units.lua

@@ -1441,7 +1441,7 @@ DefineUnitType("unit-dwarven-witness", {
 	InvertedEastArms = true,
 	InvertedSoutheastArms = true,
 	ButtonKey = "w",
-	StartingAbilities = {"upgrade-far-sight", "upgrade-inspire", "upgrade-precision", "upgrade-shocking-grasp", "upgrade-slow-ability", "upgrade-wither"},
+	StartingAbilities = {"upgrade_far_sight", "upgrade_inspire", "upgrade_precision", "upgrade_shocking_grasp", "upgrade_slow_ability", "upgrade_wither"},
 	CanCastSpell = {"spell-far-sight", "spell-inspire", "spell-healing", "spell-precision", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AutoCastActive = {"spell-inspire", "spell-healing", "spell-precision", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AiDrops = {"unit-boots", "unit-cheese", "unit_meat", "unit-potion-of-healing", "unit_potion_of_mana"},
@@ -1476,7 +1476,7 @@ DefineUnitType("unit-dwarven-annalist", {
 	BluntDamage = true,
 	InvertedEastArms = true,
 	InvertedSoutheastArms = true,
-	StartingAbilities = {"upgrade-far-sight", "upgrade-inspire", "upgrade-precision", "upgrade-shocking-grasp", "upgrade-slow-ability", "upgrade-wither"},
+	StartingAbilities = {"upgrade_far_sight", "upgrade_inspire", "upgrade_precision", "upgrade_shocking_grasp", "upgrade_slow_ability", "upgrade_wither"},
 	CanCastSpell = {"spell-far-sight", "spell-inspire", "spell-healing", "spell-precision", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AutoCastActive = {"spell-inspire", "spell-healing", "spell-precision", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AiDrops = {"unit-boots", "unit-cheese", "unit_meat", "unit-potion-of-healing", "unit_potion_of_mana"},
@@ -1511,7 +1511,7 @@ DefineUnitType("unit-dwarven-loremaster", {
 	BluntDamage = true,
 	InvertedEastArms = true,
 	InvertedSoutheastArms = true,
-	StartingAbilities = {"upgrade-far-sight", "upgrade-inspire", "upgrade-precision", "upgrade-shocking-grasp", "upgrade-slow-ability", "upgrade-wither"},
+	StartingAbilities = {"upgrade_far_sight", "upgrade_inspire", "upgrade_precision", "upgrade_shocking_grasp", "upgrade_slow_ability", "upgrade_wither"},
 	CanCastSpell = {"spell-far-sight", "spell-inspire", "spell-healing", "spell-precision", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AutoCastActive = {"spell-inspire", "spell-healing", "spell-precision", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AiDrops = {"unit-boots", "unit-cheese", "unit_meat", "unit-potion-of-healing", "unit_potion_of_mana"},

scripts/civilizations/elf/units.lua

@@ -60,7 +60,7 @@ DefineUnitType("unit-elven-priest", {
 --	WeaponClasses = {"mace"},
 	BluntDamage = true,
 	ButtonKey = "p",
-	StartingAbilities = {"upgrade-healing"},
+	StartingAbilities = {"upgrade_healing"},
 	CanCastSpell = {"spell-healing", "spell-precision"},
 	AutoCastActive = {"spell-healing", "spell-precision"},
 	AiDrops = {"unit-boots", "unit-cheese", "unit_meat", "unit-potion-of-healing", "unit_potion_of_mana"},

scripts/civilizations/germanic/units.lua

@@ -656,7 +656,7 @@ DefineUnitType("unit-germanic-priest", {
 --	WeaponClasses = {"mace"},
 	BluntDamage = true,
 	ButtonKey = "g",
-	StartingAbilities = {"upgrade-barkskin", "upgrade-far-sight", "upgrade-inspire", "upgrade-precision", "upgrade-regeneration", "upgrade-shocking-grasp", "upgrade-slow-ability", "upgrade-wither"},
+	StartingAbilities = {"upgrade_barkskin", "upgrade_far_sight", "upgrade_inspire", "upgrade_precision", "upgrade_regeneration", "upgrade_shocking_grasp", "upgrade_slow_ability", "upgrade_wither"},
 	CanCastSpell = {"spell-barkskin", "spell-far-sight", "spell-inspire", "spell-healing", "spell-precision", "spell-regeneration", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AutoCastActive = {"spell-barkskin", "spell-inspire", "spell-healing", "spell-precision", "spell-regeneration", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AiDrops = {"unit-boots", "unit-cheese", "unit-potion-of-healing", "unit_potion_of_mana"},

scripts/civilizations/goblin/units.lua

@@ -355,7 +355,7 @@ DefineUnitType("unit-goblin-shaman", {
 	Accuracy = 10,
 	Evasion = 10,
 	Corpse = "unit-goblin-dead-body",
-	StartingAbilities = {"upgrade-terror", "upgrade-wither"},
+	StartingAbilities = {"upgrade_terror", "upgrade_wither"},
 	CanCastSpell = {"spell-terror", "spell-wither"},
 	AutoCastActive = {"spell-terror", "spell-wither"},
 	AiDrops = {"unit-boots", "unit-cheese", "unit_meat", "unit-potion-of-healing", "unit_potion_of_mana"},

scripts/civilizations/teuton/units.lua

@@ -822,7 +822,7 @@ DefineUnitType("unit-teuton-priest", {
 --	WeaponClasses = {"mace"},
 	BluntDamage = true,
 	ButtonKey = "l",
-	StartingAbilities = {"upgrade-barkskin", "upgrade-blessing", "upgrade-far-sight", "upgrade-healing", "upgrade-inspire", "upgrade-precision", "upgrade-regeneration", "upgrade-shocking-grasp", "upgrade-slow-ability", "upgrade-wither"},
+	StartingAbilities = {"upgrade_barkskin", "upgrade_blessing", "upgrade_far_sight", "upgrade_healing", "upgrade_inspire", "upgrade_precision", "upgrade_regeneration", "upgrade_shocking_grasp", "upgrade_slow_ability", "upgrade_wither"},
 	CanCastSpell = {"spell-barkskin", "spell-blessing", "spell-far-sight", "spell-healing", "spell-inspire", "spell-precision", "spell-regeneration", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AutoCastActive = {"spell-barkskin", "spell-blessing", "spell-healing", "spell-inspire", "spell-precision", "spell-regeneration", "spell-shocking-grasp", "spell-slow", "spell-wither"},
 	AiDrops = {"unit-boots", "unit-cheese", "unit_carrots", "unit-potion-of-healing", "unit_potion_of_mana"},

scripts/stratagus.lua

@@ -1880,7 +1880,6 @@ Load("scripts/item_prefixes.lua")
 Load("scripts/item_suffixes.lua")
 Load("scripts/units.lua")
 Load("scripts/upgrade.lua")
-Load("scripts/ability_dependencies.lua")
 Load("scripts/religions.lua")
 Load("scripts/deities.lua")
 Load("scripts/wyr.lua")