@@ Line 22: / Line 22: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
@@ Line 47: / Line 47: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
@@ Line 72: / Line 72: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
@@ Line 97: / Line 97: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
@@ Line 122: / Line 122: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
@@ Line 147: / Line 147: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
@@ Line 172: / Line 172: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0"
 	},
-	"tech_upgrade_base": {
+	"item_projectile_test_01": {
 		"Name": null,
 		"Description": null,
-		"Cost": "None",
+		"Cost": "800",
-		"Tier": null,
+		"Tier": "1",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
-		"IsDisabled": false,
+		],
-		"AbilityCooldown": "0",
+		"ShopFilters": [
-		"AbilityDuration": "0",
+			"WeaponDamage"
-		"AbilityCastRange": "0",
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 1,
+		"AbilityDuration": "1",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.01",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"Radius": "0.5m",
+		"HeightOffGround": "0.5m"
 	},
-	"tech_upgrade_t1": {
+	"item_projectile_test_02": {
 		"Name": null,
 		"Description": null,
 		"Cost": "800",
 		"Tier": "1",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
-		"IsDisabled": false,
+		],
-		"AbilityCooldown": "0",
+		"ShopFilters": [
-		"AbilityDuration": "0",
+			"WeaponDamage"
-		"AbilityCastRange": "0",
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 1,
+		"AbilityDuration": "1",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.01",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"Radius": "0.5m",
+		"HeightOffGround": "0.5m"
 	},
-	"tech_upgrade_t2": {
+	"item_projectile_test_03": {
 		"Name": null,
 		"Description": null,
-		"Cost": "1600",
+		"Cost": "800",
-		"Tier": "2",
+		"Tier": "1",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
-		"IsDisabled": false,
+		],
-		"AbilityCooldown": "0",
+		"ShopFilters": [
-		"AbilityDuration": "0",
+			"WeaponDamage"
-		"AbilityCastRange": "0",
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 1,
+		"AbilityDuration": "1",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.01",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"Radius": "0.5m",
+		"HeightOffGround": "0.5m"
 	},
-	"tech_upgrade_t3": {
+	"item_projectile_test_04": {
 		"Name": null,
 		"Description": null,
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
-		"IsDisabled": false,
+		],
-		"AbilityCooldown": "0",
+		"ShopFilters": [
-		"AbilityDuration": "0",
+			"WeaponDamage"
-		"AbilityCastRange": "0",
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 1,
+		"AbilityDuration": "1",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.01",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"Radius": "0.5m",
+		"HeightOffGround": "0.5m"
 	},
-	"tech_upgrade_t4": {
+	"item_projectile_test_05": {
 		"Name": null,
 		"Description": null,
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
-		"IsDisabled": false,
+		],
-		"AbilityCooldown": "0",
+		"ShopFilters": [
-		"AbilityDuration": "0",
+			"WeaponDamage"
-		"AbilityCastRange": "0",
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 1,
+		"AbilityDuration": "1",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.01",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"Radius": "0.5m",
+		"HeightOffGround": "0.5m"
 	},
-	"tech_upgrade_t5": {
+	"item_projectile_test_06": {
 		"Name": null,
 		"Description": null,
-		"Cost": "9999",
+		"Cost": "800",
-		"Tier": "5",
+		"Tier": "1",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
-		"IsDisabled": false,
+		],
-		"AbilityCooldown": "0",
+		"ShopFilters": [
-		"AbilityDuration": "0",
+			"WeaponDamage"
-		"AbilityCastRange": "0",
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 1,
+		"AbilityDuration": "1",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.01",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"Radius": "0.5m",
+		"HeightOffGround": "0.5m"
 	},
-	"upgrade_ability_power_shard": {
+	"tech_upgrade_base": {
-		"Name": "Echo Shard",
+		"Name": null,
 		"Description": null,
-		"Cost": "6400",
+		"Cost": "None",
-		"Tier": "4",
+		"Tier": null,
-		"Activation": "InstantCast",
+		"Activation": "Passive",
 		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"Movement",
-			"MagicDamage"
-		],
 		"IsDisabled": false,
-		"AbilityCooldown": 30,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "20m",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"CooldownReduction": "5",
-		"BonusFireRate": "5",
-		"TechResist": "5",
-		"BulletResist": "5"
 	},
-	"upgrade_ability_refresher": {
+	"tech_upgrade_t1": {
-		"Name": "Refresher",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003EReset the cooldown\u003C/span\u003E of all your abilities and \u003Cspan class=\"highlight\"\u003Erestore all your charges\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
 		"Slot": "Tech",
 		"Components": null,
@@ Line 370: / Line 399: @@
 		"ShopFilters": null,
 		"IsDisabled": false,
-		"AbilityCooldown": "300",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.6",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"TechResist": "14",
-		"BulletResist": "15"
 	},
-	"upgrade_ablative_coat": {
+	"tech_upgrade_t2": {
-		"Name": "Ablative Coat",
+		"Name": null,
-		"Description": "Provides \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E but you lose some each time you take Weapon Damage. Loss can only happen once every {s:StackLossFrequency}s. Bullet Resist is restored when out of combat.",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [],
+		"TargetTypes": null,
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 21,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 406: / Line 433: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"MaxBulletResist": "30",
-		"StackLossFrequency": "1",
-		"ArmorLossPerHit": "4",
-		"BulletArmor": "1",
-		"BonusSprintSpeed": "3m"
 	},
-	"upgrade_absorbing_armor": {
+	"tech_upgrade_t3": {
-		"Name": "Witchmail",
+		"Name": null,
-		"Description": "Taking heavy hits of {g:citadel_inline_attribute:'SpiritDamage'} from an enemy reduces a \u003Cspan class=\"highlight\"\u003Erandom ability cooldown\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage",
-			"Durability"
-		],
 		"IsDisabled": false,
-		"AbilityCooldown": "1",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 439: / Line 458: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "10",
+		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"TechResist": "20",
-		"CooldownReductionPerHit": "4",
-		"CooldownReduction": "7",
-		"DamageThreshold": "75"
 	},
-	"upgrade_acolytes_glove": {
+	"tech_upgrade_t4": {
-		"Name": "Spirit Strike",
+		"Name": null,
-		"Description": "When you perform a \u003Cspan class=\"highlight\"\u003ELight or Heavy Melee\u003C/span\u003E attack against a hero, deal extra \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E with the attack and reduce the target's \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E.\u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003ECooldown is 2x longer for Light Melee hits.\u003C/span\u003E",
+		"Description": null,
-		"Cost": "800",
+		"Cost": "6400",
-		"Tier": "1",
+		"Tier": "4",
 		"Activation": "Passive",
 		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
+		"ShopFilters": null,
-		],
-		"ShopFilters": [
-			"MagicDamage",
-			"Melee"
-		],
 		"IsDisabled": false,
-		"AbilityCooldown": 8,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "6",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 473: / Line 483: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"LightMeleeCooldownMult": "2",
-		"SpiritDamage": "40",
-		"TechArmorDamageReduction": "-6"
 	},
-	"upgrade_active_bullet_shield": {
+	"tech_upgrade_t5": {
-		"Name": "Shield Rush",
+		"Name": null,
-		"Description": "Give temporary \u003Cspan class=\"highlight\"\u003Ebullet shield\u003C/span\u003E for you and nearby allied Heros and their minions.",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "9999",
-		"Tier": "4",
+		"Tier": "5",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroFriendly",
-			"MinionFriendly"
-		],
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 64,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "15",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "25m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.25",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"CombatBarrier": "0",
-		"Radius": "30m",
-		"BulletShieldMaxHealth": "0",
-		"BonusSprintSpeed": "5m"
 	},
-	"upgrade_active_reload": {
+	"upgrade_ability_power_shard": {
-		"Name": "Active Reload",
+		"Name": null,
-		"Description": "While reloading, pressing {g:citadel_keybind:'Reload'} during the highlighted portion will \u003Cspan class=\"highlight\"\u003Einstantly finish your reload\u003C/span\u003E and grant you \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003EBullet Lifesteal\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage"
+			"Movement",
+			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "12",
+		"AbilityCooldown": 30,
-		"AbilityDuration": "7",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletLifestealPercent": "18",
+		"CooldownReduction": "5",
-		"BonusFireRate": "25",
+		"BonusFireRate": "5",
-		"BonusClipSizePercent": "20",
+		"TechResist": "5",
-		"BonusMoveSpeed": "1m"
+		"BulletResist": "5"
 	},
-	"upgrade_aerial_assault": {
+	"upgrade_ability_refresher": {
-		"Name": "Aerial Assault",
+		"Name": null,
-		"Description": null,
+		"Description": "\u003Cspan class=\"highlight\"\u003EReset the cooldown\u003C/span\u003E of all your abilities and \u003Cspan class=\"highlight\"\u003Erestore all your charges\u003C/span\u003E.",
 		"Cost": "6400",
 		"Tier": "4",
 		"Activation": "InstantCast",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllEnemy"
-		],
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 26,
+		"AbilityCooldown": "300",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.6",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ActivateTime": "0.75",
+		"TechResist": "14",
-		"BulletLifestealPercent": "25",
+		"BulletResist": "15"
-		"BonusFireRate": "15",
-		"JumpVelocityHidden": "30.0m",
-		"AssaultLifestealPercent": "20",
-		"AssaultDuration": "3.0",
-		"AssaultFireRate": "60",
-		"ExplodeRadius": "3m"
 	},
-	"upgrade_ammo_scavenger": {
+	"upgrade_ablative_coat": {
-		"Name": "Ammo Scavenger",
+		"Name": null,
-		"Description": "Any time you secure or deny a Soul from an entity you \u003Cspan class=\"highlight\"\u003Eget ammo back\u003C/span\u003E and gain stacking \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.\u003Cbr\u003EAt Max Stacks, gain bonus Sprint speed",
+		"Description": "Provides \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E but you lose some each time you take Weapon Damage. Loss can only happen once every {s:StackLossFrequency}s. Bullet Resist is restored when out of combat.",
-		"Cost": "800",
+		"Cost": "6400",
-		"Tier": "1",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [],
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage",
-			"ClipSize"
-		],
 		"IsDisabled": true,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 21,
-		"AbilityDuration": "45",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 602: / Line 592: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"AmmoPerSoul": "2",
+		"MaxBulletResist": "30",
-		"SpiritPowerPerSoul": "1",
+		"StackLossFrequency": "1",
-		"MaxStacks": "18",
+		"ArmorLossPerHit": "4",
-		"BonusSprintSpeed": "2m"
+		"BulletArmor": "1",
+		"BonusSprintSpeed": "3m"
 	},
-	"upgrade_aoe_root": {
+	"upgrade_absorbing_armor": {
-		"Name": "Vortex Web",
+		"Name": null,
-		"Description": null,
+		"Description": "Taking heavy hits of {g:citadel_inline_attribute:'SpiritDamage'} from an enemy reduces a \u003Cspan class=\"highlight\"\u003Erandom ability cooldown\u003C/span\u003E.",
 		"Cost": "6400",
 		"Tier": "4",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_containment"
+		"TargetTypes": null,
-		],
+		"ShopFilters": [
-		"TargetTypes": [
+			"WeaponDamage",
-			"AllEnemy"
+			"Durability"
 		],
-		"ShopFilters": null,
 		"IsDisabled": false,
-		"AbilityCooldown": 42,
+		"AbilityCooldown": "1",
-		"AbilityDuration": "4.0",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "10",
 		"WeaponPower": "0",
-		"CaptureRadius": "12m",
+		"TechResist": "20",
-		"TetherDuration": "0.5",
+		"CooldownReductionPerHit": "4",
-		"TetherRadius": "1m",
+		"CooldownReduction": "7",
-		"SlowPercent": "35",
+		"DamageThreshold": "75"
-		"GroundDashReductionPercent": "-40",
-		"TechRangeMultiplier": "10",
-		"TechRadiusMultiplier": "10",
-		"BonusSprintSpeed": "1m"
 	},
-	"upgrade_aoe_silence": {
+	"upgrade_acolytes_glove": {
-		"Name": "EMP Grenade",
+		"Name": null,
-		"Description": "Throw a grenade that \u003Cspan class=\"highlight\"\u003Esilences\u003C/span\u003E enemies and lowers their \u003Cspan class=\"highlight\"\u003Espirit resistance\u003C/span\u003E.",
+		"Description": "When you perform a \u003Cspan class=\"highlight\"\u003ELight or Heavy Melee\u003C/span\u003E attack against a hero, deal extra \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E with the attack and reduce the target's \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E.\u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003ECooldown is 2x longer for Light Melee hits.\u003C/span\u003E",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
-		"Activation": "Press",
+		"Activation": "Passive",
 		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroEnemy"
 		],
 		"ShopFilters": [
 			"MagicDamage",
-			"Disruption"
+			"Melee"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 32,
+		"AbilityCooldown": 8,
-		"AbilityDuration": "0.25",
+		"AbilityDuration": "6",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DebuffDuration": "5",
+		"LightMeleeCooldownMult": "2",
-		"StartRadius": "1m",
+		"SpiritDamage": "40",
-		"Radius": "8m",
+		"TechArmorDamageReduction": "-6"
-		"TechResist": "-20",
-		"BonusHealth": "150",
-		"OutOfCombatHealthRegen": "3"
 	},
-	"upgrade_aoe_smoke_bomb": {
+	"upgrade_active_bullet_shield": {
-		"Name": "Smoke",
+		"Name": null,
-		"Description": "Give you and teammates \u003Cspan class=\"highlight\"\u003Einvisibility\u003C/span\u003E and a \u003Cspan class=\"highlight\"\u003Emove speed\u003C/span\u003E bonus.  Attacking or taking damage will remove the invisibility.\u003Cbr\u003ECast delay: {s:AbilityCastDelay}s.",
+		"Description": "Give temporary \u003Cspan class=\"highlight\"\u003Ebullet shield\u003C/span\u003E for you and nearby allied Heros and their minions.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"HeroFriendly"
+			"HeroFriendly",
+			"MinionFriendly"
 		],
 		"ShopFilters": null,
 		"IsDisabled": true,
 		"AbilityCooldown": 64,
-		"AbilityDuration": "25",
+		"AbilityDuration": "15",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "25m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "1.5",
+		"AbilityCastDelay": "0.25",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"InvisAlertWhenFading": "1",
+		"CombatBarrier": "0",
-		"InvisCancelOnDamage": "1",
-		"InvisFadeToDuration": "0.3",
-		"InvisMoveSpeedMod": "1.5m",
-		"SpottedRadius": "20m",
-		"RevealOnDamageDuration": "0.25",
-		"RevealOnSpottedDuration": "0.25",
 		"Radius": "30m",
-		"FullInvisDistance": "50m"
+		"BulletShieldMaxHealth": "0",
+		"BonusSprintSpeed": "5m"
 	},
-	"upgrade_aoe_tech_shield": {
+	"upgrade_active_reload": {
-		"Name": "Spirit Barrier Pulse",
+		"Name": null,
-		"Description": "Temporarily gain \u003Cspan class=\"highlight\"\u003Espirit barrier\u003C/span\u003E for you and all nearby allied units.",
+		"Description": "While reloading, pressing {g:citadel_binding:'Reload'} during the highlighted portion will \u003Cspan class=\"highlight\"\u003Einstantly finish your reload\u003C/span\u003E and grant you \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003EBullet Lifesteal\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E.",
 		"Cost": "1600",
 		"Tier": "2",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllFriendly"
+		"ShopFilters": [
+			"WeaponDamage"
 		],
-		"ShopFilters": null,
+		"IsDisabled": false,
-		"IsDisabled": true,
+		"AbilityCooldown": "12",
-		"AbilityCooldown": 32,
+		"AbilityDuration": "7",
-		"AbilityDuration": "16",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.25",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TempTechShieldHealth": "400",
+		"BulletLifestealPercent": "18",
-		"Radius": "30m"
+		"BonusFireRate": "25",
+		"BonusClipSizePercent": "20",
+		"BonusMoveSpeed": "1m"
 	},
-	"upgrade_aprounds": {
+	"upgrade_aerial_assault": {
-		"Name": "Armor Piercing Rounds",
+		"Name": null,
-		"Description": "Your Bullets have a chance to become unavoidable, \u003Cspan class=\"highlight\"\u003Epiercing through\u003C/span\u003E enemies and \u003Cspan class=\"highlight\"\u003Eignoring their Bullet Resistance\u003C/span\u003E.",
+		"Description": null,
 		"Cost": "6400",
 		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_high_velocity_mag"
+		"TargetTypes": [
+			"AllEnemy"
 		],
-		"TargetTypes": null,
+		"ShopFilters": null,
-		"ShopFilters": [
+		"IsDisabled": true,
-			"ClipSize",
+		"AbilityCooldown": 26,
-			"WeaponDamage"
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 774: / Line 752: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusBulletSpeedPercent": "35",
+		"ActivateTime": "0.75",
-		"ProcChance": "50"
+		"BulletLifestealPercent": "25",
+		"BonusFireRate": "15",
+		"JumpVelocityHidden": "30.0m",
+		"AssaultLifestealPercent": "20",
+		"AssaultDuration": "3.0",
+		"AssaultFireRate": "60",
+		"ExplodeRadius": "3m"
 	},
-	"upgrade_arcane_eater": {
+	"upgrade_ammo_scavenger": {
-		"Name": "Arcane Eater",
+		"Name": null,
-		"Description": "Your bullets \u003Cspan class=\"highlight\"\u003ESteal Spirit Power\u003C/span\u003E from enemy Heroes.  Steal {s:HeadshotBonusSteal} extra Spirit Power with Headshots.  This effect stacks.",
+		"Description": "Any time you secure or deny a Soul from an entity you \u003Cspan class=\"highlight\"\u003Eget ammo back\u003C/span\u003E and gain stacking \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.\u003Cbr\u003EAt Max Stacks, gain bonus Sprint speed",
-		"Cost": "1600",
+		"Cost": "800",
-		"Tier": "2",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
-			"FireRate"
+			"ClipSize"
 		],
 		"IsDisabled": true,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "45",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 806: / Line 788: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "7",
+		"AmmoPerSoul": "2",
-		"SpiritStolePerHit": "1",
+		"SpiritPowerPerSoul": "1",
-		"HeadshotBonusSteal": "1",
+		"MaxStacks": "18",
-		"ProcCooldown": "0.5",
+		"BonusSprintSpeed": "2m"
-		"MaxStacks": "99",
+	},
-		"StealDuration": "12"
+	"upgrade_aoe_root": {
-	},
+		"Name": null,
-	"upgrade_arcane_extension": {
+		"Description": null,
-		"Name": "Duration Extender",
+		"Cost": "6400",
-		"Description": "Imbue an ability to increase its \u003Cspan class=\"highlight\"\u003EDuration\u003C/span\u003E.",
+		"Tier": "4",
-		"Cost": "1600",
+		"Activation": "Press",
-		"Tier": "2",
-		"Activation": "Passive",
 		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_containment"
+		],
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": null,
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 42,
-		"AbilityDuration": "0",
+		"AbilityDuration": "4.0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusAbilityDurationPercent": "22"
+		"CaptureRadius": "12m",
+		"TetherDuration": "0.5",
+		"TetherRadius": "1m",
+		"SlowPercent": "35",
+		"GroundDashReductionPercent": "-40",
+		"TechRangeMultiplier": "10",
+		"TechRadiusMultiplier": "10",
+		"BonusSprintSpeed": "1m"
 	},
-	"upgrade_arcane_medallion": {
+	"upgrade_aoe_silence": {
-		"Name": "Arcane Medallion",
+		"Name": null,
-		"Description": "Whenever you deal \u003Cspan class=\"highlight\"\u003E{s:MinimumDamage} Spirit damage\u003C/span\u003E or more in a single hit against an enemy hero, gain \u003Cspan class=\"highlight\"\u003Etemporary Spirit Power\u003C/span\u003E.",
+		"Description": "Throw a grenade that \u003Cspan class=\"highlight\"\u003Esilences\u003C/span\u003E enemies and lowers their \u003Cspan class=\"highlight\"\u003Espirit resistance\u003C/span\u003E.",
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Press",
 		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Disruption"
 		],
-		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 32,
-		"AbilityDuration": "12",
+		"AbilityDuration": "0.25",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "35",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"MinimumDamage": "200"
+		"DebuffDuration": "5",
+		"StartRadius": "1m",
+		"Radius": "8m",
+		"TechResist": "-20",
+		"BonusHealth": "150",
+		"OutOfCombatHealthRegen": "3"
 	},
-	"upgrade_arcane_surge": {
+	"upgrade_aoe_smoke_bomb": {
-		"Name": "Arcane Surge",
+		"Name": null,
-		"Description": "When you \u003Cspan class=\"highlight\"\u003EDash-Jump\u003C/span\u003E the \u003Cspan class=\"highlight\"\u003Enext ability you use\u003C/span\u003E will have bonus \u003Cspan class=\"highlight\"\u003ERange, Duration,\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E. Lasts up to 7s.",
+		"Description": "Give you and teammates \u003Cspan class=\"highlight\"\u003Einvisibility\u003C/span\u003E and a \u003Cspan class=\"highlight\"\u003Emove speed\u003C/span\u003E bonus.  Attacking or taking damage will remove the invisibility.\u003Cbr\u003ECast delay: {s:AbilityCastDelay}s.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
 		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_improved_stamina"
+		"TargetTypes": [
+			"HeroFriendly"
 		],
-		"TargetTypes": null,
+		"ShopFilters": null,
-		"ShopFilters": [
+		"IsDisabled": true,
-			"MagicDamage",
+		"AbilityCooldown": 64,
-			"FireRate",
+		"AbilityDuration": "25",
-			"ClipSize",
-			"Movement",
-			"Durability"
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
-		"AbilityDuration": "7",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "1.5",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusAbilityDurationPercent": "15",
+		"InvisAlertWhenFading": "1",
-		"SpiritPower": "15",
+		"InvisCancelOnDamage": "1",
-		"TechRadiusMultiplierBuff": "15",
+		"InvisFadeToDuration": "0.3",
-		"TechRangeMultiplierBuff": "15",
+		"InvisMoveSpeedMod": "1.5m",
-		"BonusClipSize": "0",
+		"SpottedRadius": "20m",
-		"Stamina": "1",
+		"RevealOnDamageDuration": "0.25",
-		"StaminaCooldownReduction": "12"
+		"RevealOnSpottedDuration": "0.25",
+		"Radius": "30m",
+		"FullInvisDistance": "50m"
 	},
-	"upgrade_arctic_blast": {
+	"upgrade_aoe_tech_shield": {
-		"Name": "Arctic Blast",
+		"Name": null,
-		"Description": "Release an expanding ice blast that deals \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003EFreezing\u003C/span\u003E and then \u003Cspan class=\"highlight\"\u003ESlowing\u003C/span\u003E targets it hits. Targets take increased damage while frozen.",
+		"Description": "Temporarily gain \u003Cspan class=\"highlight\"\u003Espirit barrier\u003C/span\u003E for you and all nearby allied units.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "InstantCast",
 		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_cold_front"
-		],
 		"TargetTypes": [
-			"AllEnemy"
+			"AllFriendly"
 		],
-		"ShopFilters": [
+		"ShopFilters": null,
-			"MagicDamage",
+		"IsDisabled": true,
-			"Disruption",
+		"AbilityCooldown": 32,
-			"Durability"
+		"AbilityDuration": "16",
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": 24,
-		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.25",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"SpreadDuration": "0.5",
+		"TempTechShieldHealth": "400",
-		"StartRadius": "2m",
+		"Radius": "30m"
-		"EndRadius": "12m",
-		"SlowPercent": "60",
-		"SlowDuration": "4",
-		"Damage": "175",
-		"DamageHeight": "2.5m",
-		"NPCDamageMult": "1",
-		"TechResist": "10",
-		"FreezeDuration": "0.75",
-		"PercentDamage": "15"
 	},
-	"upgrade_armor_reduction_debuff": {
+	"upgrade_aprounds": {
-		"Name": "Armor Piercing Rounds",
+		"Name": null,
-		"Description": "Your bullets reduce the target's \u003Cspan class=\"highlight\"\u003Ebullet resistance by {s:ResistReduction}%\u003C/span\u003E of their current value for {s:AbilityDuration}s and deal bonus damage \u003Cspan class=\"highlight\"\u003Eagainst bullet shields\u003C/span\u003E.",
+		"Description": "Your Bullets have a chance to become unavoidable, \u003Cspan class=\"highlight\"\u003Epiercing through\u003C/span\u003E enemies and \u003Cspan class=\"highlight\"\u003Eignoring their Bullet Resistance\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "Passive",
 		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_high_velocity_mag"
-			"HeroEnemy",
-			"CreepEnemy",
-			"MinionEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
+			"ClipSize",
 			"WeaponDamage"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "8",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 981: / Line 960: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ResistReduction": "-60",
+		"BonusBulletSpeedPercent": "35",
-		"BaseAttackDamagePercent": "12",
+		"ProcChance": "50"
-		"BulletShieldDamagePercent": "60"
 	},
-	"upgrade_attack_speed_1": {
+	"upgrade_arcane_eater": {
-		"Name": "Fire Rate",
+		"Name": null,
-		"Description": "Increases your \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
+		"Description": "Your bullets \u003Cspan class=\"highlight\"\u003ESteal Spirit Power\u003C/span\u003E from enemy Heroes.  Steal {s:HeadshotBonusSteal} extra Spirit Power with Headshots.  This effect stacks.",
 		"Cost": "1600",
 		"Tier": "2",
@@ Line 997: / Line 975: @@
 		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"FireRate"
+		],
 		"IsDisabled": true,
 		"AbilityCooldown": "0",
@@ Line 1,009: / Line 992: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "15"
+		"BonusFireRate": "7",
+		"SpiritStolePerHit": "1",
+		"HeadshotBonusSteal": "1",
+		"ProcCooldown": "0.5",
+		"MaxStacks": "99",
+		"StealDuration": "12"
 	},
-	"upgrade_attack_speed_2": {
+	"upgrade_arcane_extension": {
-		"Name": "Improved Fire Rate",
+		"Name": null,
-		"Description": "Increases your \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
+		"Description": "Imbue an ability to increase its \u003Cspan class=\"highlight\"\u003EDuration\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,035: / Line 1,023: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "25"
+		"BonusAbilityDurationPercent": "22"
+	},
+	"upgrade_arcane_medallion": {
+		"Name": null,
+		"Description": "Whenever you deal \u003Cspan class=\"highlight\"\u003E{s:MinimumDamage} Spirit damage\u003C/span\u003E or more in a single hit against an enemy hero, gain \u003Cspan class=\"highlight\"\u003Etemporary Spirit Power\u003C/span\u003E.",
+		"Cost": "3200",
+		"Tier": "3",
+		"Activation": "Passive",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityCooldown": "0",
+		"AbilityDuration": "12",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "35",
+		"WeaponPower": "0",
+		"MinimumDamage": "200"
 	},
-	"upgrade_banshee_slugs": {
+	"upgrade_arcane_surge": {
-		"Name": "Crippling Headshot",
+		"Name": null,
-		"Description": null,
+		"Description": "When you \u003Cspan class=\"highlight\"\u003EDash-Jump\u003C/span\u003E the \u003Cspan class=\"highlight\"\u003Enext ability you use\u003C/span\u003E will have bonus \u003Cspan class=\"highlight\"\u003ERange, Duration,\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E. Lasts up to 7s.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": [
-			"upgrade_headshot_booster2"
+			"upgrade_improved_stamina"
 		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"MagicDamage",
-			"Disruption"
+			"FireRate",
+			"ClipSize",
+			"Movement",
+			"Durability"
 		],
 		"IsDisabled": false,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "7",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 1,066: / Line 1,085: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "150",
+		"BonusAbilityDurationPercent": "15",
-		"BulletResistReduction": "-18",
+		"SpiritPower": "15",
-		"MagicResistReduction": "-18",
+		"TechRadiusMultiplierBuff": "15",
-		"HealAmpReceivePenaltyPercent": "-30",
+		"TechRangeMultiplierBuff": "15",
-		"HealAmpRegenPenaltyPercent": "-30",
+		"BonusClipSize": "0",
-		"DebuffDuration": "8",
+		"Stamina": "1",
-		"DiminishingMultiplier": "0.5",
+		"StaminaCooldownReduction": "12"
-		"HeadShotBonusDamage": "0"
 	},
-	"upgrade_base": {
+	"upgrade_arctic_blast": {
 		"Name": null,
-		"Description": null,
+		"Description": "Release an expanding ice blast that deals \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003EFreezing\u003C/span\u003E and then \u003Cspan class=\"highlight\"\u003ESlowing\u003C/span\u003E targets it hits. Targets take increased damage while frozen.",
-		"Cost": "None",
+		"Cost": "6400",
-		"Tier": null,
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": null,
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_cold_front"
-		"ShopFilters": null,
+		],
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Disruption",
+			"Durability"
+		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 24,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 1,099: / Line 1,125: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"SpreadDuration": "0.5",
+		"StartRadius": "2m",
+		"EndRadius": "12m",
+		"SlowPercent": "60",
+		"SlowDuration": "4",
+		"Damage": "175",
+		"DamageHeight": "2.5m",
+		"NPCDamageMult": "1",
+		"TechResist": "10",
+		"FreezeDuration": "0.75",
+		"PercentDamage": "15"
 	},
-	"upgrade_belt_fed_magazine": {
+	"upgrade_armor_reduction_debuff": {
-		"Name": "Belt-Fed Magazine",
+		"Name": null,
-		"Description": "Your weapon gains a \u003Cspan class=\"highlight\"\u003Emuch larger magazine that \u003C/span\u003E\u003Cspan class=\"isNegative\"\u003Erequires spin-up time\u003C/span\u003E, starting with a \u003Cspan class=\"highlight\"\u003Eslower initial fire rate and becoming faster over the spin-up time\u003C/span\u003E.",
+		"Description": "Your bullets reduce the target's \u003Cspan class=\"highlight\"\u003Ebullet resistance by {s:ResistReduction}%\u003C/span\u003E of their current value for {s:AbilityDuration}s and deal bonus damage \u003Cspan class=\"highlight\"\u003Eagainst bullet shields\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy",
+			"CreepEnemy",
+			"MinionEnemy"
+		],
 		"ShopFilters": [
-			"FireRate",
+			"WeaponDamage"
-			"ClipSize"
 		],
 		"IsDisabled": true,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "8",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 1,127: / Line 1,167: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSizePercent": "125",
+		"ResistReduction": "-60",
-		"SpinUpTime": "3.5",
+		"BaseAttackDamagePercent": "12",
-		"SpinUpDecay": "1.0",
+		"BulletShieldDamagePercent": "60"
-		"InitialFireRateDecrease": "40",
-		"MaxFireRateIncrease": "60",
-		"BonusReloadTime": "0.0"
 	},
-	"upgrade_berserker": {
+	"upgrade_attack_speed_1": {
-		"Name": "Berserker",
+		"Name": null,
-		"Description": "Your \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E increases as you take sustained damage.",
+		"Description": "Increases your \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage",
+		"IsDisabled": true,
-			"ClipSize",
-			"Durability"
-		],
-		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,162: / Line 1,195: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DamageDuration": "10",
+		"BonusFireRate": "15"
-		"DamageToStack": "120",
-		"WeaponPowerPerStack": "7",
-		"MaxStacks": 10,
-		"BulletResist": "8"
 	},
-	"upgrade_blitz_bullets": {
+	"upgrade_attack_speed_2": {
-		"Name": "Swift Striker",
+		"Name": null,
-		"Description": null,
+		"Description": "Increases your \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_rapid_rounds"
-		],
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"FireRate"
+		"IsDisabled": true,
-		],
-		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,196: / Line 1,221: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "20",
+		"BonusFireRate": "25"
-		"BonusSprintSpeed": "1.0m"
 	},
-	"upgrade_blood_tribute": {
+	"upgrade_banshee_slugs": {
-		"Name": "Blood Tribute",
+		"Name": null,
-		"Description": "Toggle: Continually sacrifice Health to improve {g:citadel_inline_attribute:'FireRate'}, \u003Cspan class=\"highlight\"\u003EDebuff Resistance\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E. Healing received is reduced during the sacrifice.",
+		"Description": null,
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "Toggle",
+		"Activation": "Passive",
 		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
+			"upgrade_headshot_booster2"
+		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage"
+			"WeaponDamage",
+			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 0,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.0",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechResist": "8",
+		"BonusHealth": "150",
-		"HealthDrainedPerSecond": "40",
+		"BulletResistReduction": "-18",
-		"TickRate": "0.1",
+		"MagicResistReduction": "-18",
-		"BonusFireRate": "40",
+		"HealAmpReceivePenaltyPercent": "-30",
-		"StatusResistancePercent": "50",
+		"HealAmpRegenPenaltyPercent": "-30",
-		"HealAmpReceivePenaltyPercent": "-40",
+		"DebuffDuration": "8",
-		"HealAmpRegenPenaltyPercent": "-40",
+		"DiminishingMultiplier": "0.5",
-		"BonusMoveSpeed": "2m",
+		"HeadShotBonusDamage": "0"
-		"OutOfCombatHealthRegen": "4"
 	},
-	"upgrade_bonus_ability_charge_3": {
+	"upgrade_base": {
-		"Name": "Hyper Charge",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003E+{s:BonusAbilityCharges}\u003C/span\u003E to your max ability \u003Cspan class=\"highlight\"\u003Echarges\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "3200",
+		"Cost": "None",
-		"Tier": "3",
+		"Tier": null,
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": null,
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,259: / Line 1,285: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"BonusAbilityCharges": "3"
 	},
-	"upgrade_boundless_spirit": {
+	"upgrade_belt_fed_magazine": {
-		"Name": "Boundless Spirit",
+		"Name": null,
-		"Description": null,
+		"Description": "Your weapon gains a \u003Cspan class=\"highlight\"\u003Emuch larger magazine that \u003C/span\u003E\u003Cspan class=\"isNegative\"\u003Erequires spin-up time\u003C/span\u003E, starting with a \u003Cspan class=\"highlight\"\u003Eslower initial fire rate and becoming faster over the spin-up time\u003C/span\u003E.",
 		"Cost": "6400",
 		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_soaring_spirit"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"FireRate",
-			"Movement",
+			"ClipSize"
-			"Healing"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,291: / Line 1,313: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "35",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "100",
+		"BonusClipSizePercent": "125",
-		"OutOfCombatHealthRegen": "4",
+		"SpinUpTime": "3.5",
-		"TechPowerPercent": "15"
+		"SpinUpDecay": "1.0",
+		"InitialFireRateDecrease": "40",
+		"MaxFireRateIncrease": "60",
+		"BonusReloadTime": "0.0"
 	},
-	"upgrade_boxing_glove": {
+	"upgrade_berserker": {
-		"Name": "Lifestrike",
+		"Name": null,
-		"Description": "Your \u003Cspan class=\"highlight\"\u003EMelee Attack\u003C/span\u003E applies \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eheals you\u003C/span\u003E for 50% of the \u003Cspan class=\"highlight\"\u003EMelee Damage\u003C/span\u003E dealt plus 160. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003EThis heal is 40% effective vs non-heroes. \u003Cbr\u003ECooldown is 2x as long for Light Melee hits.\u003C/span\u003E",
+		"Description": "Your \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E increases as you take sustained damage.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_lifestrike_gauntlets"
+		"TargetTypes": null,
-		],
-		"TargetTypes": [
-			"AllEnemy"
-		],
 		"ShopFilters": [
-			"Durability",
+			"WeaponDamage",
-			"Melee",
+			"ClipSize",
-			"Healing"
+			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 4,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 1,327: / Line 1,348: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"LightMeleeCooldownMult": "2",
+		"DamageDuration": "10",
-		"SlowPercent": "60",
+		"DamageToStack": "120",
-		"SlowDuration": "2.5",
+		"WeaponPowerPerStack": "7",
-		"BonusMeleeDamagePercent": "16",
+		"MaxStacks": 10,
-		"LifestealHeal": "160",
+		"BulletResist": "8"
-		"LifestealHealPercent": "50",
-		"BonusHealth": "125",
-		"NonHeroHealPct": "40"
 	},
-	"upgrade_bullet_armor": {
+	"upgrade_blitz_bullets": {
-		"Name": "Bullet Armor",
+		"Name": null,
-		"Description": "Decreases \u003Cspan class=\"highlight\"\u003Edamage taken\u003C/span\u003E from bullets.",
+		"Description": null,
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
+			"upgrade_rapid_rounds"
+		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"FireRate"
-			"Durability"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,363: / Line 1,382: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletResist": "18"
+		"BonusFireRate": "20",
+		"BonusSprintSpeed": "1.0m"
 	},
-	"upgrade_bullet_armor_2": {
+	"upgrade_blood_tribute": {
-		"Name": "Bullet Resilience Disabled",
+		"Name": null,
-		"Description": "Decreases \u003Cspan class=\"highlight\"\u003Edamage taken\u003C/span\u003E from bullets.",
+		"Description": "Toggle: Continually sacrifice Health to improve {g:citadel_inline_attribute:'FireRate'}, \u003Cspan class=\"highlight\"\u003EDebuff Resistance\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E. Healing received is reduced during the sacrifice.",
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Toggle",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage"
-		"AbilityCooldown": "0",
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 0,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletArmor": "2"
+		"TechResist": "8",
+		"HealthDrainedPerSecond": "40",
+		"TickRate": "0.1",
+		"BonusFireRate": "40",
+		"StatusResistancePercent": "50",
+		"HealAmpReceivePenaltyPercent": "-40",
+		"HealAmpRegenPenaltyPercent": "-40",
+		"BonusMoveSpeed": "2m",
+		"OutOfCombatHealthRegen": "4"
 	},
-	"upgrade_bullet_armor_reduction_aura": {
+	"upgrade_bonus_ability_charge_3": {
-		"Name": "Hunter's Aura",
+		"Name": null,
-		"Description": "Reduces nearby enemies' \u003Cspan class=\"highlight\"\u003EBullet Resist and Fire Rate\u003C/span\u003E. If there is only one enemy hero nearby, this \u003Cspan class=\"highlight\"\u003Eeffect is tripled\u003C/span\u003E.",
+		"Description": "\u003Cspan class=\"highlight\"\u003E+{s:BonusAbilityCharges}\u003C/span\u003E to your max ability \u003Cspan class=\"highlight\"\u003Echarges\u003C/span\u003E.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy",
+		"ShopFilters": null,
-			"CreepEnemy",
+		"IsDisabled": true,
-			"MinionEnemy"
-		],
-		"ShopFilters": [
-			"WeaponDamage",
-			"Disruption",
-			"ClipSize"
-		],
-		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,423: / Line 1,445: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "125",
+		"BonusAbilityCharges": "3"
-		"Radius": "15m",
-		"BulletArmorReduction": "-8",
-		"FireRateSlow": "12",
-		"SingleTargetPlayerMultiplier": "3",
-		"BonusSprintSpeed": "1m"
 	},
-	"upgrade_bullet_damage_reduction_aura": {
+	"upgrade_boundless_spirit": {
-		"Name": "Weapon Jammer",
+		"Name": null,
-		"Description": "Reduces the \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E of all nearby enemies.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_soaring_spirit"
-			"HeroEnemy",
+		],
-			"CreepEnemy",
+		"TargetTypes": null,
-			"MinionEnemy"
+		"ShopFilters": [
+			"MagicDamage",
+			"Movement",
+			"Healing"
 		],
-		"ShopFilters": null,
+		"IsDisabled": false,
-		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,458: / Line 1,477: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "35",
 		"WeaponPower": "0",
-		"Radius": "12m",
+		"BonusHealth": "100",
-		"FireRateSlow": "30"
+		"OutOfCombatHealthRegen": "4",
+		"TechPowerPercent": "15"
 	},
-	"upgrade_bullet_resist_shredder": {
+	"upgrade_boxing_glove": {
-		"Name": "Bullet Resist Shredder",
+		"Name": null,
-		"Description": "Reduces \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E on enemies when you deal \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E.",
+		"Description": "Your \u003Cspan class=\"highlight\"\u003EMelee Attack\u003C/span\u003E applies \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eheals you\u003C/span\u003E for 50% of the \u003Cspan class=\"highlight\"\u003EMelee Damage\u003C/span\u003E dealt plus 160. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003EThis heal is 40% effective vs non-heroes. \u003Cbr\u003ECooldown is 2x as long for Light Melee hits.\u003C/span\u003E",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": null,
+		"Components": [
+			"upgrade_lifestrike_gauntlets"
+		],
 		"TargetTypes": [
-			"HeroEnemy",
+			"AllEnemy"
-			"CreepEnemy",
-			"MinionEnemy"
 		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"Durability",
-			"Durability"
+			"Melee",
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 4,
-		"AbilityDuration": "8",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 1,492: / Line 1,513: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletArmorReduction": "-13",
+		"LightMeleeCooldownMult": "2",
-		"BonusHealth": "90",
+		"SlowPercent": "60",
-		"MeleeResistPercent": "20"
+		"SlowDuration": "2.5",
+		"BonusMeleeDamagePercent": "16",
+		"LifestealHeal": "160",
+		"LifestealHealPercent": "50",
+		"BonusHealth": "125",
+		"NonHeroHealPct": "40"
 	},
-	"upgrade_burst_fire": {
+	"upgrade_bullet_armor": {
-		"Name": "Burst Fire",
+		"Name": null,
-		"Description": "Briefly gain \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E when one of your bullets hits an enemy hero.",
+		"Description": "Decreases \u003Cspan class=\"highlight\"\u003Edamage taken\u003C/span\u003E from bullets.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_rapid_rounds"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"FireRate"
+			"WeaponDamage",
+			"Durability"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": 7,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "3.5",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 1,524: / Line 1,549: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "10",
+		"BulletResist": "18"
-		"ActivatedFireRate": "35",
-		"SlideScale": "50",
-		"BonusMoveSpeed": "1.5m"
 	},
-	"upgrade_burst_fire_actuator": {
+	"upgrade_bullet_armor_2": {
-		"Name": "Burst Fire Actuator",
+		"Name": null,
-		"Description": "Your weapon \u003Cspan class=\"highlight\"\u003E fires an additional percentage of your gun's starting clip as a burst\u003C/span\u003E.  If all bullets in a burst connect with an enemy Hero, \u003Cspan class=\"highlight\"\u003Egain temporary Base Bullet Damage\u003C/span\u003E for the rest of the clip.",
+		"Description": "Decreases \u003Cspan class=\"highlight\"\u003Edamage taken\u003C/span\u003E from bullets.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": null,
 		"IsDisabled": true,
@@ Line 1,555: / Line 1,575: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"CycleTimeFireRateDecrease": "0",
+		"BulletArmor": "2"
-		"BurstFireShotPercent": "100",
-		"NormalizedClipEmptySpeedIncrease": "25",
-		"BurstFireShotsFromClipPercent": "15",
-		"PerfectBurstWeaponPower": "20",
-		"BonusHeadshotDamage": "0",
-		"BaseBonusWeaponPower": "5",
-		"IntraBurstFireRateIncrease": "0",
-		"NonBurstFireConversionFactor": "3"
 	},
-	"upgrade_camouflage": {
+	"upgrade_bullet_armor_reduction_aura": {
-		"Name": "Camouflage Suit",
+		"Name": null,
-		"Description": "Go \u003Cspan class=\"highlight\"\u003Einvisible\u003C/span\u003E and maintain invisibility by \u003Cspan class=\"highlight\"\u003Enot moving or attacking\u003C/span\u003E.  Taking damage will not reveal the Hero.  Bonus Regen while Invisible.",
+		"Description": "Reduces nearby enemies' \u003Cspan class=\"highlight\"\u003EBullet Resist and Fire Rate\u003C/span\u003E. If there is only one enemy hero nearby, this \u003Cspan class=\"highlight\"\u003Eeffect is tripled\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"HeroEnemy",
-		"IsDisabled": true,
+			"CreepEnemy",
-		"AbilityCooldown": 10.5,
+			"MinionEnemy"
+		],
+		"ShopFilters": [
+			"WeaponDamage",
+			"Disruption",
+			"ClipSize"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 1,589: / Line 1,609: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"InvisAlertWhenFading": "1",
+		"BonusHealth": "125",
-		"InvisCancelOnDamage": "0",
+		"Radius": "15m",
-		"InvisFadeToDuration": "1.0",
+		"BulletArmorReduction": "-8",
-		"InvisMoveSpeedMod": "0",
+		"FireRateSlow": "12",
-		"SpottedRadius": "20m",
+		"SingleTargetPlayerMultiplier": "3",
-		"RevealOnDamageDuration": "0",
+		"BonusSprintSpeed": "1m"
-		"RevealOnSpottedDuration": "0.25",
-		"MovementThresholdSq": "200",
-		"RegenWhileInvisible": "5"
 	},
-	"upgrade_capacitor": {
+	"upgrade_bullet_damage_reduction_aura": {
-		"Name": "Capacitor",
+		"Name": null,
-		"Description": "Launch a projectile that deals \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'SpiritIcon'}damage\u003C/span\u003E, removes all their non-ultimate buffs and applies a strong slow that recovers over time.",
+		"Description": "Reduces the \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E of all nearby enemies.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_chain_lightning"
-		],
 		"TargetTypes": [
 			"HeroEnemy",
-			"TrooperEnemy",
+			"CreepEnemy",
-			"BossEnemy",
 			"MinionEnemy"
 		],
-		"ShopFilters": [
+		"ShopFilters": null,
-			"MagicDamage",
+		"IsDisabled": true,
-			"FireRate"
+		"AbilityCooldown": "0",
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": "40",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ProcCooldown": "0.25",
+		"Radius": "12m",
-		"DamagePerChain": "50",
+		"FireRateSlow": "30"
-		"BonusPerChain": "40",
-		"ChainRadius": "10m",
-		"ProcChance": "20",
-		"ChainCount": "6",
-		"ChainTickRate": "0.4",
-		"Damage": "100",
-		"MaxSlowPercent": "100",
-		"SlowDuration": "5"
 	},
-	"upgrade_cardio_calibrator": {
+	"upgrade_bullet_resist_shredder": {
-		"Name": "Enduring Speed",
+		"Name": null,
-		"Description": "Reduces the effect of enemy \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E penalties.",
+		"Description": "Reduces \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E on enemies when you deal \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E.",
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_sprint_booster"
+		"TargetTypes": [
+			"HeroEnemy",
+			"CreepEnemy",
+			"MinionEnemy"
 		],
-		"TargetTypes": null,
 		"ShopFilters": [
-			"Movement",
+			"WeaponDamage",
 			"Durability"
 		],
 		"IsDisabled": false,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "8",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 1,673: / Line 1,678: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusMoveSpeed": "2m",
+		"BulletArmorReduction": "-13",
-		"SlowResistancePercent": "30",
+		"BonusHealth": "90",
-		"OutOfCombatHealthRegen": "2"
+		"MeleeResistPercent": "20"
 	},
-	"upgrade_chain_lightning": {
+	"upgrade_burst_fire": {
-		"Name": "Tesla Bullets",
+		"Name": null,
-		"Description": "Your bullets have a chance to \u003Cspan class=\"highlight\"\u003Eshock\u003C/span\u003E your target.  The \u003Cspan class=\"highlight\"\u003Eshock\u003C/span\u003E will jump to a nearby enemy.",
+		"Description": "Briefly gain \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E when one of your bullets hits an enemy hero.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_rapid_rounds"
-			"AllEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
 			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 7,
-		"AbilityDuration": "0",
+		"AbilityDuration": "3.5",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 1,706: / Line 1,710: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ProcCooldown": "0.25",
+		"BonusFireRate": "10",
-		"DamagePerChain": "40",
+		"ActivatedFireRate": "35",
-		"BonusPerChain": "45",
+		"SlideScale": "50",
-		"ChainRadius": "8m",
+		"BonusMoveSpeed": "1.5m"
-		"ProcChance": "15",
-		"ChainCount": "4",
-		"ChainTickRate": "0.4"
 	},
-	"upgrade_charge_mastery": {
+	"upgrade_burst_fire_actuator": {
-		"Name": "Charge Mastery",
+		"Name": null,
-		"Description": null,
+		"Description": "Your weapon \u003Cspan class=\"highlight\"\u003E fires an additional percentage of your gun's starting clip as a burst\u003C/span\u003E.  If all bullets in a burst connect with an enemy Hero, \u003Cspan class=\"highlight\"\u003Egain temporary Base Bullet Damage\u003C/span\u003E for the rest of the clip.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": null,
 		"IsDisabled": true,
@@ Line 1,738: / Line 1,741: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusAbilityCharges": "4",
+		"CycleTimeFireRateDecrease": "0",
-		"CooldownBetweenChargeReduction": "50",
+		"BurstFireShotPercent": "100",
-		"BonusChargedAbilityDamage": "15",
+		"NormalizedClipEmptySpeedIncrease": "25",
-		"BonusChargedCooldownReduction": "15"
+		"BurstFireShotsFromClipPercent": "15",
+		"PerfectBurstWeaponPower": "20",
+		"BonusHeadshotDamage": "0",
+		"BaseBonusWeaponPower": "5",
+		"IntraBurstFireRateIncrease": "0",
+		"NonBurstFireConversionFactor": "3"
 	},
-	"upgrade_charmed_wraps": {
+	"upgrade_camouflage": {
-		"Name": "Charmed Wraps",
+		"Name": null,
-		"Description": "Your abilities get their \u003Cspan class=\"highlight\"\u003Ecooldowns reduced\u003C/span\u003E when you perform a \u003Cspan class=\"highlight\"\u003Eheavy melee\u003C/span\u003E attack against a hero (or \u003Cspan class=\"highlight\"\u003Etwo light melee\u003C/span\u003E attacks within {s:LightMeleeTimeWindow}s).",
+		"Description": "Go \u003Cspan class=\"highlight\"\u003Einvisible\u003C/span\u003E and maintain invisibility by \u003Cspan class=\"highlight\"\u003Enot moving or attacking\u003C/span\u003E.  Taking damage will not reveal the Hero.  Bonus Regen while Invisible.",
 		"Cost": "1600",
 		"Tier": "2",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": 26,
+		"AbilityCooldown": 10.5,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 1,769: / Line 1,775: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"CooldownReductionFlat": "8.0",
+		"InvisAlertWhenFading": "1",
-		"LightMeleeTimeWindow": "4.0"
+		"InvisCancelOnDamage": "0",
+		"InvisFadeToDuration": "1.0",
+		"InvisMoveSpeedMod": "0",
+		"SpottedRadius": "20m",
+		"RevealOnDamageDuration": "0",
+		"RevealOnSpottedDuration": "0.25",
+		"MovementThresholdSq": "200",
+		"RegenWhileInvisible": "5"
 	},
-	"upgrade_cheat_death": {
+	"upgrade_capacitor": {
-		"Name": "Cheat Death",
+		"Name": "Capacitor",
-		"Description": null,
+		"Description": "Launch a projectile that deals \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'SpiritIcon'}damage\u003C/span\u003E, removes all their non-ultimate buffs and applies a strong slow that recovers over time.",
 		"Cost": "6400",
 		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
+			"upgrade_chain_lightning"
+		],
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroEnemy",
+			"TrooperEnemy",
+			"BossEnemy",
+			"MinionEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"FireRate"
 		],
-		"ShopFilters": null,
 		"IsDisabled": false,
-		"AbilityCooldown": 100,
+		"AbilityCooldown": "40",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DeathImmunityDuration": "4.5",
+		"ProcCooldown": "0.25",
-		"BonusHealth": "200",
+		"DamagePerChain": "50",
-		"BulletResist": "15",
+		"BonusPerChain": "40",
-		"DeathImmunityDamageReduction": "-70",
+		"ChainRadius": "10m",
-		"HealAmpReceivePenaltyPercent": "-70",
+		"ProcChance": "20",
-		"HealAmpRegenPenaltyPercent": "-70",
+		"ChainCount": "6",
-		"BonusMoveSpeed": "-2m"
+		"ChainTickRate": "0.4",
+		"Damage": "100",
+		"MaxSlowPercent": "100",
+		"SlowDuration": "5"
 	},
-	"upgrade_chonky": {
+	"upgrade_cardio_calibrator": {
-		"Name": "Fortitude",
+		"Name": null,
-		"Description": "After not taking damage for \u003Cspan class=\"highlight\"\u003E14s\u003C/span\u003E, gain \u003Cspan class=\"highlight\"\u003E2% Max Health Regen\u003C/span\u003E.",
+		"Description": "Reduces the effect of enemy \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E penalties.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": [
-			"upgrade_health"
+			"upgrade_sprint_booster"
 		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"Movement",
-			"Durability",
+			"Durability"
-			"Healing",
-			"Movement"
 		],
 		"IsDisabled": false,
@@ Line 1,837: / Line 1,859: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"RestoreDelay": "14",
+		"BonusMoveSpeed": "2m",
-		"HealLifePercentOutOfCombat": "2",
+		"SlowResistancePercent": "30",
-		"HealthThreshold": "75",
+		"OutOfCombatHealthRegen": "2"
-		"BonusMoveSpeed": "1.5m",
-		"BonusHealth": "375"
 	},
-	"upgrade_clip_size": {
+	"upgrade_chain_lightning": {
-		"Name": "Extended Magazine",
+		"Name": null,
-		"Description": "Increases \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
+		"Description": "Your bullets have a chance to \u003Cspan class=\"highlight\"\u003Eshock\u003C/span\u003E your target.  The \u003Cspan class=\"highlight\"\u003Eshock\u003C/span\u003E will jump to a nearby enemy.",
-		"Cost": "800",
+		"Cost": "3200",
-		"Tier": "1",
+		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"MagicDamage",
-			"ClipSize"
+			"FireRate"
 		],
 		"IsDisabled": false,
@@ Line 1,870: / Line 1,892: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSizePercent": "30",
+		"ProcCooldown": "0.25",
-		"BaseAttackDamagePercent": "6"
+		"DamagePerChain": "40",
+		"BonusPerChain": "45",
+		"ChainRadius": "8m",
+		"ProcChance": "15",
+		"ChainCount": "4",
+		"ChainTickRate": "0.4"
 	},
-	"upgrade_clip_size_2": {
+	"upgrade_charge_mastery": {
-		"Name": "Big Clip",
+		"Name": null,
-		"Description": "Big Increase \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": null,
@@ Line 1,897: / Line 1,924: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSizePercent": "30"
+		"BonusAbilityCharges": "4",
+		"CooldownBetweenChargeReduction": "50",
+		"BonusChargedAbilityDamage": "15",
+		"BonusChargedCooldownReduction": "15"
 	},
-	"upgrade_clip_size_3": {
+	"upgrade_charmed_wraps": {
-		"Name": "Extra Large Magazine",
+		"Name": null,
-		"Description": "Greatly Increases \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
+		"Description": "Your abilities get their \u003Cspan class=\"highlight\"\u003Ecooldowns reduced\u003C/span\u003E when you perform a \u003Cspan class=\"highlight\"\u003Eheavy melee\u003C/span\u003E attack against a hero (or \u003Cspan class=\"highlight\"\u003Etwo light melee\u003C/span\u003E attacks within {s:LightMeleeTimeWindow}s).",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 26,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 1,923: / Line 1,955: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSizePercent": "60"
+		"CooldownReductionFlat": "8.0",
+		"LightMeleeTimeWindow": "4.0"
 	},
-	"upgrade_clip_size_fixed": {
+	"upgrade_cheat_death": {
-		"Name": "Extended Magazine",
+		"Name": null,
-		"Description": "Increases \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 100,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 1,949: / Line 1,984: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSize": "6"
+		"DeathImmunityDuration": "4.5",
+		"BonusHealth": "200",
+		"BulletResist": "15",
+		"DeathImmunityDamageReduction": "-70",
+		"HealAmpReceivePenaltyPercent": "-70",
+		"HealAmpRegenPenaltyPercent": "-70",
+		"BonusMoveSpeed": "-2m"
 	},
-	"upgrade_clip_size_fixed_t3": {
+	"upgrade_chonky": {
-		"Name": "Extra Large Magazine",
+		"Name": null,
-		"Description": "Greatly Increases \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
+		"Description": "After not taking damage for \u003Cspan class=\"highlight\"\u003E14s\u003C/span\u003E, gain \u003Cspan class=\"highlight\"\u003E2% Max Health Regen\u003C/span\u003E.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
-		"Components": null,
+		"Components": [
+			"upgrade_health"
+		],
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage",
+			"Durability",
+			"Healing",
+			"Movement"
+		],
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 1,975: / Line 2,023: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSize": "12"
+		"RestoreDelay": "14",
+		"HealLifePercentOutOfCombat": "2",
+		"HealthThreshold": "75",
+		"BonusMoveSpeed": "1.5m",
+		"BonusHealth": "375"
 	},
-	"upgrade_cloaking_device": {
+	"upgrade_clip_size": {
-		"Name": "Cloaking Device",
+		"Name": null,
-		"Description": "Become \u003Cspan class=\"highlight\"\u003Einvisible\u003C/span\u003E. Nearby enemies will temporaily reveal the hero.  Attacking or taking damage will remove the invisibility for {s:AbilityCooldown}s.",
+		"Description": "Increases \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage",
-		"AbilityCooldown": 10.5,
+			"ClipSize"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,001: / Line 2,056: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"InvisAlertWhenFading": "1",
+		"BonusClipSizePercent": "30",
-		"InvisCancelOnDamage": "1",
+		"BaseAttackDamagePercent": "6"
-		"InvisFadeToDuration": "1.5",
-		"InvisMoveSpeedMod": "3m",
-		"SpottedRadius": "20m",
-		"RevealOnDamageDuration": "1.5",
-		"RevealOnSpottedDuration": "1.5",
-		"FullInvisDistance": "50m"
 	},
-	"upgrade_cloaking_device_active": {
+	"upgrade_clip_size_2": {
-		"Name": "Shadow Weave",
+		"Name": null,
-		"Description": "Become \u003Cspan class=\"highlight\"\u003EStealthed\u003C/span\u003E. Whenever you take damage while Stealthed you get briefly revealed.",
+		"Description": "Big Increase \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"MagicDamage",
+		"IsDisabled": true,
-			"FireRate",
+		"AbilityCooldown": "0",
-			"Movement"
+		"AbilityDuration": "0",
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": 32,
-		"AbilityDuration": "18",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 2,038: / Line 2,083: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"InvisAlertWhenFading": "1",
+		"BonusClipSizePercent": "30"
-		"InvisCancelOnDamage": "1",
-		"InvisFadeToDuration": "0.6",
-		"InvisMoveSpeedMod": "2m",
-		"SpottedRadius": "26m",
-		"RevealOnDamageDuration": "1.5",
-		"RevealOnSpottedDuration": "1.5",
-		"FullInvisDistance": "50m",
-		"AmbushDuration": "8",
-		"AmbushBonusFireRate": "35",
-		"AmbushBonusTechPower": "35",
-		"AmbushBonusMeleeDamage": "25",
-		"OutOfCombatHealthRegen": "10",
-		"BonusSprintSpeed": "2m"
 	},
-	"upgrade_close_quarter_combat": {
+	"upgrade_clip_size_3": {
-		"Name": "Point Blank",
+		"Name": null,
-		"Description": "When in \u003Cspan class=\"highlight\"\u003Eclose range\u003C/span\u003E to your target, gain \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E and your bullets apply a \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E.",
+		"Description": "Greatly Increases \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_close_range"
+		"TargetTypes": null,
-		],
+		"ShopFilters": null,
-		"TargetTypes": [
+		"IsDisabled": true,
-			"HeroEnemy"
-		],
-		"ShopFilters": [
-			"WeaponDamage",
-			"Durability",
-			"Disruption"
-		],
-		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 2,085: / Line 2,109: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"CloseRangeBonusWeaponPower": "50",
+		"BonusClipSizePercent": "60"
-		"SlowPercent": "25",
+	},
-		"SlowDuration": "2",
+	"upgrade_clip_size_fixed": {
-		"CloseRangeBonusDamageRange": "15m",
+		"Name": null,
-		"MeleeResistPercent": "30",
+		"Description": "Increases \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
-		"BonusHealth": "100"
+		"Cost": "1600",
-	},
+		"Tier": "2",
-	"upgrade_close_range": {
-		"Name": "Close Quarters",
-		"Description": "Deal additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E when in \u003Cspan class=\"highlight\"\u003Eclose range\u003C/span\u003E to your target.",
-		"Cost": "800",
-		"Tier": "1",
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage",
+		"IsDisabled": true,
-			"Durability"
-		],
-		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 2,119: / Line 2,135: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"CloseRangeBonusWeaponPower": "20",
+		"BonusClipSize": "6"
-		"CloseRangeBonusDamageRange": "15m",
-		"MeleeResistPercent": "20"
 	},
-	"upgrade_cold_front": {
+	"upgrade_clip_size_fixed_t3": {
-		"Name": "Cold Front",
+		"Name": null,
-		"Description": "Release an expanding ice blast that deals \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESlows\u003C/span\u003E targets it hits.",
+		"Description": "Greatly Increases \u003Cspan class=\"highlight\"\u003Eammo\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllEnemy"
+		"ShopFilters": null,
-		],
+		"IsDisabled": true,
-		"ShopFilters": [
+		"AbilityCooldown": "0",
-			"MagicDamage",
+		"AbilityDuration": "0",
-			"Disruption",
-			"Durability"
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": 24,
-		"AbilityDuration": "4",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 2,153: / Line 2,161: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"SpreadDuration": "0.5",
+		"BonusClipSize": "12"
-		"StartRadius": "2m",
-		"EndRadius": "12m",
-		"MovementSpeedSlow": "60",
-		"Damage": "125",
-		"DamageHeight": "2.5m",
-		"NPCDamageMult": "1",
-		"TechResist": "6"
 	},
-	"upgrade_colossus": {
+	"upgrade_cloaking_device": {
-		"Name": "Colossus",
+		"Name": null,
-		"Description": "Gain \u003Cspan class=\"highlight\"\u003EBullet and Spirit Resist\u003C/span\u003E, and \u003Cspan class=\"highlight\"\u003Eslow the move and dash speed\u003C/span\u003E of enemies nearby. Your model size grows by 20%.",
+		"Description": "Become \u003Cspan class=\"highlight\"\u003Einvisible\u003C/span\u003E. Nearby enemies will temporaily reveal the hero.  Attacking or taking damage will remove the invisibility for {s:AbilityCooldown}s.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
 		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_health"
-		],
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"Durability"
+		"IsDisabled": true,
-		],
+		"AbilityCooldown": 10.5,
-		"IsDisabled": false,
+		"AbilityDuration": "0",
-		"AbilityCooldown": 37,
-		"AbilityDuration": "7",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 2,190: / Line 2,187: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "600",
+		"InvisAlertWhenFading": "1",
-		"BaseAttackDamagePercent": "15",
+		"InvisCancelOnDamage": "1",
-		"BuffBulletResist": "30",
+		"InvisFadeToDuration": "1.5",
-		"BuffTechResist": "30",
+		"InvisMoveSpeedMod": "3m",
-		"SlowPercent": "30",
+		"SpottedRadius": "20m",
-		"GroundDashReductionPercent": "-25",
+		"RevealOnDamageDuration": "1.5",
-		"Radius": "12m",
+		"RevealOnSpottedDuration": "1.5",
-		"ModelScaleGrowth": "1.2"
+		"FullInvisDistance": "50m"
 	},
-	"upgrade_combo_breaker": {
+	"upgrade_cloaking_device_active": {
-		"Name": "Combo Breaker",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003ERemove all debuffs\u003C/span\u003E and heal yourself. \u003Cbr\u003E\u003Cspan class=\"highlight\"\u003ECan be used while stunned.\u003C/span\u003E",
+		"Description": "Become \u003Cspan class=\"highlight\"\u003EStealthed\u003C/span\u003E. Whenever you take damage while Stealthed you get briefly revealed.",
 		"Cost": "6400",
 		"Tier": "4",
 		"Activation": "InstantCast",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllFriendly"
+		"ShopFilters": [
+			"MagicDamage",
+			"FireRate",
+			"Movement"
 		],
-		"ShopFilters": null,
+		"IsDisabled": false,
-		"IsDisabled": true,
+		"AbilityCooldown": 32,
-		"AbilityCooldown": 23,
+		"AbilityDuration": "18",
-		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 2,225: / Line 2,224: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechArmor": "2",
+		"InvisAlertWhenFading": "1",
-		"BonusHealthRegen": "2.75",
+		"InvisCancelOnDamage": "1",
-		"HealPercentAmount": "30",
+		"InvisFadeToDuration": "0.6",
-		"RegenDuration": "10"
+		"InvisMoveSpeedMod": "2m",
+		"SpottedRadius": "26m",
+		"RevealOnDamageDuration": "1.5",
+		"RevealOnSpottedDuration": "1.5",
+		"FullInvisDistance": "50m",
+		"AmbushDuration": "8",
+		"AmbushBonusFireRate": "35",
+		"AmbushBonusTechPower": "35",
+		"AmbushBonusMeleeDamage": "25",
+		"OutOfCombatHealthRegen": "10",
+		"BonusSprintSpeed": "2m"
 	},
-	"upgrade_containment": {
+	"upgrade_close_quarter_combat": {
-		"Name": "Slowing Hex",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003ESlows movement\u003C/span\u003E of enemy target. Also \u003Cspan class=\"highlight\"\u003ESilences\u003C/span\u003E their \u003Cspan class=\"highlight\"\u003Emovement-based items and abilities\u003C/span\u003E.\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EDoes not affect target's stamina usage.\u003C/span\u003E",
+		"Description": "When in \u003Cspan class=\"highlight\"\u003Eclose range\u003C/span\u003E to your target, gain \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E and your bullets apply a \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
+			"upgrade_close_range"
+		],
 		"TargetTypes": [
 			"HeroEnemy"
 		],
 		"ShopFilters": [
-			"Movement",
+			"WeaponDamage",
-			"Disruption",
+			"Durability",
-			"MagicDamage"
+			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "30",
+		"AbilityCooldown": "0",
-		"AbilityDuration": "3.5",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "25m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"SlowPercent": "20",
+		"CloseRangeBonusWeaponPower": "50",
-		"GroundDashReductionPercent": "-30",
+		"SlowPercent": "25",
-		"BonusSprintSpeed": "0.5m"
+		"SlowDuration": "2",
+		"CloseRangeBonusDamageRange": "15m",
+		"MeleeResistPercent": "30",
+		"BonusHealth": "100"
 	},
-	"upgrade_cooldown_reduction": {
+	"upgrade_close_range": {
-		"Name": "Superior Cooldown",
+		"Name": null,
-		"Description": "Reduces the \u003Cspan class=\"highlight\"\u003ECooldown\u003C/span\u003E of your abilities.",
+		"Description": "Deal additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E when in \u003Cspan class=\"highlight\"\u003Eclose range\u003C/span\u003E to your target.",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_magic_tempo"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Healing"
+			"WeaponDamage",
+			"Durability"
 		],
 		"IsDisabled": false,
@@ Line 2,292: / Line 2,305: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"CooldownReduction": "25",
+		"CloseRangeBonusWeaponPower": "20",
-		"OutOfCombatHealthRegen": "4"
+		"CloseRangeBonusDamageRange": "15m",
+		"MeleeResistPercent": "20"
 	},
-	"upgrade_corpse_explosion": {
+	"upgrade_cold_front": {
-		"Name": "Soul Explosion",
+		"Name": null,
-		"Description": "Kills or assists cause an \u003Cspan class=\"highlight\"\u003Eexplosion\u003C/span\u003E where the victim dies. Kills against heroes have greater radius and damage.",
+		"Description": "Release an expanding ice blast that deals \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESlows\u003C/span\u003E targets it hits.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
 		"Slot": "Tech",
 		"Components": null,
@@ Line 2,312: / Line 2,326: @@
 		"ShopFilters": [
 			"MagicDamage",
-			"Movement"
+			"Disruption",
+			"Durability"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 24,
-		"AbilityDuration": "0",
+		"AbilityDuration": "4",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 2,324: / Line 2,339: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "6",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealthRegen": "3",
+		"SpreadDuration": "0.5",
-		"BonusHealth": "110",
+		"StartRadius": "2m",
-		"BonusSprintSpeed": "1m",
+		"EndRadius": "12m",
-		"ExplosionRadius": "4m",
+		"MovementSpeedSlow": "60",
-		"ExplosionDamage": "125",
+		"Damage": "125",
-		"HeroMultiplier": "150",
+		"DamageHeight": "2.5m",
-		"ArmingTime": ".1"
+		"NPCDamageMult": "1",
+		"TechResist": "6"
 	},
-	"upgrade_counterspell": {
+	"upgrade_colossus": {
-		"Name": "Counterspell",
+		"Name": null,
-		"Description": "Your next parry \u003Cspan class=\"highlight\"\u003Eprotects you from the damage and effects of enemy abilities and items\u003C/span\u003E. On a successful spell parry {g:citadel_inline_attribute:'Heal'} and gain {g:citadel_inline_attribute:'MoveSpeed'} and {g:citadel_inline_attribute:'Spirit'}.",
+		"Description": "Gain \u003Cspan class=\"highlight\"\u003EBullet and Spirit Resist\u003C/span\u003E, and \u003Cspan class=\"highlight\"\u003Eslow the move and dash speed\u003C/span\u003E of enemies nearby. Your model size grows by 20%.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
 		"Slot": "Armor",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_health"
-			"AllEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"Durability",
+			"Durability"
-			"Melee",
-			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 20,
+		"AbilityCooldown": 37,
-		"AbilityDuration": "0",
+		"AbilityDuration": "7",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 2,362: / Line 2,376: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"SpiritPower": "20",
+		"BonusHealth": "600",
-		"BonusMoveSpeed": "2m",
+		"BaseAttackDamagePercent": "15",
-		"BuffDuration": "6",
+		"BuffBulletResist": "30",
-		"SpellParryDuration": "1.0",
+		"BuffTechResist": "30",
-		"BonusHealth": "100",
+		"SlowPercent": "30",
-		"SpiritPowerInnate": "8",
+		"GroundDashReductionPercent": "-25",
-		"HealOnSuccess": "150"
+		"Radius": "12m",
+		"ModelScaleGrowth": "1.2"
 	},
-	"upgrade_crackshot": {
+	"upgrade_combo_breaker": {
-		"Name": "Mystic Shot",
+		"Name": null,
-		"Description": "Your next bullet deals bonus \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E.",
+		"Description": "\u003Cspan class=\"highlight\"\u003ERemove all debuffs\u003C/span\u003E and heal yourself. \u003Cbr\u003E\u003Cspan class=\"highlight\"\u003ECan be used while stunned.\u003C/span\u003E",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"AllFriendly"
 		],
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage",
+		"IsDisabled": true,
-			"MagicDamage"
+		"AbilityCooldown": 23,
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": "8",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,399: / Line 2,411: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Radius": "1m",
+		"TechArmor": "2",
-		"ProcChance": "100",
+		"BonusHealthRegen": "2.75",
-		"ProcCooldown": "1",
+		"HealPercentAmount": "30",
-		"ProcBonusMagicDamage": "60",
+		"RegenDuration": "10"
-		"SpiritPower": "7"
 	},
-	"upgrade_critshot": {
+	"upgrade_containment": {
-		"Name": "Lucky Shot",
+		"Name": null,
-		"Description": "Your bullets have a chance to be empowered, causing them to deal \u003Cspan class=\"highlight\"\u003Ebonus weapon damage\u003C/span\u003E on hit.\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EBonus damage cannot Crit.\u003C/span\u003E",
+		"Description": "\u003Cspan class=\"highlight\"\u003ESlows movement\u003C/span\u003E of enemy target. Also \u003Cspan class=\"highlight\"\u003ESilences\u003C/span\u003E their \u003Cspan class=\"highlight\"\u003Emovement-based items and abilities\u003C/span\u003E.\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EDoes not affect target's stamina usage.\u003C/span\u003E",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroEnemy"
 		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"Movement",
-			"ClipSize"
+			"Disruption",
+			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "30",
-		"AbilityDuration": "0",
+		"AbilityDuration": "3.5",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "25m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Radius": "1m",
+		"SlowPercent": "20",
-		"ProcChance": "25",
+		"GroundDashReductionPercent": "-30",
-		"CritDamagePercent": "125",
+		"BonusSprintSpeed": "0.5m"
-		"BonusClipSizePercent": "40"
 	},
-	"upgrade_crushing_fists": {
+	"upgrade_cooldown_reduction": {
-		"Name": "Crushing Fists",
+		"Name": null,
-		"Description": "Your \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'MeleeDamage'}\u003C/span\u003E will \u003Cspan class=\"highlight\"\u003Erestore ammo\u003C/span\u003E and apply a \u003Cspan class=\"highlight\"\u003Estacking bullet resist debuff\u003C/span\u003E on enemies. Heavy melee applies 2 stacks. \u003Cbr\u003E\u003Cbr\u003EIf the target reaches max stacks, they will be \u003Cspan class=\"highlight\"\u003Estunned\u003C/span\u003E.",
+		"Description": "Reduces the \u003Cspan class=\"highlight\"\u003ECooldown\u003C/span\u003E of your abilities.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": [
-			"upgrade_melee_charge"
+			"upgrade_magic_tempo"
-		],
-		"TargetTypes": [
-			"HeroEnemy",
-			"TrooperEnemy",
-			"MinionEnemy",
-			"Neutral"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"Melee"
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "7",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,472: / Line 2,478: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletResist": "12",
+		"CooldownReduction": "25",
-		"BonusMeleeDamagePercent": "20",
+		"OutOfCombatHealthRegen": "4"
-		"MeleeDistanceScale": "60",
-		"BonusHeavyMeleeDamage": "25",
-		"MaxStacks": "6",
-		"DebuffDuration": "8",
-		"StunDuration": "0.5",
-		"LightMeleeStacks": "1",
-		"LightMeleeAmmo": "15",
-		"HeavyMeleeMultiplier": "2",
-		"BulletResistReduction": "-4"
 	},
-	"upgrade_damage_recycler": {
+	"upgrade_corpse_explosion": {
-		"Name": "Leech",
+		"Name": null,
-		"Description": "Reduces the effect of enemy applied \u003Cspan class=\"highlight\"\u003Ehealing reduction\u003C/span\u003E.",
+		"Description": "Kills or assists cause an \u003Cspan class=\"highlight\"\u003Eexplosion\u003C/span\u003E where the victim dies. Kills against heroes have greater radius and damage.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_vampire",
-			"upgrade_health_stealing_magic"
-		],
 		"TargetTypes": [
 			"AllEnemy"
@@ Line 2,504: / Line 2,498: @@
 		"ShopFilters": [
 			"MagicDamage",
-			"Healing"
+			"Movement"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "8",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 2,516: / Line 2,510: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "12",
+		"TechPower": "6",
 		"WeaponPower": "0",
-		"AbilityLifestealPercentHero": "30",
+		"BonusHealthRegen": "3",
-		"BulletLifestealPercent": "30",
+		"BonusHealth": "110",
-		"BaseAttackDamagePercent": "12",
+		"BonusSprintSpeed": "1m",
-		"BonusHealth": "120",
+		"ExplosionRadius": "4m",
-		"HealAmpReceivePenaltyPercent": "-60"
+		"ExplosionDamage": "125",
+		"HeroMultiplier": "150",
+		"ArmingTime": ".1"
 	},
-	"upgrade_debuff_reducer": {
+	"upgrade_counterspell": {
-		"Name": "Debuff Reducer",
+		"Name": null,
-		"Description": "Reduces the \u003Cspan class=\"highlight\"\u003Eduration\u003C/span\u003E of all negative effects applied to you.",
+		"Description": "Your next parry \u003Cspan class=\"highlight\"\u003Eprotects you from the damage and effects of enemy abilities and items\u003C/span\u003E. On a successful spell parry {g:citadel_inline_attribute:'Heal'} and gain {g:citadel_inline_attribute:'MoveSpeed'} and {g:citadel_inline_attribute:'Spirit'}.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"WeaponDamage"
+			"Durability",
+			"Melee",
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 20,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,548: / Line 2,548: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"StatusResistancePercent": "20",
+		"SpiritPower": "20",
-		"BonusHealth": "50"
+		"BonusMoveSpeed": "2m",
+		"BuffDuration": "6",
+		"SpellParryDuration": "1.0",
+		"BonusHealth": "100",
+		"SpiritPowerInnate": "8",
+		"HealOnSuccess": "150"
 	},
-	"upgrade_deflecting_armor": {
+	"upgrade_crackshot": {
-		"Name": "Plated Armor",
+		"Name": null,
-		"Description": "Gain a chance to either deflect incoming bullets, preventing all {g:citadel_inline_attribute:'WeaponDamage'} or prevent all \u003Cspan class=\"highlight\"\u003Eon-hit effects\u003C/span\u003E from bullets.",
+		"Description": "Your next bullet deals bonus \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"Durability"
+			"WeaponDamage",
+			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "1",
+		"AbilityCooldown": "8",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,577: / Line 2,585: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DeflectionPercent": "30",
+		"Radius": "1m",
-		"BulletProcDeflectionPercent": "50",
+		"ProcChance": "100",
-		"DeflectionRandomness": "1",
+		"ProcCooldown": "1",
-		"BonusHealth": "100"
+		"ProcBonusMagicDamage": "60",
+		"SpiritPower": "7"
 	},
-	"upgrade_disarm": {
+	"upgrade_critshot": {
-		"Name": "Drain Will",
+		"Name": null,
-		"Description": "Fires a projectile which reduces the \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E of the target and \u003Cspan class=\"highlight\"\u003Esteals Spirit\u003C/span\u003E.",
+		"Description": "Your bullets have a chance to be empowered, causing them to deal \u003Cspan class=\"highlight\"\u003Ebonus weapon damage\u003C/span\u003E on hit.\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EBonus damage cannot Crit.\u003C/span\u003E",
-		"Cost": "800",
+		"Cost": "6400",
-		"Tier": "1",
+		"Tier": "4",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
-			"Disruption"
+			"ClipSize"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 26,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "6",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "17m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 2,611: / Line 2,620: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"FireRateSlow": "30",
+		"Radius": "1m",
-		"SpiritSteal": "22",
+		"ProcChance": "25",
-		"SpiritStealDuration": "6",
+		"CritDamagePercent": "125",
-		"BonusHealth": "25"
+		"BonusClipSizePercent": "40"
 	},
-	"upgrade_discord": {
+	"upgrade_crushing_fists": {
-		"Name": "Scourge",
+		"Name": "Crushing Fists",
-		"Description": "Apply \u003Cspan class=\"highlight\"\u003ESpirit Resistance\u003C/span\u003E and an aura on a friendly target that deals \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'SpiritIcon'}damage\u003C/span\u003E to enemies proportional to their max health. \u003Cbr\u003ECan be self cast.",
+		"Description": "Your \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'MeleeDamage'}\u003C/span\u003E will \u003Cspan class=\"highlight\"\u003Erestore ammo\u003C/span\u003E and apply a \u003Cspan class=\"highlight\"\u003Estacking bullet resist debuff\u003C/span\u003E on enemies. Heavy melee applies 2 stacks. \u003Cbr\u003E\u003Cbr\u003EIf the target reaches max stacks, they will be \u003Cspan class=\"highlight\"\u003Estunned\u003C/span\u003E.",
 		"Cost": "6400",
 		"Tier": "4",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
+			"upgrade_melee_charge"
+		],
 		"TargetTypes": [
-			"HeroFriendly"
+			"HeroEnemy",
+			"TrooperEnemy",
+			"MinionEnemy",
+			"Neutral"
+		],
+		"ShopFilters": [
+			"Melee"
 		],
-		"ShopFilters": null,
 		"IsDisabled": false,
-		"AbilityCooldown": 38,
+		"AbilityCooldown": "7",
-		"AbilityDuration": "10",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "35m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.25",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TickRate": "0.25",
+		"BulletResist": "12",
-		"MaxHealthPercentAsDPS": "3.25",
+		"BonusMeleeDamagePercent": "20",
-		"AuraRadius": "10m",
+		"MeleeDistanceScale": "60",
-		"TechResist": "40",
+		"BonusHeavyMeleeDamage": "25",
-		"BonusHealth": "125",
+		"MaxStacks": "6",
-		"CooldownReduction": "6"
+		"DebuffDuration": "8",
+		"StunDuration": "0.5",
+		"LightMeleeStacks": "1",
+		"LightMeleeAmmo": "15",
+		"HeavyMeleeMultiplier": "2",
+		"BulletResistReduction": "-4"
 	},
-	"upgrade_divine_barrier": {
+	"upgrade_damage_recycler": {
-		"Name": "Divine Barrier",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003ERemove all non-stun debuffs\u003C/span\u003E from the target and provide them with a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003ECan be self-cast. Cooldown is reduced by half when cast on someone else.\u003C/span\u003E",
+		"Description": "Reduces the effect of enemy applied \u003Cspan class=\"highlight\"\u003Ehealing reduction\u003C/span\u003E.",
 		"Cost": "6400",
 		"Tier": "4",
-		"Activation": "Press",
+		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": [
-			"upgrade_guardian_ward"
+			"upgrade_vampire",
+			"upgrade_health_stealing_magic"
 		],
 		"TargetTypes": [
-			"HeroFriendly"
+			"AllEnemy"
 		],
 		"ShopFilters": [
-			"Durability",
+			"MagicDamage",
-			"Movement"
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "40",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "35m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "20m",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "12",
 		"WeaponPower": "0",
-		"CooldownReductionPctOnOthers": "50",
+		"AbilityLifestealPercentHero": "30",
-		"BuffDuration": "6",
+		"BulletLifestealPercent": "30",
-		"CombatBarrier": "600",
+		"BaseAttackDamagePercent": "12",
-		"BonusMoveSpeed": "3m",
+		"BonusHealth": "120"
-		"TechRangeMultiplier": "15",
-		"TechRadiusMultiplier": "15"
 	},
-	"upgrade_diviners_kevlar": {
+	"upgrade_debuff_reducer": {
-		"Name": "Diviner's Kevlar",
+		"Name": null,
-		"Description": "Upon casting an \u003Cspan class=\"highlight\"\u003Eultimate ability\u003C/span\u003E gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E and temporary \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.",
+		"Description": "Reduces the \u003Cspan class=\"highlight\"\u003Eduration\u003C/span\u003E of all negative effects applied to you.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Armor",
@@ Line 2,701: / Line 2,721: @@
 		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage"
-			"Durability",
-			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 64,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,715: / Line 2,733: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "25",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"CombatBarrier": "1000",
+		"StatusResistancePercent": "20",
-		"BuffDuration": "13",
+		"BonusHealth": "50"
-		"BonusAbilityDurationPercent": "15"
 	},
-	"upgrade_double_jump": {
+	"upgrade_deflecting_armor": {
-		"Name": "Double-Jump",
+		"Name": null,
-		"Description": "Allows you to perform an additional \u003Cspan class=\"highlight\"\u003Ejump\u003C/span\u003E in mid-air.",
+		"Description": "Gain a chance to either deflect incoming bullets, preventing all {g:citadel_inline_attribute:'WeaponDamage'} or prevent all \u003Cspan class=\"highlight\"\u003Eon-hit effects\u003C/span\u003E from bullets.",
-		"Cost": "800",
+		"Cost": "6400",
-		"Tier": "1",
+		"Tier": "4",
 		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"Durability"
-		"AbilityCooldown": 8.5,
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "1",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,743: / Line 2,762: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"AirJumps": "1",
+		"DeflectionPercent": "30",
-		"AirJumpVerticalSpeedPercent": "75",
+		"BulletProcDeflectionPercent": "50",
-		"InteruptCooldown": 4
+		"DeflectionRandomness": "1",
+		"BonusHealth": "100"
 	},
-	"upgrade_dps_aura": {
+	"upgrade_disarm": {
-		"Name": "Heroic Aura",
+		"Name": null,
-		"Description": "Provides \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E to nearby friendly units.",
+		"Description": "Fires a projectile which reduces the \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E of the target and \u003Cspan class=\"highlight\"\u003Esteals Spirit\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
-		"Activation": "InstantCast",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"AllFriendly"
+			"HeroEnemy"
 		],
 		"ShopFilters": [
-			"FireRate",
+			"MagicDamage",
-			"Healing",
+			"Disruption"
-			"Movement"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": 25,
+		"AbilityCooldown": 26,
-		"AbilityDuration": "7",
+		"AbilityDuration": "6",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "17m",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 2,777: / Line 2,796: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "30",
+		"FireRateSlow": "30",
-		"Radius": "30m",
+		"SpiritSteal": "22",
-		"ActiveRadius": "30m",
+		"SpiritStealDuration": "6",
-		"ActiveBonusMoveSpeed": "2.5m",
+		"BonusHealth": "25"
-		"BulletResist": "15",
-		"NonHeroMult": "2",
-		"BonusSprintSpeed": "2m"
 	},
-	"upgrade_drum_magazine": {
+	"upgrade_discord": {
-		"Name": "Drum Magazine",
+		"Name": null,
-		"Description": "Provides a large \u003Cspan class=\"highlight\"\u003Eammo bonus\u003C/span\u003E, and \u003Cspan class=\"highlight\"\u003Eincreased reload speed\u003C/span\u003E",
+		"Description": "Apply \u003Cspan class=\"highlight\"\u003ESpirit Resistance\u003C/span\u003E and an aura on a friendly target that deals \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'SpiritIcon'}damage\u003C/span\u003E to enemies proportional to their max health. \u003Cbr\u003ECan be self cast.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroFriendly"
+		],
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 38,
-		"AbilityDuration": "0",
+		"AbilityDuration": "10",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "35m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.25",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSize": "20",
+		"TickRate": "0.25",
-		"ReloadSpeedMultipler": "-25"
+		"MaxHealthPercentAsDPS": "3.25",
+		"AuraRadius": "10m",
+		"TechResist": "40",
+		"BonusHealth": "125",
+		"CooldownReduction": "6"
 	},
-	"upgrade_duration_extender": {
+	"upgrade_divine_barrier": {
-		"Name": "[Deprecated] Duration Extender",
+		"Name": null,
-		"Description": "Increases \u003Cspan class=\"highlight\"\u003EDuration\u003C/span\u003E of your abilities and items by \u003Cspan class=\"highlight\"\u003E{s:NonImbuedBonusDuration}%\u003C/span\u003E.",
+		"Description": "\u003Cspan class=\"highlight\"\u003ERemove all non-stun debuffs\u003C/span\u003E from the target and provide them with a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003ECan be self-cast. Cooldown is reduced by half when cast on someone else.\u003C/span\u003E",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_guardian_ward"
+		],
+		"TargetTypes": [
+			"HeroFriendly"
+		],
 		"ShopFilters": [
-			"Durability"
+			"Durability",
+			"Movement"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "40",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "35m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusAbilityDurationPercent": "20"
+		"CooldownReductionPctOnOthers": "50",
+		"BuffDuration": "6",
+		"CombatBarrier": "600",
+		"BonusMoveSpeed": "3m",
+		"TechRangeMultiplier": "15",
+		"TechRadiusMultiplier": "15"
 	},
-	"upgrade_enchanted_holsters": {
+	"upgrade_diviners_kevlar": {
-		"Name": "Spellslinger",
+		"Name": null,
-		"Description": "While in-combat whenever you cast an ability or item, gain a stacking buff that improves fire rate and reload speed. \u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EEach stack refreshes the duration.\u003C/span\u003E",
+		"Description": "Upon casting an \u003Cspan class=\"highlight\"\u003Eultimate ability\u003C/span\u003E gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E and temporary \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.",
 		"Cost": "6400",
 		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
 			"MagicDamage",
-			"FireRate"
+			"Durability",
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 64,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,867: / Line 2,900: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "25",
 		"WeaponPower": "0",
-		"CooldownReduction": "12",
+		"CombatBarrier": "1000",
-		"BonusFireRate": "10",
+		"BuffDuration": "13",
-		"ReloadSpeedMultipler": "-10",
+		"BonusAbilityDurationPercent": "15"
-		"BuffDuration": "14",
-		"MaxStacks": "6"
 	},
-	"upgrade_endurance": {
+	"upgrade_double_jump": {
-		"Name": "Extra Regen",
+		"Name": null,
-		"Description": null,
+		"Description": "Allows you to perform an additional \u003Cspan class=\"highlight\"\u003Ejump\u003C/span\u003E in mid-air.",
 		"Cost": "800",
 		"Tier": "1",
@@ Line 2,886: / Line 2,917: @@
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"ClipSize",
+		"IsDisabled": true,
-			"Healing"
+		"AbilityCooldown": 8.5,
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,900: / Line 2,928: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealthRegen": "3"
+		"AirJumps": "1",
+		"AirJumpVerticalSpeedPercent": "75",
+		"InteruptCooldown": 4
 	},
-	"upgrade_escalating_exposure": {
+	"upgrade_dps_aura": {
-		"Name": "Escalating Exposure",
+		"Name": null,
-		"Description": "Dealing \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E applies a stacking \u003Cspan class=\"highlight\"\u003ESpirit Amp\u003C/span\u003E that increases your \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E to the target.",
+		"Description": "Provides \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E to nearby friendly units.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_magic_vulnerability"
-		],
 		"TargetTypes": [
-			"AllEnemy"
+			"AllFriendly"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"FireRate",
-			"Durability"
+			"Healing",
+			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 25,
-		"AbilityDuration": "12",
+		"AbilityDuration": "7",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 2,933: / Line 2,962: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ProcCooldown": "0.7",
+		"BonusFireRate": "30",
-		"MagicIncreasePerStack": "4.5",
+		"Radius": "30m",
-		"TechResist": "20",
+		"ActiveRadius": "30m",
-		"MaxStacks": "12",
+		"ActiveBonusMoveSpeed": "2.5m",
-		"TechArmorDamageReduction": "-8"
+		"BulletResist": "15",
+		"NonHeroMult": "2",
+		"BonusSprintSpeed": "2m"
 	},
-	"upgrade_ethereal_bullets": {
+	"upgrade_drum_magazine": {
-		"Name": "Mercurial Magnum",
+		"Name": null,
-		"Description": "Your imbued ability charges up over time with {g:citadel_inline_attribute:'BonusSpiritDamage'}, {g:citadel_inline_attribute:'BonusFireRate'}, and \u003Cspan class=\"highlight\"\u003Ereloads bullets\u003C/span\u003E on use. Until your next reload, your \u003Cspan class=\"highlight\"\u003Ebullets deal bonus Spirit Damage\u003C/span\u003E based on your Spirit Power.",
+		"Description": "Provides a large \u003Cspan class=\"highlight\"\u003Eammo bonus\u003C/span\u003E, and \u003Cspan class=\"highlight\"\u003Eincreased reload speed\u003C/span\u003E",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_quick_silver"
+		"TargetTypes": null,
-		],
+		"ShopFilters": null,
-		"TargetTypes": [
+		"IsDisabled": true,
-			"AllEnemy"
+		"AbilityCooldown": "0",
-		],
-		"ShopFilters": [
-			"MagicDamage",
-			"FireRate"
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": "15",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 2,970: / Line 2,994: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "7",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "25",
+		"BonusClipSize": "20",
-		"BuffDuration": "12",
+		"ReloadSpeedMultipler": "-25"
-		"Damage": "60",
+	},
-		"AmmoReloadPercent": "100",
+	"upgrade_duration_extender": {
-		"AbilityChargeUpTime": "14",
+		"Name": null,
-		"BulletsBonusMagicDamage": "25",
+		"Description": "Increases \u003Cspan class=\"highlight\"\u003EDuration\u003C/span\u003E of your abilities and items by \u003Cspan class=\"highlight\"\u003E{s:NonImbuedBonusDuration}%\u003C/span\u003E.",
-		"BonusClipSizePercent": "20"
+		"Cost": "1600",
-	},
+		"Tier": "2",
-	"upgrade_express_shot": {
-		"Name": "Express Shot",
-		"Description": "After not attacking for 3s, your next attack will \u003Cspan class=\"highlight\"\u003Efire twice\u003C/span\u003E in quick succession with \u003Cspan class=\"highlight\"\u003Eincreased damage\u003C/span\u003E and velocity.  This attack consumes extra ammo.",
-		"Cost": "3200",
-		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_high_velocity_mag"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage"
+			"Durability"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": "3",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 3,006: / Line 3,023: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusBulletSpeedPercent": "35",
+		"BonusAbilityDurationPercent": "20"
-		"BonusFireRate": "5",
-		"ProcAmmoConsumed": "30",
-		"ProcBulletVelocity": "100",
-		"ProcBaseAttackDamagePercent": "185",
-		"ProcBaseAttackDamagePercentAltFire": "75"
 	},
-	"upgrade_extra_charge": {
+	"upgrade_enchanted_holsters": {
-		"Name": "Extra Charge",
+		"Name": "Enchanted Holsters",
-		"Description": "Adds one to your ability max \u003Cspan class=\"highlight\"\u003Echarges\u003C/span\u003E.",
+		"Description": "While in-combat whenever you cast an ability or item, gain a stacking buff that improves fire rate and reload speed. \u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EEach stack refreshes the duration.\u003C/span\u003E",
-		"Cost": "800",
+		"Cost": "6400",
-		"Tier": "1",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage"
+			"MagicDamage",
+			"FireRate"
 		],
 		"IsDisabled": false,
@@ Line 3,039: / Line 3,052: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusAbilityCharges": "1",
+		"CooldownReduction": "12",
-		"BonusSpiritForChargedAbilities": "7"
+		"BonusFireRate": "10",
-	},
+		"ReloadSpeedMultipler": "-10",
-	"upgrade_fervor": {
+		"BuffDuration": "14",
-		"Name": "Frenzy",
+		"MaxStacks": "6"
+	},
+	"upgrade_endurance": {
+		"Name": null,
 		"Description": null,
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
-			"FireRate",
 			"ClipSize",
-			"Movement"
+			"Healing"
 		],
 		"IsDisabled": false,
@@ Line 3,071: / Line 3,085: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"LowHealthThreshold": "50",
+		"BonusHealthRegen": "3"
-		"TechResist": "10",
-		"BonusMoveSpeed": "1m",
-		"BonusFireRate": "10",
-		"FervorMovespeed": "3m",
-		"FervorFireRate": "30",
-		"FervorTechResist": "30",
-		"LingerDuration": "5"
 	},
-	"upgrade_fire_rate_aura": {
+	"upgrade_escalating_exposure": {
-		"Name": "Fire Rate Aura",
+		"Name": null,
-		"Description": "Provides a \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E increase to you and nearby teammates.  Different bonus to non-Heroes",
+		"Description": "Dealing \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E applies a stacking \u003Cspan class=\"highlight\"\u003ESpirit Amp\u003C/span\u003E that increases your \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E to the target.",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
+			"upgrade_magic_vulnerability"
+		],
 		"TargetTypes": [
-			"AllFriendly"
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Durability"
 		],
-		"ShopFilters": null,
+		"IsDisabled": false,
-		"IsDisabled": true,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "12",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 3,106: / Line 3,118: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "10",
+		"ProcCooldown": "0.7",
-		"BonusFireRateNPC": "35",
+		"MagicIncreasePerStack": "4.5",
-		"AuraRadius": "30m"
+		"TechResist": "20",
+		"MaxStacks": "12",
+		"TechArmorDamageReduction": "-8"
 	},
-	"upgrade_fleetfoot_boots": {
+	"upgrade_ethereal_bullets": {
-		"Name": "Fleetfoot",
+		"Name": null,
-		"Description": null,
+		"Description": "Your imbued ability charges up over time with {g:citadel_inline_attribute:'BonusSpiritDamage'}, {g:citadel_inline_attribute:'BonusFireRate'}, and \u003Cspan class=\"highlight\"\u003Ereloads bullets\u003C/span\u003E on use. Until your next reload, your \u003Cspan class=\"highlight\"\u003Ebullets deal bonus Spirit Damage\u003C/span\u003E based on your Spirit Power.",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_quick_silver"
+		],
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"ClipSize",
+			"MagicDamage",
-			"Movement"
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 16,
+		"AbilityCooldown": "15",
-		"AbilityDuration": "6",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 3,137: / Line 3,155: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "7",
 		"WeaponPower": "0",
-		"MoveWhileShootingSpeedPenaltyReductionPercent": "100",
+		"BonusFireRate": "25",
-		"MoveWhileZoomedSpeedPenaltyReductionPercent": "100",
+		"BuffDuration": "12",
-		"ActiveBonusMoveSpeed": "3.5m",
+		"Damage": "60",
-		"SlideScale": "35",
+		"AmmoReloadPercent": "100",
-		"BulletResist": "6",
+		"AbilityChargeUpTime": "14",
-		"SlowResistancePercent": "40"
+		"BulletsBonusMagicDamage": "25",
+		"BonusClipSizePercent": "20"
 	},
-	"upgrade_focus_lens": {
+	"upgrade_express_shot": {
-		"Name": "Focus Lens",
+		"Name": "Express Shot",
-		"Description": "Target an enemy to silence them. A portion of \u003Cspan class=\"highlight\"\u003Eall damage dealt\u003C/span\u003E during the silence gets applied to the target when the silence wears off.",
+		"Description": "After not attacking for 3s, your next attack will \u003Cspan class=\"highlight\"\u003Efire twice\u003C/span\u003E in quick succession with \u003Cspan class=\"highlight\"\u003Eincreased damage\u003C/span\u003E and velocity.  This attack consumes extra ammo.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_high_velocity_mag"
-			"HeroEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"Disruption",
+			"WeaponDamage"
-			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "25",
+		"AbilityCooldown": "3",
-		"AbilityDuration": "4.25",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "20m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"PercentDamage": "30",
+		"BonusBulletSpeedPercent": "35",
-		"BonusFireRate": "16"
+		"BonusFireRate": "5",
+		"ProcAmmoConsumed": "30",
+		"ProcBulletVelocity": "100",
+		"ProcBaseAttackDamagePercent": "185",
+		"ProcBaseAttackDamagePercentAltFire": "75"
 	},
-	"upgrade_frenzy": {
+	"upgrade_extra_charge": {
 		"Name": null,
-		"Description": null,
+		"Description": "Adds one to your ability max \u003Cspan class=\"highlight\"\u003Echarges\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"MagicDamage"
+		],
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 3,200: / Line 3,224: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletLifestealPercent": "25",
+		"BonusAbilityCharges": "1",
-		"Radius": "15m",
+		"BonusSpiritForChargedAbilities": "7"
-		"BulletArmorReduction": "-40",
+	},
-		"LowHealthPercentThreshold": "45",
+	"upgrade_fervor": {
-		"LowHealthLifeStealPercent": "45",
+		"Name": null,
-		"KillBonusMoveSpeedPerStack": "2m",
-		"MaxKillBonusMoveSpeedStack": "3"
-	},
-	"upgrade_full_spectrum": {
-		"Name": "Full Spectrum",
 		"Description": null,
 		"Cost": "6400",
 		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": [
+			"WeaponDamage",
+			"FireRate",
+			"ClipSize",
+			"Movement"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
+		"AbilityDuration": "0",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"LowHealthThreshold": "50",
+		"TechResist": "10",
+		"BonusMoveSpeed": "1m",
+		"BonusFireRate": "10",
+		"FervorMovespeed": "3m",
+		"FervorFireRate": "30",
+		"FervorTechResist": "30",
+		"LingerDuration": "5"
+	},
+	"upgrade_fire_rate_aura": {
+		"Name": null,
+		"Description": "Provides a \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E increase to you and nearby teammates.  Different bonus to non-Heroes",
+		"Cost": "1600",
+		"Tier": "2",
+		"Activation": "Passive",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"AllFriendly"
 		],
 		"ShopFilters": null,
@@ Line 3,234: / Line 3,291: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechRangeMultiplier": "60",
+		"BonusFireRate": "10",
-		"TechRadiusMultiplier": "60",
+		"BonusFireRateNPC": "35",
-		"SlowPercent": "30",
+		"AuraRadius": "30m"
-		"SlowDuration": "2",
-		"BonusDamagePerHero": "5"
 	},
-	"upgrade_fury_trance": {
+	"upgrade_fleetfoot_boots": {
-		"Name": "Fury Trance",
+		"Name": null,
 		"Description": null,
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "InstantCast",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_vampire"
+		"TargetTypes": null,
-		],
-		"TargetTypes": [
-			"HeroFriendly"
-		],
 		"ShopFilters": [
-			"FireRate",
+			"ClipSize",
-			"WeaponDamage",
+			"Movement"
-			"Movement",
-			"Healing"
 		],
 		"IsDisabled": false,
@@ Line 3,273: / Line 3,322: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletLifestealPercent": "22",
+		"MoveWhileShootingSpeedPenaltyReductionPercent": "100",
-		"ActiveBonusFireRate": "40",
+		"MoveWhileZoomedSpeedPenaltyReductionPercent": "100",
-		"TechResist": "40",
+		"ActiveBonusMoveSpeed": "3.5m",
-		"BonusHealth": "100"
+		"SlideScale": "35",
+		"BulletResist": "6",
+		"SlowResistancePercent": "40"
 	},
-	"upgrade_galvanic_storm": {
+	"upgrade_focus_lens": {
-		"Name": "Galvanic Storm",
+		"Name": null,
-		"Description": null,
+		"Description": "Target an enemy to \u003Cspan class=\"highlight\"\u003ESilence\u003C/span\u003E them. A portion of \u003Cspan class=\"highlight\"\u003Eall damage dealt\u003C/span\u003E during the silence gets applied to the target when the silence wears off.",
 		"Cost": "6400",
 		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"Disruption",
+			"MagicDamage"
 		],
-		"ShopFilters": null,
+		"IsDisabled": false,
-		"IsDisabled": true,
+		"AbilityCooldown": "25",
-		"AbilityCooldown": "0",
+		"AbilityDuration": "4.25",
-		"AbilityDuration": "0",
+		"AbilityCastRange": "20m",
-		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DamagePerChain": "50",
+		"PercentDamage": "30",
-		"BonusPerChain": "75",
+		"BonusFireRate": "16"
-		"ChainRadius": "7m",
-		"ProcChance": "30",
-		"ProcCooldown": "0.4",
-		"ChainCount": "7",
-		"ChainTickRate": "0.2",
-		"TechShieldMaxHealth": "400",
-		"GalvanicDebuffDuration": "5",
-		"ExplodeRadius": "10m",
-		"GalvanicBuffDuration": "7",
-		"BuffDamageMult": "2",
-		"BuffMoveSpeedBonus": "3m"
 	},
-	"upgrade_glass_cannon": {
+	"upgrade_frenzy": {
-		"Name": "Glass Cannon",
+		"Name": null,
-		"Description": "Each hero kill grants \u003Cspan class=\"highlight\"\u003Epermanent Fire Rate\u003C/span\u003E (up to a max of 8 times).  Death results in the loss of 1 stack.",
+		"Description": null,
 		"Cost": "6400",
 		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
+		"ShopFilters": null,
-		],
+		"IsDisabled": true,
-		"ShopFilters": [
-			"WeaponDamage",
-			"ClipSize",
-			"FireRate"
-		],
-		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 3,348: / Line 3,385: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BaseAttackDamagePercent": "80",
+		"BulletLifestealPercent": "25",
-		"MaxHealthLossPercent": "-10",
+		"Radius": "15m",
-		"BonusClipPerKill": "2",
+		"BulletArmorReduction": "-40",
-		"FireRatePerKill": "8",
+		"LowHealthPercentThreshold": "45",
-		"MaxStacks": "8",
+		"LowHealthLifeStealPercent": "45",
-		"SlowPercent": "30",
+		"KillBonusMoveSpeedPerStack": "2m",
-		"SlowDuration": "3",
+		"MaxKillBonusMoveSpeedStack": "3"
-		"BuildUpDuration": "2",
+	},
-		"BuildUpPerShot": "1.2"
+	"upgrade_full_spectrum": {
-	},
+		"Name": null,
-	"upgrade_glass_cannon2": {
+		"Description": null,
-		"Name": "Glass Cannon v2",
-		"Description": "Each hero kill grants \u003Cspan class=\"highlight\"\u003Epermanent Weapon Damage\u003C/span\u003E (up to a max of {s:MaxStacks} times).  Death results in the loss of 1 stack.",
 		"Cost": "6400",
 		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
-		],
-		"ShopFilters": [
-			"WeaponDamage",
-			"FireRate"
 		],
+		"ShopFilters": null,
 		"IsDisabled": true,
 		"AbilityCooldown": "0",
@@ Line 3,387: / Line 3,419: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BaseAttackDamagePercent": "100",
+		"TechRangeMultiplier": "60",
-		"MaxHealthLossPercent": "-50",
+		"TechRadiusMultiplier": "60",
-		"BonusClipPerKill": "0",
+		"SlowPercent": "30",
-		"BonusFireRate": "100",
+		"SlowDuration": "2",
-		"WeaponPowerPerKill": "10",
+		"BonusDamagePerHero": "5"
-		"MaxStacks": "0",
-		"SlowDuration": "0",
-		"BonusBulletSpeedPercent": "25"
 	},
-	"upgrade_glitch": {
+	"upgrade_fury_trance": {
-		"Name": "Curse",
+		"Name": null,
-		"Description": "Curses an enemy - \u003Cspan class=\"highlight\"\u003Einterrupting, Silencing, Disarming\u003C/span\u003E, and \u003Cspan class=\"highlight\"\u003Epreventing item usage\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "Press",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": null,
+		"Components": [
+			"upgrade_vampire"
+		],
 		"TargetTypes": [
-			"HeroEnemy"
+			"HeroFriendly"
 		],
 		"ShopFilters": [
-			"Disruption",
+			"FireRate",
-			"WeaponDamage"
+			"WeaponDamage",
+			"Movement",
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 50,
+		"AbilityCooldown": 16,
-		"AbilityDuration": "3.25",
+		"AbilityDuration": "6",
-		"AbilityCastRange": "20m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"SkipFrames": "6",
+		"BulletLifestealPercent": "22",
-		"SlowPercent": "0",
+		"ActiveBonusFireRate": "40",
-		"BaseAttackDamagePercent": "20"
+		"TechResist": "40",
+		"BonusHealth": "100"
 	},
-	"upgrade_greater_withering_whip": {
+	"upgrade_galvanic_storm": {
-		"Name": "Disarming Hex",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003EDisarms\u003C/span\u003E enemy target and reduces their \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_withering_whip"
-		],
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
 		],
-		"ShopFilters": [
+		"ShopFilters": null,
-			"Disruption",
+		"IsDisabled": true,
-			"MagicDamage"
+		"AbilityCooldown": "0",
-		],
+		"AbilityDuration": "0",
-		"IsDisabled": false,
+		"AbilityCastRange": "0",
-		"AbilityCooldown": 20,
-		"AbilityDuration": "4",
-		"AbilityCastRange": "23m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusSprintSpeed": "1m",
+		"DamagePerChain": "50",
-		"BonusHealth": "100",
+		"BonusPerChain": "75",
-		"BulletArmorReduction": "-13"
+		"ChainRadius": "7m",
+		"ProcChance": "30",
+		"ProcCooldown": "0.4",
+		"ChainCount": "7",
+		"ChainTickRate": "0.2",
+		"TechShieldMaxHealth": "400",
+		"GalvanicDebuffDuration": "5",
+		"ExplodeRadius": "10m",
+		"GalvanicBuffDuration": "7",
+		"BuffDamageMult": "2",
+		"BuffMoveSpeedBonus": "3m"
 	},
-	"upgrade_guardian_ward": {
+	"upgrade_glass_cannon": {
-		"Name": "Guardian Ward",
+		"Name": null,
-		"Description": "Provide the target with a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E and temporary \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003ECan be self-cast.\u003Cbr\u003ECooldown is reduced by half when cast on someone else.\u003C/span\u003E",
+		"Description": "Each hero kill grants \u003Cspan class=\"highlight\"\u003Epermanent Fire Rate\u003C/span\u003E (up to a max of 8 times).  Death results in the loss of 1 stack.",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
-			"HeroFriendly"
+			"HeroEnemy"
 		],
 		"ShopFilters": [
-			"Durability",
+			"WeaponDamage",
-			"Movement"
+			"ClipSize",
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "40",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "35m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "20m",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"CooldownReductionPctOnOthers": "50",
+		"BaseAttackDamagePercent": "80",
-		"BuffDuration": "6",
+		"MaxHealthLossPercent": "-10",
-		"GuardianWardCombatBarrier": "200",
+		"BonusClipPerKill": "2",
-		"BonusMoveSpeed": "3m",
+		"FireRatePerKill": "8",
-		"TechRangeMultiplier": "10",
+		"MaxStacks": "8",
-		"TechRadiusMultiplier": "10"
+		"SlowPercent": "30",
+		"SlowDuration": "3",
+		"BuildUpDuration": "2",
+		"BuildUpPerShot": "1.2"
 	},
-	"upgrade_headhunter": {
+	"upgrade_glass_cannon2": {
-		"Name": "Headhunter",
+		"Name": null,
-		"Description": "Your next \u003Cspan class=\"highlight\"\u003Eheadshot\u003C/span\u003E against an enemy Hero deals {g:citadel_inline_attribute:'BonusWeaponDamage'}, {g:citadel_inline_attribute:'Heal'} you, and briefly grants {g:citadel_inline_attribute:'BonusMoveSpeed'}.",
+		"Description": "Each hero kill grants \u003Cspan class=\"highlight\"\u003Epermanent Weapon Damage\u003C/span\u003E (up to a max of {s:MaxStacks} times).  Death results in the loss of 1 stack.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "Passive",
 		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_headshot_booster"
+		"TargetTypes": [
+			"HeroEnemy"
 		],
-		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage"
+			"WeaponDamage",
+			"FireRate"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": "8",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 3,528: / Line 3,572: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HeadShotBonusDamage": "75",
+		"BaseAttackDamagePercent": "100",
-		"BaseAttackDamagePercent": "5",
+		"MaxHealthLossPercent": "-50",
-		"BonusHealth": "75",
+		"BonusClipPerKill": "0",
-		"HealPercentPerHeadshot": "4",
+		"BonusFireRate": "100",
-		"BonusMoveSpeed": "2m",
+		"WeaponPowerPerKill": "10",
-		"MovementSpeedBonusDuration": "3",
+		"MaxStacks": "0",
-		"ProcChance": "100"
+		"SlowDuration": "0",
+		"BonusBulletSpeedPercent": "25"
 	},
-	"upgrade_headshot_booster": {
+	"upgrade_glitch": {
-		"Name": "Headshot Booster",
+		"Name": null,
-		"Description": "Your next \u003Cspan class=\"highlight\"\u003Eheadshot\u003C/span\u003E against an enemy Hero deals {g:citadel_inline_attribute:'BonusWeaponDamage'}.",
+		"Description": "Curses an enemy - \u003Cspan class=\"highlight\"\u003Einterrupting, Silencing, Disarming\u003C/span\u003E, and \u003Cspan class=\"highlight\"\u003Epreventing item usage\u003C/span\u003E.",
-		"Cost": "800",
+		"Cost": "6400",
-		"Tier": "1",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": [
-			"Durability",
+			"Disruption",
-			"FireRate"
+			"WeaponDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 8,
+		"AbilityCooldown": 50,
-		"AbilityDuration": "0",
+		"AbilityDuration": "3.25",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "20m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HeadShotBonusDamage": "50",
+		"SkipFrames": "6",
-		"BonusHealth": "40",
+		"SlowPercent": "0",
-		"ProcChance": "100"
+		"BaseAttackDamagePercent": "20"
 	},
-	"upgrade_headshot_booster2": {
+	"upgrade_greater_withering_whip": {
-		"Name": "Weakening Headshot",
+		"Name": null,
-		"Description": "Landing a \u003Cspan class=\"highlight\"\u003EHeadshot\u003C/span\u003E on Heroes reduces their \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
+		"Description": "\u003Cspan class=\"highlight\"\u003EDisarms\u003C/span\u003E enemy target and reduces their \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_withering_whip"
+		],
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": [
-			"Durability",
+			"Disruption",
-			"FireRate"
+			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 0,
+		"AbilityCooldown": 20,
-		"AbilityDuration": "0",
+		"AbilityDuration": "4",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "23m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletResistReduction": "-12",
+		"BonusSprintSpeed": "1m",
-		"MagicResistReduction": "0",
+		"BonusHealth": "100",
-		"HealAmpReceivePenaltyPercent": "0",
+		"BulletArmorReduction": "-13"
-		"HealAmpRegenPenaltyPercent": "0",
+	},
-		"DebuffDuration": "10",
+	"upgrade_guardian_ward": {
-		"HeadShotBonusDamage": "0",
+		"Name": null,
-		"DiminishingMultiplier": "0.5",
+		"Description": "Provide the target with a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E and temporary \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003ECan be self-cast.\u003Cbr\u003ECooldown is reduced by half when cast on someone else.\u003C/span\u003E",
-		"BonusHealth": "75"
+		"Cost": "1600",
-	},
+		"Tier": "2",
-	"upgrade_heal_on_level": {
+		"Activation": "Press",
-		"Name": "Patron's Healing",
-		"Description": "When you receive a \u003Cspan class=\"highlight\"\u003EBoon\u003C/span\u003E, automatically \u003Cspan class=\"highlight\"\u003Eheal\u003C/span\u003E.",
-		"Cost": "800",
-		"Tier": "1",
-		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroFriendly"
+		],
 		"ShopFilters": [
 			"Durability",
-			"Healing"
+			"Movement"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "40",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "35m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HealOnLevelHealAmount": "210",
+		"CooldownReductionPctOnOthers": "50",
-		"BonusHealthRegen": "2.0",
+		"BuffDuration": "6",
-		"AuraRadius": "15m"
+		"GuardianWardCombatBarrier": "200",
+		"BonusMoveSpeed": "3m",
+		"TechRangeMultiplier": "10",
+		"TechRadiusMultiplier": "10"
 	},
-	"upgrade_healbane": {
+	"upgrade_headhunter": {
-		"Name": "Healbane",
+		"Name": null,
-		"Description": "Your \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E applies \u003Cspan class=\"highlight\"\u003EHealing Reduction\u003C/span\u003E. If an enemy hero dies under this effect, you receive a large heal.",
+		"Description": "Your next \u003Cspan class=\"highlight\"\u003Eheadshot\u003C/span\u003E against an enemy Hero deals {g:citadel_inline_attribute:'BonusWeaponDamage'}, {g:citadel_inline_attribute:'Heal'} you, and briefly grants {g:citadel_inline_attribute:'BonusMoveSpeed'}.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_headshot_booster"
-			"AllEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"Healing",
+			"WeaponDamage"
-			"Disruption",
-			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "8",
-		"AbilityDuration": "8",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 3,664: / Line 3,713: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "7",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"HealAmpReceivePenaltyPercent": "-35",
+		"HeadShotBonusDamage": "75",
-		"HealAmpRegenPenaltyPercent": "-35",
+		"BaseAttackDamagePercent": "5",
-		"HealOnKill": "275"
+		"BonusHealth": "75",
+		"HealPercentPerHeadshot": "4",
+		"BonusMoveSpeed": "2m",
+		"MovementSpeedBonusDuration": "3",
+		"ProcChance": "100"
 	},
-	"upgrade_healbuff": {
+	"upgrade_headshot_booster": {
-		"Name": "Healing Tempo",
+		"Name": null,
-		"Description": "Applying {g:citadel_inline_attribute:'Heal'} to yourself or an ally grants the target {g:citadel_inline_attribute:'BonusFireRate'} and {g:citadel_inline_attribute:'BonusMoveSpeed'}.\u003Cbr\u003E\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EDoes not apply on innate Regen or innate Bullet/Spirit Lifesteal.\u003C/span\u003E",
+		"Description": "Your next \u003Cspan class=\"highlight\"\u003Eheadshot\u003C/span\u003E against an enemy Hero deals {g:citadel_inline_attribute:'BonusWeaponDamage'}.",
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_healing_booster"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"FireRate",
+			"Durability",
-			"Healing"
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "1",
+		"AbilityCooldown": 8,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 3,697: / Line 3,748: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "40",
+		"HeadShotBonusDamage": "50",
-		"BuffDuration": "7",
+		"BonusHealth": "40",
-		"BonusMoveSpeed": "1.5m",
+		"ProcChance": "100"
-		"MinimumHealAmount": "1",
-		"TechResist": "10",
-		"BonusHealthRegen": "6",
-		"HealAmpCastPercent": "25",
-		"HealAmpRegenPercent": "25"
 	},
-	"upgrade_healing_booster": {
+	"upgrade_headshot_booster2": {
-		"Name": "Healing Booster",
+		"Name": null,
-		"Description": "Increases the effectiveness of your \u003Cspan class=\"highlight\"\u003Ehealing\u003C/span\u003E by \u003Cspan class=\"highlight\"\u003E20%\u003C/span\u003E.",
+		"Description": "Landing a \u003Cspan class=\"highlight\"\u003EHeadshot\u003C/span\u003E on Heroes reduces their \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_endurance"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Healing"
+			"Durability",
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 0,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 3,734: / Line 3,779: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HealAmpCastPercent": "20",
+		"BulletResistReduction": "-12",
-		"HealAmpRegenPercent": "20",
+		"MagicResistReduction": "0",
-		"BonusHealthRegen": "3"
+		"HealAmpReceivePenaltyPercent": "0",
+		"HealAmpRegenPenaltyPercent": "0",
+		"DebuffDuration": "10",
+		"HeadShotBonusDamage": "0",
+		"DiminishingMultiplier": "0.5",
+		"BonusHealth": "75"
 	},
-	"upgrade_health": {
+	"upgrade_heal_on_level": {
-		"Name": "Extra Health",
+		"Name": null,
-		"Description": "Increase \u003Cspan class=\"highlight\"\u003Ehealth\u003C/span\u003E.",
+		"Description": "When you receive a \u003Cspan class=\"highlight\"\u003EBoon\u003C/span\u003E, automatically \u003Cspan class=\"highlight\"\u003Eheal\u003C/span\u003E.",
 		"Cost": "800",
 		"Tier": "1",
@@ Line 3,752: / Line 3,802: @@
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"Durability",
-			"Durability"
+			"Healing"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 3,765: / Line 3,815: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "1.3m",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "175"
+		"HealOnLevelHealAmount": "210",
+		"BonusHealthRegen": "2.0",
+		"AuraRadius": "15m"
 	},
-	"upgrade_health_2": {
+	"upgrade_healbane": {
-		"Name": "Toughness",
+		"Name": null,
-		"Description": null,
+		"Description": "Your \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E applies \u003Cspan class=\"highlight\"\u003EHealing Reduction\u003C/span\u003E. If an enemy hero dies under this effect, you receive a large heal.",
 		"Cost": "1600",
 		"Tier": "2",
@@ Line 3,779: / Line 3,831: @@
 		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"Healing",
+			"Disruption",
 			"Durability"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "8",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 3,794: / Line 3,849: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "7",
 		"WeaponPower": "0",
-		"BonusHealth": "200"
+		"HealAmpReceivePenaltyPercent": "-35",
+		"HealAmpRegenPenaltyPercent": "-35",
+		"HealOnKill": "275"
 	},
-	"upgrade_health_nova": {
+	"upgrade_healbuff": {
-		"Name": "Healing Nova",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003EHeal\u003C/span\u003E yourself and nearby allies.",
+		"Description": "Applying {g:citadel_inline_attribute:'Heal'} to yourself or an ally grants the target {g:citadel_inline_attribute:'BonusFireRate'} and {g:citadel_inline_attribute:'BonusMoveSpeed'}.\u003Cbr\u003E\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EDoes not apply on innate Regen or innate Bullet/Spirit Lifesteal.\u003C/span\u003E",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": [
-			"upgrade_health_stimpak"
+			"upgrade_healing_booster"
-		],
-		"TargetTypes": [
-			"AllFriendly"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
+			"FireRate",
 			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "60",
+		"AbilityCooldown": "1",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.25",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TotalHealthRegen": "325",
+		"BonusFireRate": "40",
-		"HeroTargetBonus": "0",
+		"BuffDuration": "7",
-		"RegenDuration": "2",
+		"BonusMoveSpeed": "1.5m",
-		"AuraRadius": "18m",
+		"MinimumHealAmount": "1",
-		"SpiritPower": "8"
+		"TechResist": "10",
+		"BonusHealthRegen": "6",
+		"HealAmpCastPercent": "25",
+		"HealAmpRegenPercent": "25"
 	},
-	"upgrade_health_regen_1": {
+	"upgrade_healing_booster": {
-		"Name": "Health Regen",
+		"Name": null,
-		"Description": "Increases \u003Cspan class=\"highlight\"\u003Ehealth regen\u003C/span\u003E.",
+		"Description": "Increases the effectiveness of your \u003Cspan class=\"highlight\"\u003Ehealing\u003C/span\u003E by \u003Cspan class=\"highlight\"\u003E20%\u003C/span\u003E.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Armor",
-		"Components": null,
+		"Components": [
+			"upgrade_endurance"
+		],
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"Healing"
+		],
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 3,856: / Line 3,919: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealthRegen": "2.75"
+		"HealAmpCastPercent": "20",
+		"HealAmpRegenPercent": "20",
+		"BonusHealthRegen": "3"
 	},
-	"upgrade_health_regen_aura": {
+	"upgrade_health": {
-		"Name": "Healing Aura",
+		"Name": null,
-		"Description": "Automatically provides a burst of healing to yourself and nearby friendlies every \u003Cspan class=\"highlight\"\u003E{s:HealInterval} seconds\u003C/span\u003E.  \u003Cbr\u003EEffect does not stack.",
+		"Description": "Increase \u003Cspan class=\"highlight\"\u003Ehealth\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
 		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllFriendly"
+		"ShopFilters": [
+			"WeaponDamage",
+			"Durability"
 		],
-		"ShopFilters": null,
+		"IsDisabled": false,
-		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 3,884: / Line 3,950: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HealInterval": "3",
+		"BonusHealth": "175"
-		"HealAmount": "40",
-		"HealRadius": "9m"
 	},
-	"upgrade_health_stealing_magic": {
+	"upgrade_health_2": {
-		"Name": "Spirit Lifesteal",
+		"Name": null,
-		"Description": "Your \u003Cspan class=\"highlight\"\u003Espirit items and abilities heal you\u003C/span\u003E for a percentage of the damage they deal. Heals for less on Non-Heroes and does not work on buildings.",
+		"Description": null,
 		"Cost": "1600",
 		"Tier": "2",
@@ Line 3,902: / Line 3,966: @@
 		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
-			"Healing",
 			"Durability"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 3,916: / Line 3,979: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"AbilityLifestealPercentHero": "16",
+		"BonusHealth": "200"
-		"NonHeroAbilityLifestealTooltipOnly": "3",
-		"BonusHealth": "70"
 	},
-	"upgrade_health_stimpak": {
+	"upgrade_health_nova": {
-		"Name": "Healing Rite",
+		"Name": null,
-		"Description": "Grant \u003Cspan class=\"highlight\"\u003ERegen\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESprint Speed\u003C/span\u003E to the target. Gets dispelled if you take damage from enemy players or objectives. Can be self-cast.",
+		"Description": "\u003Cspan class=\"highlight\"\u003EHeal\u003C/span\u003E yourself and nearby allies.",
-		"Cost": "800",
+		"Cost": "3200",
-		"Tier": "1",
+		"Tier": "3",
-		"Activation": "Press",
+		"Activation": "InstantCast",
 		"Slot": "Armor",
-		"Components": null,
+		"Components": [
+			"upgrade_health_stimpak"
+		],
 		"TargetTypes": [
-			"HeroFriendly"
+			"AllFriendly"
 		],
 		"ShopFilters": [
@@ Line 3,939: / Line 4,002: @@
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "70",
+		"AbilityCooldown": "60",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "30m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0.25",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TotalHealthRegen": "300",
+		"TotalHealthRegen": "325",
-		"RegenDuration": "20",
+		"HeroTargetBonus": "0",
-		"BonusSprintSpeed": "2m"
+		"RegenDuration": "2",
+		"AuraRadius": "18m",
+		"SpiritPower": "8"
 	},
-	"upgrade_height_advantage": {
+	"upgrade_health_regen_1": {
-		"Name": "Height Advantage",
+		"Name": null,
-		"Description": "Gain additional \u003Cspan class=\"highlight_weapon\"\u003E{s:HighGroundBonusWeaponPower}% Weapon Damage\u003C/span\u003E when attacking targets that are \u003Cspan class=\"highlight\"\u003Ebelow you\u003C/span\u003E.",
+		"Description": "Increases \u003Cspan class=\"highlight\"\u003Ehealth regen\u003C/span\u003E.",
 		"Cost": "800",
 		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
@@ Line 3,976: / Line 4,041: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HighGroundBonusWeaponPower": "50"
+		"BonusHealthRegen": "2.75"
 	},
-	"upgrade_high_impact_armor": {
+	"upgrade_health_regen_aura": {
-		"Name": "High Impact Armor",
+		"Name": null,
-		"Description": "Provides protection against high-damage bullets. Any \u003Cspan class=\"highlight\"\u003Ebullet damage\u003C/span\u003E portion above the threshold is reduced by {s:DamageReduction}%.",
+		"Description": "Automatically provides a burst of healing to yourself and nearby friendlies every \u003Cspan class=\"highlight\"\u003E{s:HealInterval} seconds\u003C/span\u003E.  \u003Cbr\u003EEffect does not stack.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllFriendly"
+		],
 		"ShopFilters": null,
 		"IsDisabled": true,
@@ Line 4,002: / Line 4,069: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DamageThreshold": "40",
+		"HealInterval": "3",
-		"DamageReduction": "60"
+		"HealAmount": "40",
+		"HealRadius": "9m"
 	},
-	"upgrade_high_velocity_mag": {
+	"upgrade_health_stealing_magic": {
-		"Name": "High-Velocity Rounds",
+		"Name": null,
-		"Description": null,
+		"Description": "Your \u003Cspan class=\"highlight\"\u003Espirit items and abilities heal you\u003C/span\u003E for a percentage of the damage they deal. Heals for less on Non-Heroes and does not work on buildings.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage"
+			"MagicDamage",
+			"Healing",
+			"Durability"
 		],
 		"IsDisabled": false,
@@ Line 4,031: / Line 4,101: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusBulletSpeedPercent": "35",
+		"AbilityLifestealPercentHero": "16",
-		"BonusFireRate": "5"
+		"NonHeroAbilityLifestealTooltipOnly": "3",
+		"BonusHealth": "70"
 	},
-	"upgrade_hollow_point_rounds": {
+	"upgrade_health_stimpak": {
-		"Name": "Hollow Point",
+		"Name": null,
-		"Description": "When you are \u003Cspan class=\"highlight\"\u003Eabove 65% health\u003C/span\u003E, deal additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E and your bullets reduce enemy \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
+		"Description": "Grant \u003Cspan class=\"highlight\"\u003ERegen\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESprint Speed\u003C/span\u003E to the target. Gets dispelled if you take damage from enemy players or objectives. Can be self-cast.",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroFriendly"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"Healing"
-			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "70",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"LifeThreshold": "65",
+		"TotalHealthRegen": "300",
-		"BaseAttackDamagePercent": "35",
+		"RegenDuration": "20",
-		"OutOfCombatHealthRegen": "4.5",
+		"BonusSprintSpeed": "2m"
-		"BonusHealth": "150",
-		"BulletArmorReduction": "-12",
-		"DebuffDuration": "8"
 	},
-	"upgrade_imbued_ability": {
+	"upgrade_height_advantage": {
-		"Name": "Imbued Ability",
+		"Name": null,
-		"Description": null,
+		"Description": "Gain additional \u003Cspan class=\"highlight_weapon\"\u003E{s:HighGroundBonusWeaponPower}% Weapon Damage\u003C/span\u003E when attacking targets that are \u003Cspan class=\"highlight\"\u003Ebelow you\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllEnemy"
-		],
 		"ShopFilters": null,
 		"IsDisabled": true,
@@ Line 4,096: / Line 4,161: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ImbuedBonusDuration": "25",
+		"HighGroundBonusWeaponPower": "50"
-		"ImbuedBonusDamage": "10",
-		"BonusAbilityDurationPercent": "20",
-		"SlowPercent": "15",
-		"SlowDuration": "2"
 	},
-	"upgrade_imbued_duration_extender": {
+	"upgrade_high_impact_armor": {
-		"Name": "Superior Duration",
+		"Name": null,
-		"Description": "Increases the \u003Cspan class=\"highlight\"\u003Eduration\u003C/span\u003E of your abilities and items.",
+		"Description": "Provides protection against high-damage bullets. Any \u003Cspan class=\"highlight\"\u003Ebullet damage\u003C/span\u003E portion above the threshold is reduced by {s:DamageReduction}%.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_arcane_extension"
+		"TargetTypes": null,
-		],
-		"TargetTypes": [
-			"AllEnemy"
-		],
 		"ShopFilters": null,
-		"IsDisabled": false,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 4,130: / Line 4,187: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusAbilityDurationPercent": "28",
+		"DamageThreshold": "40",
-		"BulletResist": "8"
+		"DamageReduction": "60"
 	},
-	"upgrade_improved_bullet_armor": {
+	"upgrade_high_velocity_mag": {
-		"Name": "Bullet Resilience",
+		"Name": null,
-		"Description": "When below \u003Cspan class=\"highlight\"\u003E30% health\u003C/span\u003E, gain additional \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Durability"
+			"WeaponDamage"
 		],
 		"IsDisabled": false,
@@ Line 4,159: / Line 4,216: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletResist": "30",
+		"BonusBulletSpeedPercent": "35",
-		"HealthThreshold": "30",
+		"BonusFireRate": "5"
-		"BulletResistBelowThreshold": "30"
 	},
-	"upgrade_improved_spirit": {
+	"upgrade_hollow_point_rounds": {
-		"Name": "Extra Spirit",
+		"Name": null,
-		"Description": null,
+		"Description": "When you are \u003Cspan class=\"highlight\"\u003Eabove 65% health\u003C/span\u003E, deal additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E and your bullets reduce enemy \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
-		"Cost": "800",
+		"Cost": "3200",
-		"Tier": "1",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
 			"MagicDamage",
-			"Healing"
+			"Durability"
 		],
 		"IsDisabled": false,
@@ Line 4,190: / Line 4,248: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "10",
+		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"LifeThreshold": "65",
+		"BaseAttackDamagePercent": "35",
+		"OutOfCombatHealthRegen": "4.5",
+		"BonusHealth": "150",
+		"BulletArmorReduction": "-12",
+		"DebuffDuration": "8"
 	},
-	"upgrade_improved_stamina": {
+	"upgrade_imbued_ability": {
-		"Name": "Extra Stamina",
+		"Name": null,
 		"Description": null,
-		"Cost": "800",
+		"Cost": "6400",
-		"Tier": "1",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": [
+			"AllEnemy"
-			"FireRate",
-			"Movement"
 		],
-		"IsDisabled": false,
+		"ShopFilters": null,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 4,218: / Line 4,281: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Stamina": "1",
+		"ImbuedBonusDuration": "25",
-		"StaminaCooldownReduction": "12"
+		"ImbuedBonusDamage": "10",
+		"BonusAbilityDurationPercent": "20",
+		"SlowPercent": "15",
+		"SlowDuration": "2"
 	},
-	"upgrade_infinitemagazine": {
+	"upgrade_imbued_duration_extender": {
-		"Name": "Endless Magazine",
+		"Name": null,
-		"Description": "Gain \u003Cspan class=\"highlight\"\u003Einfinite ammo\u003C/span\u003E and {g:citadel_inline_attribute:'BonusFireRate'}.",
+		"Description": "Increases the \u003Cspan class=\"highlight\"\u003Eduration\u003C/span\u003E of your abilities and items.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_arcane_extension"
-		"ShopFilters": [
+		],
-			"WeaponDamage",
+		"TargetTypes": [
-			"FireRate",
+			"AllEnemy"
-			"ClipSize"
 		],
-		"IsDisabled": true,
+		"ShopFilters": null,
-		"AbilityCooldown": "40",
+		"IsDisabled": false,
-		"AbilityDuration": "6",
+		"AbilityCooldown": "0",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 4,249: / Line 4,315: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSizePercent": "100",
+		"BonusAbilityDurationPercent": "28",
-		"BaseAttackDamagePercent": "20",
+		"BulletResist": "8"
-		"BonusFireRate": "20",
-		"BonusHealth": "200"
 	},
-	"upgrade_infuser": {
+	"upgrade_improved_bullet_armor": {
-		"Name": "Infuser",
+		"Name": "Bullet Resilience",
-		"Description": "Gain \u003Cspan class=\"highlight\"\u003ESpirit Lifesteal\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.",
+		"Description": "When below \u003Cspan class=\"highlight\"\u003E30% health\u003C/span\u003E, gain additional \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
 		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_health_stealing_magic"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage"
+			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 30,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "6",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.0",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "100",
+		"BulletResist": "30",
-		"BonusSpirit": "30",
+		"HealthThreshold": "30",
-		"AbilityLifestealPercentHero": "80",
+		"BulletResistBelowThreshold": "30"
-		"TechResist": "10",
-		"AbilityLifestealPercentHeroPassive": "16",
-		"NonHeroAbilityLifestealTooltipOnly": "3"
 	},
-	"upgrade_inhibitor": {
+	"upgrade_improved_spirit": {
-		"Name": "Inhibitor",
+		"Name": null,
-		"Description": "Your bullets buildup to reduce the target's \u003Cspan class=\"highlight\"\u003Eoutgoing damage\u003C/span\u003E and apply \u003Cspan class=\"highlight\"\u003Ehealing reduction\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"MagicDamage",
-			"Disruption",
+			"Healing"
-			"FireRate"
 		],
 		"IsDisabled": false,
@@ Line 4,319: / Line 4,375: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "10",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"BonusHealth": "125",
+	},
-		"DebuffDuration": "4",
+	"upgrade_improved_stamina": {
-		"BuildUpPerShot": "0.92",
+		"Name": null,
-		"BuildUpDuration": "5",
+		"Description": null,
-		"OutgoingDamagePenaltyPercent": "-35",
+		"Cost": "800",
-		"BaseAttackDamagePercent": "15",
+		"Tier": "1",
-		"HealAmpReceivePenaltyPercent": "-30",
-		"HealAmpRegenPenaltyPercent": "-30"
-	},
-	"upgrade_intensifying_clip": {
-		"Name": "Intensifying Magazine",
-		"Description": "Increases \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E as you continuously fire your weapon.",
-		"Cost": "1600",
-		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"ClipSize",
+			"FireRate",
-			"WeaponDamage"
+			"Movement"
 		],
 		"IsDisabled": false,
@@ Line 4,355: / Line 4,403: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSizePercent": "20",
+		"Stamina": "1",
-		"BaseAttackDamagePercent": "",
+		"StaminaCooldownReduction": "12"
-		"ShootDurationForMax": "3",
-		"BaseAttackDamagePercentAtMaxDuration": "45"
 	},
-	"upgrade_juggernaut": {
+	"upgrade_infinitemagazine": {
-		"Name": "Juggernaut",
+		"Name": null,
-		"Description": null,
+		"Description": "Gain \u003Cspan class=\"highlight\"\u003Einfinite ammo\u003C/span\u003E and {g:citadel_inline_attribute:'BonusFireRate'}.",
 		"Cost": "6400",
 		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_cardio_calibrator"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Durability"
+			"WeaponDamage",
+			"FireRate",
+			"ClipSize"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "40",
-		"AbilityDuration": "0",
+		"AbilityDuration": "6",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 4,388: / Line 4,434: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"MeleeResistPercent": "25",
+		"BonusClipSizePercent": "100",
-		"SlowResistancePercent": "50",
+		"BaseAttackDamagePercent": "20",
-		"FireRateSlow": "40",
+		"BonusFireRate": "20",
-		"BonusHealthRegen": "8",
+		"BonusHealth": "200"
-		"BonusMoveSpeed": "2m",
-		"FireRateSlowDuration": "4"
 	},
-	"upgrade_kinetic_sash": {
+	"upgrade_infuser": {
-		"Name": "Kinetic Dash",
+		"Name": null,
-		"Description": "When you \u003Cspan class=\"highlight\"\u003EDash-Jump\u003C/span\u003E you gain \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E and bonus \u003Cspan class=\"highlight\"\u003EAmmo\u003C/span\u003E until your next reload. Lasts up to 7s.",
+		"Description": "Gain \u003Cspan class=\"highlight\"\u003ESpirit Lifesteal\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": [
-			"upgrade_improved_stamina"
+			"upgrade_health_stealing_magic"
 		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"FireRate",
+			"MagicDamage"
-			"ClipSize",
-			"Movement",
-			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 30,
-		"AbilityDuration": "7",
+		"AbilityDuration": "6",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "30",
+		"BonusHealth": "100",
-		"BonusClipSize": "8",
+		"BonusSpirit": "30",
-		"Stamina": "1",
+		"AbilityLifestealPercentHero": "80",
-		"StaminaCooldownReduction": "12"
+		"TechResist": "10",
+		"AbilityLifestealPercentHeroPassive": "16",
+		"NonHeroAbilityLifestealTooltipOnly": "3"
 	},
-	"upgrade_lifestrike_gauntlets": {
+	"upgrade_inhibitor": {
-		"Name": "Melee Lifesteal",
+		"Name": null,
-		"Description": "Your next \u003Cspan class=\"highlight\"\u003EMelee\u003C/span\u003E attack \u003Cspan class=\"highlight\"\u003Eheals you\u003C/span\u003E. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003EThis heal is 30% effective vs non-heroes. \u003Cbr\u003ECooldown is 2x as long for Light Melee hits.\u003C/span\u003E",
+		"Description": "Your bullets build up to reduce the target's \u003Cspan class=\"highlight\"\u003Eoutgoing damage\u003C/span\u003E and apply \u003Cspan class=\"highlight\"\u003Ehealing reduction\u003C/span\u003E.",
-		"Cost": "800",
+		"Cost": "6400",
-		"Tier": "1",
+		"Tier": "4",
 		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroEnemy"
 		],
 		"ShopFilters": [
-			"Durability",
+			"WeaponDamage",
-			"Melee",
+			"Disruption",
-			"Healing"
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "8",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 4,461: / Line 4,504: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"LightMeleeCooldownMult": "2",
+		"BonusHealth": "125",
-		"BonusMeleeDamagePercent": "12",
+		"DebuffDuration": "4",
-		"LifestrikeHeal": "100",
+		"BuildUpPerShot": "0.92",
-		"NonHeroHealPct": "30"
+		"BuildUpDuration": "5",
+		"OutgoingDamagePenaltyPercent": "-35",
+		"BaseAttackDamagePercent": "15",
+		"HealAmpReceivePenaltyPercent": "-30",
+		"HealAmpRegenPenaltyPercent": "-30"
 	},
-	"upgrade_long_range": {
+	"upgrade_intensifying_clip": {
-		"Name": "Long Range",
+		"Name": null,
-		"Description": "Deal additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E when \u003Cspan class=\"highlight\"\u003Ebeyond a minimum distance\u003C/span\u003E from your target.",
+		"Description": "Increases \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E as you continuously fire your weapon.",
 		"Cost": "1600",
 		"Tier": "2",
@@ Line 4,480: / Line 4,527: @@
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"ClipSize",
-			"ClipSize"
+			"WeaponDamage"
 		],
 		"IsDisabled": false,
@@ Line 4,493: / Line 4,540: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BaseAttackDamagePercent": "0",
+		"BonusClipSizePercent": "20",
-		"LongRangeBonusWeaponPower": "40",
+		"BaseAttackDamagePercent": "",
-		"LongRangeBonusWeaponPowerMinRange": "15m",
+		"ShootDurationForMax": "3",
-		"BonusSprintSpeed": "1m"
+		"BaseAttackDamagePercentAtMaxDuration": "45"
 	},
-	"upgrade_long_range_slowing_tech": {
+	"upgrade_juggernaut": {
-		"Name": "Omni Spirit",
+		"Name": null,
-		"Description": "Applies a \u003Cspan class=\"highlight\"\u003Emovement slow\u003C/span\u003E to enemies when dealing spirit damage.",
+		"Description": null,
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_cardio_calibrator"
-			"HeroEnemy",
-			"CreepEnemy"
 		],
-		"ShopFilters": null,
+		"TargetTypes": null,
-		"IsDisabled": true,
+		"ShopFilters": [
-		"AbilityCooldown": "0",
+			"Durability"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 4,525: / Line 4,573: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechRangeMultiplier": "30",
+		"MeleeResistPercent": "25",
-		"TechRadiusMultiplier": "30",
+		"SlowResistancePercent": "50",
-		"SlowPercent": "20",
+		"FireRateSlow": "40",
-		"SlowDuration": "2"
+		"BonusHealthRegen": "8",
+		"BonusMoveSpeed": "2m",
+		"FireRateSlowDuration": "4"
 	},
-	"upgrade_magic_burst": {
+	"upgrade_kinetic_sash": {
-		"Name": "Mystic Burst",
+		"Name": null,
-		"Description": "Charges up over time with {g:citadel_inline_attribute:'BonusSpiritDamage'}, causing abilities dealing more than \u003Cspan class=\"highlight\"\u003E80\u003C/span\u003E damage to deal additional damage.",
+		"Description": "When you \u003Cspan class=\"highlight\"\u003EDash-Jump\u003C/span\u003E you gain \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E and bonus \u003Cspan class=\"highlight\"\u003EAmmo\u003C/span\u003E until your next reload. Lasts up to 7s.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_improved_stamina"
-			"AllEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"FireRate",
-			"Healing"
+			"ClipSize",
+			"Movement",
+			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "12",
+		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "7",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 4,559: / Line 4,611: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Damage": "40",
+		"BonusFireRate": "30",
-		"MinimumDamage": "80",
+		"BonusClipSize": "8",
-		"AbilityChargeUpTime": "12",
+		"Stamina": "1",
-		"MaxHealthDamage": "0"
+		"StaminaCooldownReduction": "12"
 	},
-	"upgrade_magic_carpet": {
+	"upgrade_lifestrike_gauntlets": {
-		"Name": "Magic Carpet",
+		"Name": null,
-		"Description": "Summon a Magic Carpet that will \u003Cspan class=\"highlight\"\u003Efly\u003C/span\u003E you away.  While flying you are immune to slows and doing any action will dismiss the carpet.  \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003ECannot use abilities while the carpet is being summoned.\u003C/span\u003E",
+		"Description": "Your next \u003Cspan class=\"highlight\"\u003EMelee\u003C/span\u003E attack \u003Cspan class=\"highlight\"\u003Eheals you\u003C/span\u003E. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003EThis heal is 30% effective vs non-heroes. \u003Cbr\u003ECooldown is 2x as long for Light Melee hits.\u003C/span\u003E",
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"Movement"
+			"Durability",
+			"Melee",
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 32,
+		"AbilityCooldown": "8",
-		"AbilityDuration": "8",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
@@ Line 4,592: / Line 4,648: @@
 		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "10",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"SummonDuration": "1.3",
+		"LightMeleeCooldownMult": "2",
-		"FlyMoveSpeed": "6m",
+		"BonusMeleeDamagePercent": "12",
-		"BonusHealth": "100",
+		"LifestrikeHeal": "100",
-		"BonusAbilityDurationPercent": "15"
+		"NonHeroHealPct": "30"
 	},
-	"upgrade_magic_clarity": {
+	"upgrade_long_range": {
-		"Name": "Clarity",
+		"Name": null,
-		"Description": "On ability or item use, gain a \u003Cspan class=\"highlight\"\u003Emove speed\u003C/span\u003E bonus for {s:AbilityDuration}s.  Your next ability cast will remove the move speed bonus and apply a \u003Cspan class=\"highlight\"\u003ESpirit\u003C/span\u003E bonus to that ability.",
+		"Description": "Deal additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E when \u003Cspan class=\"highlight\"\u003Ebeyond a minimum distance\u003C/span\u003E from your target.",
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage",
-		"AbilityCooldown": 16,
+			"ClipSize"
-		"AbilityDuration": "8",
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 4,619: / Line 4,678: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusMovespeed": "2m",
+		"BaseAttackDamagePercent": "0",
-		"BonusSpirit": "28",
+		"LongRangeBonusWeaponPower": "40",
-		"BonusSpiritMaxTime": "12",
+		"LongRangeBonusWeaponPowerMinRange": "15m",
-		"BonusSpiritWindow": "1",
+		"BonusSprintSpeed": "1m"
-		"BonusSpiritMin": "2"
 	},
-	"upgrade_magic_missile": {
+	"upgrade_long_range_slowing_tech": {
-		"Name": "Conjure Missiles",
+		"Name": null,
-		"Description": null,
+		"Description": "Applies a \u003Cspan class=\"highlight\"\u003Emovement slow\u003C/span\u003E to enemies when dealing spirit damage.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": [
+			"HeroEnemy",
-			"WeaponDamage",
+			"CreepEnemy"
-			"ClipSize",
-			"FireRate"
 		],
+		"ShopFilters": null,
 		"IsDisabled": true,
 		"AbilityCooldown": "0",
@@ Line 4,653: / Line 4,710: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BaseAttackDamagePercent": "70",
+		"TechRangeMultiplier": "30",
-		"MaxHealthLossPercent": "-15",
+		"TechRadiusMultiplier": "30",
-		"BonusClipPerKill": "2",
+		"SlowPercent": "20",
-		"MaxClipBonus": "14",
+		"SlowDuration": "2"
-		"BonusFireRate": "10",
-		"BonusMoveSpeed": "1m",
-		"WeaponPowerPerKill": "10",
-		"MaxStacks": "5"
 	},
-	"upgrade_magic_reach": {
+	"upgrade_magic_burst": {
-		"Name": "Mystic Expansion",
+		"Name": null,
-		"Description": "Imbue an ability to increase its \u003Cspan class=\"highlight\"\u003Erange\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eeffect radius\u003C/span\u003E.",
+		"Description": "Charges up over time with {g:citadel_inline_attribute:'BonusSpiritDamage'}, causing abilities dealing more than \u003Cspan class=\"highlight\"\u003E80\u003C/span\u003E damage to deal additional damage.",
 		"Cost": "800",
 		"Tier": "1",
@@ Line 4,674: / Line 4,727: @@
 		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Healing"
+		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "12",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 4,686: / Line 4,744: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechRangeMultiplier": "20",
+		"Damage": "40",
-		"TechRadiusMultiplier": "20"
+		"MinimumDamage": "80",
+		"AbilityChargeUpTime": "12",
+		"MaxHealthDamage": "0"
 	},
-	"upgrade_magic_shield": {
+	"upgrade_magic_carpet": {
-		"Name": "Enchanter's Emblem",
+		"Name": null,
-		"Description": "While you are \u003Cspan class=\"highlight\"\u003Eabove 65% health\u003C/span\u003E, gain bonus \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'Spirit'}\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ECooldown Reduction\u003C/span\u003E.",
+		"Description": "Summon a Magic Carpet that will \u003Cspan class=\"highlight\"\u003Efly\u003C/span\u003E you away.  While flying you are immune to slows and doing any action will dismiss the carpet.  \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003ECannot use abilities while the carpet is being summoned.\u003C/span\u003E",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"Movement"
-			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 32,
-		"AbilityDuration": "0",
+		"AbilityDuration": "8",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "15",
+		"TechPower": "10",
 		"WeaponPower": "0",
-		"TechResist": "15",
+		"SummonDuration": "1.3",
-		"OutOfCombatHealthRegen": "2",
+		"FlyMoveSpeed": "6m",
-		"LifeThreshold": "65",
+		"BonusHealth": "100",
-		"CooldownReduction": "7"
+		"BonusAbilityDurationPercent": "15"
 	},
-	"upgrade_magic_shock": {
+	"upgrade_magic_clarity": {
-		"Name": "Tankbuster",
+		"Name": null,
-		"Description": "Charges up over time with {g:citadel_inline_attribute:'BonusSpiritDamage'}, causing abilities dealing more than \u003Cspan class=\"highlight\"\u003E165\u003C/span\u003E damage to deal additional damage. \u003Cspan class=\"highlight\"\u003EIgnores Spirit Resistance.\u003C/span\u003E",
+		"Description": "On ability or item use, gain a \u003Cspan class=\"highlight\"\u003Emove speed\u003C/span\u003E bonus for {s:AbilityDuration}s.  Your next ability cast will remove the move speed bonus and apply a \u003Cspan class=\"highlight\"\u003ESpirit\u003C/span\u003E bonus to that ability.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_magic_burst"
+		"TargetTypes": null,
-		],
+		"ShopFilters": null,
-		"TargetTypes": [
+		"IsDisabled": true,
-			"AllEnemy"
+		"AbilityCooldown": 16,
-		],
+		"AbilityDuration": "8",
-		"ShopFilters": [
-			"MagicDamage",
-			"Disruption"
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": "14",
-		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 4,752: / Line 4,804: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"MinimumDamage": "165",
+		"BonusMovespeed": "2m",
-		"ReProcLockoutTime": "5",
+		"BonusSpirit": "28",
-		"WatcherMaxDuration": "30",
+		"BonusSpiritMaxTime": "12",
-		"MaxHealthDamage": "5",
+		"BonusSpiritWindow": "1",
-		"Damage": "40",
+		"BonusSpiritMin": "2"
-		"AbilityChargeUpTime": "14",
-		"BonusHealth": "75"
 	},
-	"upgrade_magic_slow": {
+	"upgrade_magic_missile": {
-		"Name": "Mystic Slow",
+		"Name": null,
-		"Description": "When the target takes \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E, they have their \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E reduced.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllEnemy"
-		],
 		"ShopFilters": [
-			"Disruption"
+			"WeaponDamage",
+			"ClipSize",
+			"FireRate"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "2",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 4,788: / Line 4,838: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"MovementSpeedSlow": "30",
+		"BaseAttackDamagePercent": "70",
-		"BonusSprintSpeed": "1m",
+		"MaxHealthLossPercent": "-15",
-		"BonusHealth": "50"
+		"BonusClipPerKill": "2",
+		"MaxClipBonus": "14",
+		"BonusFireRate": "10",
+		"BonusMoveSpeed": "1m",
+		"WeaponPowerPerKill": "10",
+		"MaxStacks": "5"
 	},
-	"upgrade_magic_storm": {
+	"upgrade_magic_reach": {
-		"Name": "Surge of Power",
+		"Name": null,
-		"Description": "Imbue an ability with \u003Cspan class=\"highlight\"\u003Epermanent Spirit Power\u003C/span\u003E. When that ability is used, gain bonus \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E and maintain full speed while attacking.",
+		"Description": "Imbue an ability to increase its \u003Cspan class=\"highlight\"\u003Erange\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eeffect radius\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
 		"Activation": "Passive",
 		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_improved_spirit"
-		],
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"MagicDamage",
-			"Movement"
-		],
 		"IsDisabled": false,
-		"AbilityCooldown": 14,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 4,821: / Line 4,871: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ImbuedTechPower": "28",
+		"TechRangeMultiplier": "20",
-		"FireRateBonus": "22",
+		"TechRadiusMultiplier": "20"
-		"BonusMoveSpeed": "2m",
-		"MovementSpeedBonusDuration": "8",
-		"MoveWhileShootingSpeedPenaltyReductionPercent": "100",
-		"MoveWhileZoomedSpeedPenaltyReductionPercent": "100"
 	},
-	"upgrade_magic_tempo": {
+	"upgrade_magic_shield": {
-		"Name": "Compress Cooldown",
+		"Name": null,
-		"Description": "Imbue an ability to reduce its \u003Cspan class=\"highlight\"\u003ECooldown\u003C/span\u003E.",
+		"Description": "While you are \u003Cspan class=\"highlight\"\u003Eabove 65% health\u003C/span\u003E, gain bonus \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'Spirit'}\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ECooldown Reduction\u003C/span\u003E.",
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Healing"
+			"MagicDamage",
+			"Durability"
 		],
 		"IsDisabled": false,
@@ Line 4,854: / Line 4,901: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "15",
 		"WeaponPower": "0",
-		"CooldownReduction": "22"
+		"TechResist": "15",
+		"OutOfCombatHealthRegen": "2",
+		"LifeThreshold": "65",
+		"CooldownReduction": "7"
 	},
-	"upgrade_magic_vulnerability": {
+	"upgrade_magic_shock": {
-		"Name": "Mystic Vulnerability",
+		"Name": null,
-		"Description": "When the target takes \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E, they have their \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E reduced.",
+		"Description": "Charges up over time with {g:citadel_inline_attribute:'BonusSpiritDamage'}, causing abilities dealing more than \u003Cspan class=\"highlight\"\u003E165\u003C/span\u003E damage to deal additional damage. \u003Cspan class=\"highlight\"\u003EIgnores Spirit Resistance.\u003C/span\u003E",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Tech",
-		"Components": null,
+		"Components": [
+			"upgrade_magic_burst"
+		],
 		"TargetTypes": [
 			"AllEnemy"
@@ Line 4,876: / Line 4,928: @@
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "14",
-		"AbilityDuration": "6",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 4,885: / Line 4,937: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechArmorDamageReduction": "-8",
+		"MinimumDamage": "165",
-		"TechResist": "8"
+		"ReProcLockoutTime": "5",
+		"WatcherMaxDuration": "30",
+		"MaxHealthDamage": "5",
+		"Damage": "40",
+		"AbilityChargeUpTime": "14",
+		"BonusHealth": "75"
 	},
-	"upgrade_medic_bullets": {
+	"upgrade_magic_slow": {
-		"Name": "Restorative Shot",
+		"Name": null,
-		"Description": "Your next bullet will \u003Cspan class=\"highlight\"\u003Eheal\u003C/span\u003E you based on what target you hit.",
+		"Description": "When the target takes \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E, they have their \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E reduced.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
@@ Line 4,904: / Line 4,961: @@
 		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"Disruption"
-			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "6",
+		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "2",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 4,917: / Line 4,973: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Radius": "1m",
+		"MovementSpeedSlow": "30",
-		"ProcChance": "100",
+		"BonusSprintSpeed": "1m",
-		"HealFromHero": "50",
+		"BonusHealth": "50"
-		"HealFromNPC": "15",
-		"BaseAttackDamagePercent": "6"
 	},
-	"upgrade_melee_charge": {
+	"upgrade_magic_storm": {
-		"Name": "Melee Charge",
+		"Name": null,
-		"Description": "Your next \u003Cspan class=\"highlight\"\u003EHeavy Melee\u003C/span\u003E attack against an enemy \u003Cspan class=\"highlight\"\u003Edeals increased damage\u003C/span\u003E.",
+		"Description": "Imbue an ability with \u003Cspan class=\"highlight\"\u003Epermanent Spirit Power\u003C/span\u003E. When that ability is used, gain bonus \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E and maintain full speed while attacking.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_improved_spirit"
-			"HeroEnemy",
-			"TrooperEnemy",
-			"MinionEnemy",
-			"Neutral"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"Melee"
+			"MagicDamage",
+			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "7",
+		"AbilityCooldown": 14,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 4,954: / Line 5,006: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletResist": "6",
+		"ImbuedTechPower": "28",
-		"BonusMeleeDamagePercent": "10",
+		"FireRateBonus": "22",
-		"MeleeDistanceScale": "50",
+		"BonusMoveSpeed": "2m",
-		"BonusHeavyMeleeDamage": "25"
+		"MovementSpeedBonusDuration": "8",
+		"MoveWhileShootingSpeedPenaltyReductionPercent": "100",
+		"MoveWhileZoomedSpeedPenaltyReductionPercent": "100"
 	},
-	"upgrade_melee_rebuttal": {
+	"upgrade_magic_tempo": {
-		"Name": "Rebuttal",
+		"Name": null,
-		"Description": "On a successful \u003Cspan class=\"highlight\"\u003EParry\u003C/span\u003E against an enemy Hero, \u003Cspan class=\"highlight\"\u003EHeal\u003C/span\u003E yourself for the damage parried and returns that damage to the target, and temporarily gain increased \u003Cspan class=\"highlight\"\u003Emelee damage.\u003C/span\u003E",
+		"Description": "Imbue an ability to reduce its \u003Cspan class=\"highlight\"\u003ECooldown\u003C/span\u003E.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllEnemy"
-		],
 		"ShopFilters": [
-			"Durability",
-			"Melee",
 			"Healing"
 		],
@@ Line 4,989: / Line 5,039: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "75",
+		"CooldownReduction": "22"
-		"ParryCooldownReduction": "2",
-		"BuffDuration": "6",
-		"BuffMeleeDamageBoost": "50",
-		"ParrySuccessHealPercentage": "100"
 	},
-	"upgrade_metal_skin": {
+	"upgrade_magic_vulnerability": {
-		"Name": "Metal Skin",
+		"Name": null,
-		"Description": "Become \u003Cspan class=\"highlight\"\u003Eimmune to bullets\u003C/span\u003E.",
+		"Description": "When the target takes \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E, they have their \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E reduced.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"Durability",
+			"MagicDamage",
-			"FireRate"
+			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 20,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "4.0",
+		"AbilityDuration": "6",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 5,022: / Line 5,070: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletResist": "15",
+		"TechArmorDamageReduction": "-8",
-		"ActiveMoveSpeedPenalty": "-1.5m",
+		"TechResist": "8"
-		"GroundDashReductionPercent": "-20"
 	},
-	"upgrade_mod_disruptor": {
+	"upgrade_medic_bullets": {
-		"Name": "Soul Disruptor",
+		"Name": null,
-		"Description": "Throw a grenade that explodes on contact and applies \u003Cspan class=\"highlight\"\u003Esilence\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eincreasing amounts of damage\u003C/span\u003E to each enemy.",
+		"Description": "Your next bullet will \u003Cspan class=\"highlight\"\u003Eheal\u003C/span\u003E you based on what target you hit.",
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
 			"AllEnemy"
 		],
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage",
-		"AbilityCooldown": 32,
+			"Healing"
-		"AbilityDuration": "5",
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "6",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DPS": "50",
+		"Radius": "1m",
-		"DPSIncrease": "10",
+		"ProcChance": "100",
-		"DPSMax": "100",
+		"HealFromHero": "50",
-		"Radius": "8m",
+		"HealFromNPC": "15",
-		"TickRate": "0.5",
+		"BaseAttackDamagePercent": "6"
-		"TechResist": "-18"
 	},
-	"upgrade_mystic_regeneration": {
+	"upgrade_melee_charge": {
-		"Name": "Mystic Regeneration",
+		"Name": null,
-		"Description": "Dealing Spirit Damage to enemy Heroes grants you Bonus Health Regen. Stacks when dealing damage to different heroes.",
+		"Description": "Your next \u003Cspan class=\"highlight\"\u003EHeavy Melee\u003C/span\u003E attack against an enemy \u003Cspan class=\"highlight\"\u003Edeals increased damage\u003C/span\u003E.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy",
+			"TrooperEnemy",
+			"MinionEnemy",
+			"Neutral"
+		],
 		"ShopFilters": [
-			"MagicDamage",
+			"Melee"
-			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "7",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 5,086: / Line 5,139: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Regeneration": "4",
+		"BulletResist": "6",
-		"RegenerationDuration": "5"
+		"BonusMeleeDamagePercent": "10",
+		"MeleeDistanceScale": "50",
+		"BonusHeavyMeleeDamage": "25"
 	},
-	"upgrade_nearby_enemy_boost": {
+	"upgrade_melee_rebuttal": {
-		"Name": "Adrenaline Rush",
+		"Name": null,
-		"Description": "Gain bonus \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E when there are two or more enemy heroes nearby.",
+		"Description": "On a successful \u003Cspan class=\"highlight\"\u003EParry\u003C/span\u003E against an enemy Hero, \u003Cspan class=\"highlight\"\u003EHeal\u003C/span\u003E yourself for the damage parried and returns that damage to the target, and temporarily gain increased \u003Cspan class=\"highlight\"\u003Emelee damage.\u003C/span\u003E",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
 		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"Durability",
-			"FireRate",
+			"Melee",
-			"Movement"
+			"Healing"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 5,119: / Line 5,174: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Radius": "20m",
+		"BonusHealth": "75",
-		"TickRate": "1",
+		"ParryCooldownReduction": "2",
-		"MinTargetsRequired": "2",
+		"BuffDuration": "6",
-		"BaseAttackDamagePercent": "48",
+		"BuffMeleeDamageBoost": "50",
-		"BonusFireRate": "30",
+		"ParrySuccessHealPercentage": "100"
-		"BonusHealth": "90",
-		"BonusMoveSpeed": "1m"
 	},
-	"upgrade_non_player_bonus": {
+	"upgrade_metal_skin": {
-		"Name": "Monster Rounds",
+		"Name": null,
-		"Description": "Gain additional \u003Cspan class=\"highlight_weapon\"\u003E25% Weapon Damage\u003C/span\u003E when attacking \u003Cspan class=\"highlight\"\u003ETroopers\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003ENeutrals\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EBosses\u003C/span\u003E.",
+		"Description": "Become \u003Cspan class=\"highlight\"\u003Eimmune to bullets\u003C/span\u003E.",
-		"Cost": "800",
+		"Cost": "3200",
-		"Tier": "1",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
 			"Durability",
-			"Healing"
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 20,
-		"AbilityDuration": "0",
+		"AbilityDuration": "4.0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 5,155: / Line 5,207: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"NonPlayerBonusWeaponPower": "25",
+		"BulletResist": "15",
-		"OutOfCombatHealthRegen": "1",
+		"ActiveMoveSpeedPenalty": "-1.5m",
-		"NonPlayerBulletResist": "25"
+		"GroundDashReductionPercent": "-20"
 	},
-	"upgrade_non_player_bonus_sacrifice": {
+	"upgrade_mod_disruptor": {
-		"Name": "Cultist Sacrifice",
+		"Name": null,
-		"Description": "Target an enemy NPC and consume it for \u003Cspan class=\"highlight\"\u003E150% Bonus Souls\u003C/span\u003E and grants a powerful long lasting buff.",
+		"Description": "Throw a grenade that explodes on contact and applies \u003Cspan class=\"highlight\"\u003Esilence\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eincreasing amounts of damage\u003C/span\u003E to each enemy.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_non_player_bonus"
+		"TargetTypes": [
-		],
+			"AllEnemy"
-		"TargetTypes": [
-			"TrooperEnemy",
-			"Neutral",
-			"MinionEnemy"
 		],
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityCooldown": 32,
+		"AbilityDuration": "5",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0.2",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"DPS": "50",
+		"DPSIncrease": "10",
+		"DPSMax": "100",
+		"Radius": "8m",
+		"TickRate": "0.5",
+		"TechResist": "-18"
+	},
+	"upgrade_mystic_regeneration": {
+		"Name": "Mystic Regeneration",
+		"Description": "Dealing Spirit Damage to enemy Heroes grants you Bonus Health Regen. Stacks when dealing damage to different heroes.",
+		"Cost": "800",
+		"Tier": "1",
+		"Activation": "Passive",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"MagicDamage",
-			"Durability",
 			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "250",
+		"AbilityCooldown": "0",
-		"AbilityDuration": "160",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "7m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 5,193: / Line 5,271: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"NonPlayerBonusWeaponPower": "30",
+		"Regeneration": "4",
-		"OutOfCombatHealthRegen": "2",
+		"RegenerationDuration": "5"
-		"NonPlayerBulletResist": "30",
-		"BonusSoulsPct": "150",
-		"BonusHealth": "100",
-		"BonusFireRate": "10",
-		"BonusAbilityCharges": "1",
-		"TechRangeMultiplier": "15",
-		"TechRadiusMultiplier": "15"
 	},
-	"upgrade_personal_rejuvenator": {
+	"upgrade_nearby_enemy_boost": {
-		"Name": "Rebirth",
+		"Name": null,
-		"Description": "Respawns the hero at the spot they died.",
+		"Description": "Gain bonus \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E when there are two or more enemy heroes nearby.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"WeaponDamage",
+			"FireRate",
+			"Movement"
+		],
 		"IsDisabled": true,
-		"AbilityCooldown": 509,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 5,227: / Line 5,304: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"RespawnDelay": "5",
+		"Radius": "20m",
-		"RespawnBonusHealthDuration": "0"
+		"TickRate": "1",
+		"MinTargetsRequired": "2",
+		"BaseAttackDamagePercent": "48",
+		"BonusFireRate": "30",
+		"BonusHealth": "90",
+		"BonusMoveSpeed": "1m"
 	},
-	"upgrade_phantom_strike": {
+	"upgrade_non_player_bonus": {
-		"Name": "Phantom Strike",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003ETeleport\u003C/span\u003E to an enemy target and pull them to the ground.  Dealing \u003Cspan class=\"highlight\"\u003Edamage\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003EMove speed\u003C/span\u003E reduction and \u003Cspan class=\"highlight\"\u003EDisarm\u003C/span\u003E.",
+		"Description": "Gain additional \u003Cspan class=\"highlight_weapon\"\u003E25% Weapon Damage\u003C/span\u003E when attacking \u003Cspan class=\"highlight\"\u003ETroopers\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003ENeutrals\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EBosses\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": [
 			"WeaponDamage",
 			"Durability",
-			"Movement",
+			"Healing"
-			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 35,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "25m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.35",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "8",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"BaseAttackDamagePercent": "15",
+		"NonPlayerBonusWeaponPower": "25",
-		"SlowPercent": "50",
+		"OutOfCombatHealthRegen": "1",
-		"SlowDuration": "3",
+		"NonPlayerBulletResist": "25"
-		"ImpactDamage": "75"
 	},
-	"upgrade_predator_precision": {
+	"upgrade_non_player_bonus_sacrifice": {
-		"Name": "Predator Precision",
+		"Name": "Cultlist Sacrifice",
-		"Description": "Gain additional \u003Cspan class=\"highlight\"\u003Eweapon damage\u003C/span\u003E against enemy Heroes that are \u003Cspan class=\"highlight\"\u003Elow health\u003C/span\u003E",
+		"Description": "Target an enemy NPC and consume it for \u003Cspan class=\"highlight\"\u003E150% Bonus Souls\u003C/span\u003E and grants a powerful long lasting buff.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Press",
 		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_non_player_bonus"
+		],
+		"TargetTypes": [
+			"TrooperEnemy",
+			"Neutral",
+			"MinionEnemy"
+		],
 		"ShopFilters": [
-			"FireRate"
+			"WeaponDamage",
+			"Durability",
+			"Healing"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "250",
-		"AbilityDuration": "0",
+		"AbilityDuration": "160",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "7m",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 5,292: / Line 5,378: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "8",
+		"NonPlayerBonusWeaponPower": "30",
-		"LifeThreshold": "50",
+		"OutOfCombatHealthRegen": "2",
-		"BaseAttackDamagePercent": "50"
+		"NonPlayerBulletResist": "30",
-	},
+		"BonusSoulsPct": "150",
-	"upgrade_pristine_emblem": {
+		"BonusHealth": "100",
-		"Name": "Opening Rounds",
+		"BonusFireRate": "10",
-		"Description": "Your attacks have additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E against \u003Cspan class=\"highlight\"\u003Eenemies above 50% health\u003C/span\u003E.",
+		"BonusAbilityCharges": "1",
-		"Cost": "1600",
+		"TechRangeMultiplier": "15",
-		"Tier": "2",
+		"TechRadiusMultiplier": "15"
+	},
+	"upgrade_personal_rejuvenator": {
+		"Name": null,
+		"Description": "Respawns the hero at the spot they died.",
+		"Cost": "3200",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllEnemy"
+		"ShopFilters": null,
-		],
+		"IsDisabled": true,
-		"ShopFilters": [
+		"AbilityCooldown": 509,
-			"MagicDamage",
-			"Durability"
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 5,325: / Line 5,412: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "7",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"EnemyLifeThreshold": "50",
+		"RespawnDelay": "5",
-		"BaseAttackDamagePercent": "0",
+		"RespawnBonusHealthDuration": "0"
-		"BaseAttackDamagePercentBonus": "40"
 	},
-	"upgrade_proc_disarm": {
+	"upgrade_phantom_strike": {
-		"Name": "Disarming Bullets",
+		"Name": null,
-		"Description": "Your bullets \u003Cspan class=\"highlight\"\u003Edisarm\u003C/span\u003E enemies, them preventing them from shooting their weapon.  Victims are immune to disarming bullets for \u003Cspan class=\"highlight\"\u003E{s:ImmunityDuration}s\u003C/span\u003E after application expires.",
+		"Description": "\u003Cspan class=\"highlight\"\u003ETeleport\u003C/span\u003E to an enemy target and pull them to the ground.  Dealing \u003Cspan class=\"highlight\"\u003Edamage\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003EMove speed\u003C/span\u003E reduction and \u003Cspan class=\"highlight\"\u003EDisarm\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
 			"HeroEnemy"
 		],
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage",
-		"AbilityCooldown": "0",
+			"Durability",
-		"AbilityDuration": "5",
+			"Movement",
-		"AbilityCastRange": "0",
+			"Disruption"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 35,
+		"AbilityDuration": "0",
+		"AbilityCastRange": "25m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.35",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "1.3m",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "8",
 		"WeaponPower": "0",
-		"ImmunityDuration": "3",
+		"BaseAttackDamagePercent": "15",
-		"BuildUpPerShot": "1.0",
+		"SlowPercent": "50",
-		"BuildUpDuration": "10"
+		"SlowDuration": "3",
+		"ImpactDamage": "75"
 	},
-	"upgrade_proc_silence": {
+	"upgrade_predator_precision": {
-		"Name": "Silencer",
+		"Name": null,
-		"Description": "Your bullets build up to a \u003Cspan class=\"highlight\"\u003ESilence\u003C/span\u003E. Victims are immune to the build up for \u003Cspan class=\"highlight\"\u003E10s\u003C/span\u003E after silence expires.",
+		"Description": "Gain additional \u003Cspan class=\"highlight\"\u003Eweapon damage\u003C/span\u003E against enemy Heroes that are \u003Cspan class=\"highlight\"\u003Elow health\u003C/span\u003E",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": [
-			"Disruption",
+			"FireRate"
-			"WeaponDamage"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 5,388: / Line 5,477: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechResist": "14",
+		"BonusFireRate": "8",
-		"TechDamageReduction": "-25",
+		"LifeThreshold": "50",
-		"SilenceDuration": "2.5",
+		"BaseAttackDamagePercent": "50"
-		"DebuffDuration": "6",
-		"ImmunityDuration": "10",
-		"BuildUpPerShot": "1.04",
-		"BuildUpDuration": "5"
 	},
-	"upgrade_proc_tech_damage": {
+	"upgrade_pristine_emblem": {
-		"Name": "Magitech Rounds",
+		"Name": null,
-		"Description": "Your bullets also deal your \u003Cspan class=\"highlight\"\u003Ebase bullet damage [{s:BaseDamagePerShot}] \u003C/span\u003E as spirit damage.  Magitech Rounds receives \u003Cspan class=\"highlight\"\u003E{s:SpellAmplificationMultiplier}x\u003C/span\u003E amplification from \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E. Shotguns split the damage between each pellet. This effect can only happen once every {s:ProcCooldown}s.",
+		"Description": "Your attacks have additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E against \u003Cspan class=\"highlight\"\u003Eenemies above 50% health\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
-		"IsDisabled": true,
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Durability"
+		],
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 5,420: / Line 5,510: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "7",
 		"WeaponPower": "0",
-		"ProcCooldown": "1",
+		"EnemyLifeThreshold": "50",
-		"BaseDamagePct": "0.0001",
+		"BaseAttackDamagePercent": "0",
-		"NanoTechPerShot": "1",
+		"BaseAttackDamagePercentBonus": "40"
-		"BaseDamagePerShot": "1",
-		"SpellAmplificationMultiplier": "5"
 	},
-	"upgrade_quarantine": {
+	"upgrade_proc_disarm": {
-		"Name": "Quarantine",
+		"Name": null,
-		"Description": "Quarantine an enemy Hero, making them \u003Cspan class=\"highlight\"\u003Einvincible\u003C/span\u003E but also \u003Cspan class=\"highlight\"\u003Esilencing and disarming\u003C/span\u003E them.",
+		"Description": "Your bullets \u003Cspan class=\"highlight\"\u003Edisarm\u003C/span\u003E enemies, them preventing them from shooting their weapon.  Victims are immune to disarming bullets for \u003Cspan class=\"highlight\"\u003E{s:ImmunityDuration}s\u003C/span\u003E after application expires.",
 		"Cost": "1600",
 		"Tier": "2",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
@@ Line 5,443: / Line 5,531: @@
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": 42,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "4.5",
+		"AbilityDuration": "5",
-		"AbilityCastRange": "30m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 5,452: / Line 5,540: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"ImmunityDuration": "3",
+		"BuildUpPerShot": "1.0",
+		"BuildUpDuration": "10"
 	},
-	"upgrade_quick_silver": {
+	"upgrade_proc_silence": {
-		"Name": "Quicksilver Reload",
+		"Name": null,
-		"Description": "Your imbued ability charges up over time with {g:citadel_inline_attribute:'BonusSpiritDamage'}, {g:citadel_inline_attribute:'BonusFireRate'}, and \u003Cspan class=\"highlight\"\u003Ebonus bullets\u003C/span\u003E on use.",
+		"Description": "Your bullets build up to a \u003Cspan class=\"highlight\"\u003ESilence\u003C/span\u003E. Victims are immune to the build up for \u003Cspan class=\"highlight\"\u003E10s\u003C/span\u003E after silence expires.",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroEnemy"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"Disruption",
-			"FireRate"
+			"WeaponDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "18",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 5,482: / Line 5,573: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "10",
+		"TechResist": "14",
-		"BuffDuration": "12",
+		"TechDamageReduction": "-25",
-		"Damage": "60",
+		"SilenceDuration": "2.5",
-		"AmmoReloadPercent": "100",
+		"DebuffDuration": "6",
-		"AbilityChargeUpTime": "18"
+		"ImmunityDuration": "10",
+		"BuildUpPerShot": "1.04",
+		"BuildUpDuration": "5"
 	},
-	"upgrade_rapid_recharge": {
+	"upgrade_proc_tech_damage": {
-		"Name": "Rapid Recharge",
+		"Name": null,
-		"Description": null,
+		"Description": "Your bullets also deal your \u003Cspan class=\"highlight\"\u003Ebase bullet damage [{s:BaseDamagePerShot}] \u003C/span\u003E as spirit damage.  Magitech Rounds receives \u003Cspan class=\"highlight\"\u003E{s:SpellAmplificationMultiplier}x\u003C/span\u003E amplification from \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E. Shotguns split the damage between each pellet. This effect can only happen once every {s:ProcCooldown}s.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_extra_charge"
-		],
 		"TargetTypes": null,
 		"ShopFilters": null,
-		"IsDisabled": false,
+		"IsDisabled": true,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 5,514: / Line 5,605: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"CooldownBetweenChargeReduction": "50",
+		"ProcCooldown": "1",
-		"BonusAbilityCharges": "2",
+		"BaseDamagePct": "0.0001",
-		"BonusSpiritForChargedAbilities": "20"
+		"NanoTechPerShot": "1",
+		"BaseDamagePerShot": "1",
+		"SpellAmplificationMultiplier": "5"
 	},
-	"upgrade_rapid_rounds": {
+	"upgrade_quarantine": {
-		"Name": "Rapid Rounds",
+		"Name": null,
-		"Description": null,
+		"Description": "Quarantine an enemy Hero, making them \u003Cspan class=\"highlight\"\u003Einvincible\u003C/span\u003E but also \u003Cspan class=\"highlight\"\u003Esilencing and disarming\u003C/span\u003E them.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": [
+			"HeroEnemy"
-			"FireRate",
-			"Movement"
 		],
-		"IsDisabled": false,
+		"ShopFilters": null,
-		"AbilityCooldown": "0",
+		"IsDisabled": true,
-		"AbilityDuration": "0",
+		"AbilityCooldown": 42,
-		"AbilityCastRange": "0",
+		"AbilityDuration": "4.5",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 5,545: / Line 5,637: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"BonusFireRate": "10"
 	},
-	"upgrade_rebirth": {
+	"upgrade_quick_silver": {
-		"Name": "Soul Rebirth",
+		"Name": null,
-		"Description": null,
+		"Description": "Your imbued ability charges up over time with {g:citadel_inline_attribute:'BonusSpiritDamage'}, {g:citadel_inline_attribute:'BonusFireRate'}, and \u003Cspan class=\"highlight\"\u003Ebonus bullets\u003C/span\u003E on use.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"AllEnemy"
-		"IsDisabled": true,
+		],
-		"AbilityCooldown": 240,
+		"ShopFilters": [
+			"MagicDamage",
+			"FireRate"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "18",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 5,571: / Line 5,667: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "12",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"SpawnTimePenalty": "30",
+		"BonusFireRate": "10",
-		"RespawnDelay": "4",
+		"BuffDuration": "12",
-		"RespawnHealthPercent": "50"
+		"Damage": "60",
+		"AmmoReloadPercent": "100",
+		"AbilityChargeUpTime": "18"
 	},
-	"upgrade_reduce_debuff_duration": {
+	"upgrade_rapid_recharge": {
-		"Name": "Debuff Remover",
+		"Name": null,
 		"Description": null,
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": [
-			"upgrade_debuff_reducer"
+			"upgrade_extra_charge"
 		],
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage"
-		],
 		"IsDisabled": false,
-		"AbilityCooldown": 50,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 5,603: / Line 5,699: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"StatusResistancePercent": "30",
+		"CooldownBetweenChargeReduction": "50",
-		"ActiveBonusMoveSpeed": "2.5m",
+		"BonusAbilityCharges": "2",
-		"BuffDuration": "3",
+		"BonusSpiritForChargedAbilities": "20"
-		"HealOnActivate": "250",
-		"BonusHealth": "100"
 	},
-	"upgrade_regenerating_bullet_shield": {
+	"upgrade_rapid_rounds": {
-		"Name": "Battle Vest",
+		"Name": null,
-		"Description": "While you are \u003Cspan class=\"highlight\"\u003Eabove 65% health\u003C/span\u003E, gain \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'WeaponDamage'}\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'BonusFireRate'}\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "800",
-		"Tier": "2",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"FireRate",
-			"Durability"
+			"Movement"
 		],
 		"IsDisabled": false,
@@ Line 5,636: / Line 5,730: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletResist": "18",
+		"BonusFireRate": "10"
-		"OutOfCombatHealthRegen": "3",
-		"LifeThreshold": "65",
-		"BaseAttackDamagePercent": "15",
-		"BonusFireRate": "8"
 	},
-	"upgrade_regenerative_armor": {
+	"upgrade_rebirth": {
-		"Name": "Regenerative Armor",
+		"Name": null,
-		"Description": "Gain a short burst of health regeneration when taking bullet damage from heroes",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
 		"Slot": "Armor",
@@ Line 5,657: / Line 5,747: @@
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 240,
-		"AbilityDuration": "5",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 5,666: / Line 5,756: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "12",
 		"WeaponPower": "0",
-		"BonusHealthRegen": "20"
+		"SpawnTimePenalty": "30",
+		"RespawnDelay": "4",
+		"RespawnHealthPercent": "50"
 	},
-	"upgrade_reinforcing_casings": {
+	"upgrade_reduce_debuff_duration": {
-		"Name": "Escalating Resilience",
+		"Name": null,
-		"Description": "Grants \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E when your bullets hit an enemy hero. \u003Cspan class=\"highlight\"\u003EEach shot can only grant one stack.\u003C/span\u003E",
+		"Description": null,
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": [
-			"upgrade_clip_size"
+			"upgrade_debuff_reducer"
 		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"WeaponDamage"
-			"Durability",
-			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 50,
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 5,698: / Line 5,788: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"MaxArmorStacks": "30",
+		"StatusResistancePercent": "30",
-		"BulletResistPerStack": "2",
+		"ActiveBonusMoveSpeed": "2.5m",
-		"BulletResistDuration": "24",
+		"BuffDuration": "3",
-		"BaseAttackDamagePercent": "15",
+		"HealOnActivate": "250",
-		"BonusHealth": "125",
+		"BonusHealth": "100"
-		"BonusClipSizePercent": "30"
 	},
-	"upgrade_reload_speed": {
+	"upgrade_regenerating_bullet_shield": {
-		"Name": "Fast Reload",
+		"Name": null,
-		"Description": "Increased \u003Cspan class=\"highlight\"\u003Ereload speed\u003C/span\u003E.",
+		"Description": "While you are \u003Cspan class=\"highlight\"\u003Eabove 65% health\u003C/span\u003E, gain \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'WeaponDamage'}\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003E{g:citadel_inline_attribute:'BonusFireRate'}\u003C/span\u003E.",
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage",
+			"Durability"
+		],
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 5,729: / Line 5,821: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ReloadSpeedMultipler": "-35"
+		"BulletResist": "18",
+		"OutOfCombatHealthRegen": "3",
+		"LifeThreshold": "65",
+		"BaseAttackDamagePercent": "15",
+		"BonusFireRate": "8"
 	},
-	"upgrade_rescue_beam": {
+	"upgrade_regenerative_armor": {
-		"Name": "Rescue Beam",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003EHeals\u003C/span\u003E a target allied hero and yourself for a percentage of \u003Cspan class=\"highlight\"\u003EMax Health\u003C/span\u003E. Once while healing, you can \u003Cspan class=\"highlight\"\u003EPull\u003C/span\u003E the target towards you. Can be self-cast.",
+		"Description": "Gain a short burst of health regeneration when taking bullet damage from heroes",
+		"Cost": "1600",
+		"Tier": "2",
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityCooldown": "0",
+		"AbilityDuration": "5",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"BonusHealthRegen": "20"
+	},
+	"upgrade_reinforcing_casings": {
+		"Name": null,
+		"Description": "Grants \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E when your bullets hit an enemy hero. \u003Cspan class=\"highlight\"\u003EEach shot can only grant one stack.\u003C/span\u003E",
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": [
-			"upgrade_health_stimpak"
+			"upgrade_clip_size"
-		],
-		"TargetTypes": [
-			"HeroFriendly"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
 			"Durability",
-			"Healing",
+			"FireRate"
-			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 60,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "28m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
-		"AbilityChannelTime": "2.5",
+		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "24m",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HealPercentAmount": "20",
+		"MaxArmorStacks": "30",
-		"HealInterval": "0.2",
+		"BulletResistPerStack": "2",
-		"BonusMoveSpeed": "0m",
+		"BulletResistDuration": "24",
-		"BonusSprintSpeed": "1m",
+		"BaseAttackDamagePercent": "15",
-		"SelfModifier": "100",
+		"BonusHealth": "125",
-		"TechRangeMultiplier": "8",
+		"BonusClipSizePercent": "30"
-		"TechRadiusMultiplier": "8"
 	},
-	"upgrade_resilience": {
+	"upgrade_reload_speed": {
-		"Name": "Enduring Spirit",
+		"Name": null,
-		"Description": null,
+		"Description": "Increased \u003Cspan class=\"highlight\"\u003Ereload speed\u003C/span\u003E.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"MagicDamage",
-			"Durability"
-		],
 		"IsDisabled": true,
 		"AbilityCooldown": "0",
@@ Line 5,799: / Line 5,914: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "25",
+		"ReloadSpeedMultipler": "-35"
-		"AbilityLifestealPercentHero": "7"
 	},
-	"upgrade_resonant_healing": {
+	"upgrade_rescue_beam": {
-		"Name": "Radiant Regeneration",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003EHeal\u003C/span\u003E and gain bonus \u003Cspan class=\"highlight\"\u003EMovement Speed\u003C/span\u003E for a short duration when you cast an ability.",
+		"Description": "\u003Cspan class=\"highlight\"\u003EHeals\u003C/span\u003E a target allied hero and yourself for a percentage of \u003Cspan class=\"highlight\"\u003EMax Health\u003C/span\u003E. Once while healing, you can \u003Cspan class=\"highlight\"\u003EPull\u003C/span\u003E the target towards you. Can be self-cast.",
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": [
-			"upgrade_mystic_regeneration"
+			"upgrade_health_stimpak"
+		],
+		"TargetTypes": [
+			"HeroFriendly"
 		],
-		"TargetTypes": null,
 		"ShopFilters": [
 			"MagicDamage",
-			"Movement",
+			"Durability",
-			"Healing"
+			"Healing",
+			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 6,
+		"AbilityCooldown": 60,
-		"AbilityDuration": "3",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "28m",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
-		"AbilityChannelTime": "0",
+		"AbilityChannelTime": "2.5",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HealingPerCast": "70",
+		"HealPercentAmount": "20",
-		"BonusMoveSpeed": "2m",
+		"HealInterval": "0.2",
-		"Regeneration": "4",
+		"BonusMoveSpeed": "0m",
-		"RegenerationDuration": "5"
+		"BonusSprintSpeed": "1m",
+		"SelfModifier": "100",
+		"TechRangeMultiplier": "8",
+		"TechRadiusMultiplier": "8"
 	},
-	"upgrade_restorative_locket": {
+	"upgrade_resilience": {
-		"Name": "Restorative Locket",
+		"Name": null,
 		"Description": null,
-		"Cost": "1600",
+		"Cost": "800",
-		"Tier": "2",
+		"Tier": "1",
-		"Activation": "Press",
+		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroFriendly"
-		],
 		"ShopFilters": [
-			"Healing",
+			"MagicDamage",
 			"Durability"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": 30,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
-		"AbilityCastRange": "30m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Radius": "30m",
+		"BonusHealth": "25",
-		"TechResist": "6",
+		"AbilityLifestealPercentHero": "7"
-		"HealPerStack": "20",
-		"MaxStacks": "20",
-		"StaminaToRestore": "2"
 	},
-	"upgrade_return_fire": {
+	"upgrade_resonant_healing": {
-		"Name": "Return Fire",
+		"Name": null,
-		"Description": "Automatically \u003Cspan class=\"highlight\"\u003Efire a bullet\u003C/span\u003E towards any attacker who damages you with their abilities or weapon.",
+		"Description": "\u003Cspan class=\"highlight\"\u003EHeal\u003C/span\u003E and gain bonus \u003Cspan class=\"highlight\"\u003EMovement Speed\u003C/span\u003E for a short duration when you cast an ability.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
+			"upgrade_mystic_regeneration"
+		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Durability",
 			"MagicDamage",
-			"FireRate"
+			"Movement",
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 25,
+		"AbilityCooldown": 6,
-		"AbilityDuration": "6",
+		"AbilityDuration": "3",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 5,900: / Line 6,017: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletDamageReflectedPct": "50",
+		"HealingPerCast": "70",
-		"SpiritDamageReflectedPct": "25",
+		"BonusMoveSpeed": "2m",
-		"ReturnFireBulletResist": "0",
+		"Regeneration": "4",
-		"BulletResist": "6"
+		"RegenerationDuration": "5"
 	},
-	"upgrade_ricochet": {
+	"upgrade_restorative_locket": {
-		"Name": "Ricochet",
+		"Name": null,
-		"Description": "Your bullets will \u003Cspan class=\"highlight\"\u003Ericochet\u003C/span\u003E on enemies near your target, \u003Cspan class=\"highlight\"\u003Eapplying any bullet procs\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Edealing a percentage of the original damage.\u003C/span\u003E",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy",
+			"HeroFriendly"
-			"BossEnemy",
-			"TrooperEnemy",
-			"PropEnemy",
-			"MinionEnemy",
-			"Neutral"
 		],
 		"ShopFilters": [
-			"ClipSize"
+			"Healing",
+			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 30,
 		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"RicochetDamagePercent": "65",
+		"Radius": "30m",
-		"RicochetRadius": "13m",
+		"TechResist": "6",
-		"RicochetTargetsTooltipOnly": "2",
+		"HealPerStack": "20",
-		"BonusFireRate": "20"
+		"MaxStacks": "20",
+		"StaminaToRestore": "2"
 	},
-	"upgrade_rocket_booster": {
+	"upgrade_return_fire": {
-		"Name": "Majestic Leap",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003ELaunch yourself\u003C/span\u003E high into the air and grant yourself a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E. While in the air, you can use the active again to drop down faster.\u003Cbr\u003E\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003ECannot be used for 5s if attacked by enemy Hero.\u003C/span\u003E",
+		"Description": "Automatically \u003Cspan class=\"highlight\"\u003Efire a bullet\u003C/span\u003E towards any attacker who damages you with their abilities or weapon.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "InstantCast",
 		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllEnemy"
-		],
 		"ShopFilters": [
-			"Movement"
+			"Durability",
+			"MagicDamage",
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "28",
+		"AbilityCooldown": 25,
-		"AbilityDuration": "0",
+		"AbilityDuration": "6",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 5,971: / Line 6,085: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"JumpVelocityHidden": "27m",
+		"BulletDamageReflectedPct": "50",
-		"InteruptCooldown": "5",
+		"SpiritDamageReflectedPct": "25",
-		"AirControlPercent": "100",
+		"ReturnFireBulletResist": "0",
-		"SlamDownRadius": "10m",
+		"BulletResist": "6"
-		"VerticalDifferenceTolerance": "2m",
-		"TossSpeed": "500",
-		"SlowPercent": "40",
-		"SlowDuration": "2.5",
-		"DropDownSpeed": "35m",
-		"MaxLandingSpeed": "20m",
-		"ImpactHeight": "2m",
-		"MinAimAngle": "30",
-		"CombatBarrier": "350",
-		"BarrierDuration": "8"
 	},
-	"upgrade_rocket_boots": {
+	"upgrade_ricochet": {
-		"Name": "Majestic Leap - Disabled",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003ELaunch yourself\u003C/span\u003E high into the air. Cannot be used for {s:InteruptCooldown}s if damaged by enemy Hero.",
+		"Description": "Your bullets will \u003Cspan class=\"highlight\"\u003Ericochet\u003C/span\u003E on enemies near your target, \u003Cspan class=\"highlight\"\u003Eapplying any bullet procs\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Edealing a percentage of the original damage.\u003C/span\u003E",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy",
+			"BossEnemy",
+			"TrooperEnemy",
+			"PropEnemy",
+			"MinionEnemy",
+			"Neutral"
+		],
 		"ShopFilters": [
-			"MagicDamage",
+			"ClipSize"
-			"Movement"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 16,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 6,013: / Line 6,123: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "8",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"JumpVelocityHidden": "22.5m",
+		"RicochetDamagePercent": "65",
-		"InteruptCooldown": 4,
+		"RicochetRadius": "13m",
-		"AirControlPercent": "100",
+		"RicochetTargetsTooltipOnly": "2",
-		"BonusHealth": "50"
+		"BonusFireRate": "20"
 	},
-	"upgrade_rupture": {
+	"upgrade_rocket_booster": {
-		"Name": "Decay",
+		"Name": null,
-		"Description": "Inflict \u003Cspan class=\"highlight\"\u003Edamage over time\u003C/span\u003E to a target, dealing damage based on their current health.\u003Cbr\u003EDecay's damage is non-lethal and does not apply item procs.",
+		"Description": "\u003Cspan class=\"highlight\"\u003ELaunch yourself\u003C/span\u003E high into the air and grant yourself a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E. While in the air, you can use the active again to drop down faster.\u003Cbr\u003E\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003ECannot be used for 5s if attacked by enemy Hero.\u003C/span\u003E",
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "Press",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"Movement"
-			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 36,
+		"AbilityCooldown": "28",
-		"AbilityDuration": "10",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "20m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "8",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"HealAmpReceivePenaltyPercent": "-40",
+		"JumpVelocityHidden": "27m",
-		"HealAmpRegenPenaltyPercent": "-40",
+		"InteruptCooldown": "5",
-		"TickRate": "1.0",
+		"AirControlPercent": "100",
-		"DotHealthPercent": "2.6",
+		"SlamDownRadius": "10m",
-		"BonusHealth": "90"
+		"VerticalDifferenceTolerance": "2m",
+		"TossSpeed": "500",
+		"SlowPercent": "40",
+		"SlowDuration": "2.5",
+		"DropDownSpeed": "35m",
+		"MaxLandingSpeed": "20m",
+		"ImpactHeight": "2m",
+		"MinAimAngle": "30",
+		"CombatBarrier": "350",
+		"BarrierDuration": "8"
 	},
-	"upgrade_self_bubble": {
+	"upgrade_rocket_boots": {
-		"Name": "Ethereal Shift",
+		"Name": null,
-		"Description": "You enter a void state and become \u003Cspan class=\"highlight\"\u003Euntargetable and invincible\u003C/span\u003E for a short duration, during which you float slowly and cannot perform actions. Afterwards you gain \u003Cspan class=\"highlight\"\u003ESpirit Power, Move Speed, and Spirit Resist\u003C/span\u003E.\u003Cbr\u003ECan be canceled early.\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EActivation cancels any active ability.\u003C/span\u003E",
+		"Description": "\u003Cspan class=\"highlight\"\u003ELaunch yourself\u003C/span\u003E high into the air. Cannot be used for {s:InteruptCooldown}s if damaged by enemy Hero.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"FireRate"
+			"MagicDamage",
+			"Movement"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": 20,
+		"AbilityCooldown": 16,
-		"AbilityDuration": "4.0",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 6,079: / Line 6,198: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "8",
 		"WeaponPower": "0",
-		"BuffDuration": "5",
+		"JumpVelocityHidden": "22.5m",
-		"TechResist": "30",
+		"InteruptCooldown": 4,
-		"DampingFactor": "3",
+		"AirControlPercent": "100",
-		"LiftHeight": "120",
+		"BonusHealth": "50"
-		"BonusSpirit": "20",
-		"MoveSpeedMax": "4m",
-		"BonusMoveSpeed": "3m"
 	},
-	"upgrade_sharpshooter": {
+	"upgrade_rupture": {
-		"Name": "Sharpshooter",
+		"Name": null,
-		"Description": "Deal additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E when \u003Cspan class=\"highlight\"\u003Ebeyond a minimum distance\u003C/span\u003E from your target.",
+		"Description": "Inflict \u003Cspan class=\"highlight\"\u003Edamage over time\u003C/span\u003E to a target, dealing damage based on their current health.\u003Cbr\u003EDecay's damage is non-lethal and does not apply item procs.",
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_long_range"
+		"TargetTypes": [
+			"HeroEnemy"
 		],
-		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"MagicDamage",
-			"ClipSize"
+			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 36,
-		"AbilityDuration": "0",
+		"AbilityDuration": "10",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "20m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "8",
 		"WeaponPower": "0",
-		"LongRangeBonusWeaponPower": "70",
+		"HealAmpReceivePenaltyPercent": "-40",
-		"LongRangeBonusWeaponPowerMinRange": "15m",
+		"HealAmpRegenPenaltyPercent": "-40",
-		"BonusAttackRangePercent": "20",
+		"TickRate": "1.0",
-		"BonusZoomPercent": "25",
+		"DotHealthPercent": "2.6",
-		"BonusMoveSpeed": "-1m",
+		"BonusHealth": "90"
-		"BonusSprintSpeed": "1m"
 	},
-	"upgrade_silencer": {
+	"upgrade_self_bubble": {
-		"Name": "Silencer",
+		"Name": null,
-		"Description": null,
+		"Description": "You enter a void state and become \u003Cspan class=\"highlight\"\u003Euntargetable and invincible\u003C/span\u003E for a short duration, during which you float slowly and cannot perform actions. Afterwards you gain \u003Cspan class=\"highlight\"\u003ESpirit Power, Move Speed, and Spirit Resist\u003C/span\u003E.\u003Cbr\u003ECan be canceled early.\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EActivation cancels any active ability.\u003C/span\u003E",
 		"Cost": "6400",
 		"Tier": "4",
 		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": [
-			"Disruption"
+			"FireRate"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 36,
+		"AbilityCooldown": 20,
-		"AbilityDuration": "4",
+		"AbilityDuration": "4.0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 6,151: / Line 6,264: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"EMPDuration": "2",
+		"BuffDuration": "5",
-		"BaseAttackDamagePercent": "20"
+		"TechResist": "30",
+		"DampingFactor": "3",
+		"LiftHeight": "120",
+		"BonusSpirit": "20",
+		"MoveSpeedMax": "4m",
+		"BonusMoveSpeed": "3m"
 	},
-	"upgrade_siphon_bullets": {
+	"upgrade_sharpshooter": {
-		"Name": "Siphon Bullets",
+		"Name": null,
-		"Description": null,
+		"Description": "Deal additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E when \u003Cspan class=\"highlight\"\u003Ebeyond a minimum distance\u003C/span\u003E from your target.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_long_range"
-			"HeroEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
 			"WeaponDamage",
-			"Healing"
+			"ClipSize"
 		],
 		"IsDisabled": false,
@@ Line 6,183: / Line 6,301: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BaseAttackDamagePercent": "15",
+		"LongRangeBonusWeaponPower": "70",
-		"BulletResist": "10",
+		"LongRangeBonusWeaponPowerMinRange": "15m",
-		"StealPerHit": "1",
+		"BonusAttackRangePercent": "20",
-		"StealPerKill": "1",
+		"BonusZoomPercent": "25",
-		"StackLostPerDeath": "2",
+		"BonusMoveSpeed": "-1m",
-		"MaxStacks": "9999",
+		"BonusSprintSpeed": "1m"
-		"StealDuration": "20",
-		"ProcCooldown": "0.8",
-		"HealthSteal": "55",
-		"ParticleRadius": "1m"
 	},
-	"upgrade_slow_immunity": {
+	"upgrade_silencer": {
-		"Name": "Unstoppable - Deprecated",
+		"Name": null,
-		"Description": "Purges any roots and chains on use and makes you immune to slows for the duration",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "InstantCast",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"Disruption"
+		],
 		"IsDisabled": true,
-		"AbilityCooldown": 32,
+		"AbilityCooldown": 36,
-		"AbilityDuration": "6",
+		"AbilityDuration": "4",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 6,218: / Line 6,336: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0"
+		"WeaponPower": "0",
+		"EMPDuration": "2",
+		"BaseAttackDamagePercent": "20"
 	},
-	"upgrade_slowing_bullets": {
+	"upgrade_siphon_bullets": {
-		"Name": "Slowing Bullets",
+		"Name": null,
-		"Description": "Your bullets build up a \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E on enemies.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
@@ Line 6,236: / Line 6,356: @@
 		"ShopFilters": [
 			"WeaponDamage",
-			"Disruption"
+			"Healing"
 		],
 		"IsDisabled": false,
@@ Line 6,248: / Line 6,368: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"SlowPercent": "30",
+		"BaseAttackDamagePercent": "15",
-		"GroundDashReductionPercent": "-20",
+		"BulletResist": "10",
-		"SlowDuration": "3.5",
+		"StealPerHit": "1",
-		"BonusFireRate": "7",
+		"StealPerKill": "1",
-		"BuildUpDuration": "5",
+		"StackLostPerDeath": "2",
-		"BuildUpPerShot": "0.77"
+		"MaxStacks": "9999",
+		"StealDuration": "20",
+		"ProcCooldown": "0.8",
+		"HealthSteal": "55",
+		"ParticleRadius": "1m"
 	},
-	"upgrade_slowing_tech": {
+	"upgrade_slow_immunity": {
-		"Name": "Slowing Spirit",
+		"Name": null,
-		"Description": "Dealing \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E applies \u003Cspan class=\"highlight\"\u003EMovement Slows\u003C/span\u003E to your target.",
+		"Description": "Purges any roots and chains on use and makes you immune to slows for the duration",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy",
-			"CreepEnemy"
-		],
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 32,
-		"AbilityDuration": "0",
+		"AbilityDuration": "6",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 6,282: / Line 6,403: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"SlowPercent": "15",
-		"SlowDuration": "2"
 	},
-	"upgrade_small_attack_speed": {
+	"upgrade_slowing_bullets": {
-		"Name": "Basic Fire Rate",
+		"Name": null,
-		"Description": "Increases your \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
+		"Description": "Your bullets build up a \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E on enemies.",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"HeroEnemy"
-		"IsDisabled": true,
+		],
+		"ShopFilters": [
+			"WeaponDamage",
+			"Disruption"
+		],
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 6,309: / Line 6,433: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusFireRate": "8"
+		"SlowPercent": "30",
+		"GroundDashReductionPercent": "-20",
+		"SlowDuration": "3.5",
+		"BonusFireRate": "7",
+		"BuildUpDuration": "5",
+		"BuildUpPerShot": "0.77"
 	},
-	"upgrade_soaring_spirit": {
+	"upgrade_slowing_tech": {
-		"Name": "Improved Spirit",
+		"Name": null,
-		"Description": null,
+		"Description": "Dealing \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E applies \u003Cspan class=\"highlight\"\u003EMovement Slows\u003C/span\u003E to your target.",
-		"Cost": "1600",
+		"Cost": "800",
-		"Tier": "2",
+		"Tier": "1",
 		"Activation": "Passive",
 		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_improved_spirit"
+		"TargetTypes": [
+			"HeroEnemy",
+			"CreepEnemy"
 		],
-		"TargetTypes": null,
+		"ShopFilters": null,
-		"ShopFilters": [
+		"IsDisabled": true,
-			"Movement",
-			"MagicDamage"
-		],
-		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 6,340: / Line 6,467: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "18",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusSprintSpeed": "1m",
+		"SlowPercent": "15",
-		"BonusHealth": "75",
+		"SlowDuration": "2"
-		"OutOfCombatHealthRegen": "1.5"
 	},
-	"upgrade_spellbreaker": {
+	"upgrade_small_attack_speed": {
-		"Name": "Spellbreaker",
+		"Name": null,
-		"Description": "The next instance of high spirit damage you take is significantly reduced.",
+		"Description": "Increases your \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"Durability"
+		"IsDisabled": true,
-		],
+		"AbilityCooldown": "0",
-		"IsDisabled": false,
-		"AbilityCooldown": "10",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 6,370: / Line 6,494: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechResist": "25",
+		"BonusFireRate": "8"
-		"StatusResistancePercent": "25",
-		"DamageThreshold": "150",
-		"SpiritDamageReductionProc": "75"
 	},
-	"upgrade_spellshield": {
+	"upgrade_soaring_spirit": {
-		"Name": "Hexafoil Ward",
+		"Name": null,
-		"Description": "Block the next \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E or \u003Cspan class=\"highlight\"\u003EDebuff\u003C/span\u003E, preventing its effects. Only regenerates outside of combat.",
+		"Description": null,
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
+			"upgrade_improved_spirit"
+		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Durability"
+			"Movement",
+			"MagicDamage"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": "12",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 6,401: / Line 6,525: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "18",
 		"WeaponPower": "0",
-		"TechResist": "15",
+		"BonusSprintSpeed": "1m",
-		"SpellShieldLingerDuration": ".3",
+		"BonusHealth": "75",
-		"SpellShieldFlavorText": "asdasd"
+		"OutOfCombatHealthRegen": "1.5"
 	},
-	"upgrade_spellslinger_headshots": {
+	"upgrade_spellbreaker": {
-		"Name": "Spirit Rend",
+		"Name": null,
-		"Description": null,
+		"Description": "The next instance of high spirit damage you take is significantly reduced.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_tech_defense_shredders"
+		"TargetTypes": null,
-		],
-		"TargetTypes": [
-			"AllEnemy"
-		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"Durability"
-			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "10",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 6,436: / Line 6,555: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ProcCooldown": "2.5",
+		"TechResist": "25",
-		"BonusHealth": "100",
+		"StatusResistancePercent": "25",
-		"MaxStacks": "4",
+		"DamageThreshold": "150",
-		"AbilityLifestealPercentHero": "8",
+		"SpiritDamageReductionProc": "75"
-		"MagicResistReduction": "-7",
+	},
-		"TechArmorDamageReduction": "-8",
+	"upgrade_spellshield": {
-		"DebuffDuration": "7"
+		"Name": null,
-	},
+		"Description": "Block the next \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E or \u003Cspan class=\"highlight\"\u003EDebuff\u003C/span\u003E, preventing its effects. Only regenerates outside of combat.",
-	"upgrade_spirit_bubble": {
+		"Cost": "3200",
-		"Name": "Spirit Shielding",
+		"Tier": "3",
-		"Description": "Gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E whenever you take significant {g:citadel_inline_attribute:'SpiritDamage'} from enemy Heroes in a small time frame.",
-		"Cost": "1600",
-		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Armor",
@@ Line 6,460: / Line 6,576: @@
 			"Durability"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": "35",
+		"AbilityCooldown": "12",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 6,470: / Line 6,586: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "1.3m",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DamageWindow": "3.5",
+		"TechResist": "15",
-		"DamageThreshold": "150",
+		"SpellShieldLingerDuration": ".3",
-		"CombatBarrier": "325",
+		"SpellShieldFlavorText": "asdasd"
-		"OutOfCombatHealthRegen": "2.5",
-		"BarrierDuration": "8",
-		"BonusMoveSpeed": "1.5m"
 	},
-	"upgrade_spirit_burn": {
+	"upgrade_spellslinger_headshots": {
-		"Name": "Spirit Burn",
+		"Name": null,
-		"Description": "Dealing significant \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E to an enemy within 5s causes an explosion dealing damage and a burn to nearby enemies.  While burning, enemies take damage over time and receive reduced healing.\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EDeals half-damage to non-heroes and does not expend its cooldown unless a hero is hit.\u003C/span\u003E",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
+			"upgrade_tech_defense_shredders"
+		],
 		"TargetTypes": [
 			"AllEnemy"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
-			"Durability"
+			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "20",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 6,506: / Line 6,621: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechRangeMultiplier": "10",
+		"ProcCooldown": "2.5",
-		"TechRadiusMultiplier": "10",
+		"BonusHealth": "100",
-		"DamageThreshold": "500",
+		"MaxStacks": "4",
-		"DamageThresholdDuration": "5",
+		"AbilityLifestealPercentHero": "8",
-		"ExplosionDamage": "120",
+		"MagicResistReduction": "-7",
-		"ExplosionRadius": "12m",
+		"TechArmorDamageReduction": "-8",
-		"DPS": "24",
+		"DebuffDuration": "7"
-		"DebuffDuration": "8",
-		"HealAmpReceivePenaltyPercent": "-70",
-		"HealAmpRegenPenaltyPercent": "-70",
-		"TickRate": "0.5",
-		"CooldownReductionPctOnNonHeroes": "100",
-		"DamagePctVsNonHeroes": "50"
 	},
-	"upgrade_spirit_sap": {
+	"upgrade_spirit_bubble": {
-		"Name": "Spirit Sap",
+		"Name": "Spirit Bubble",
-		"Description": "Target an enemy to \u003Cspan class=\"highlight\"\u003Ereduce their Spirit Resist\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.",
+		"Description": "Gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E whenever you take significant {g:citadel_inline_attribute:'SpiritDamage'} from enemy Heroes in a small time frame.",
 		"Cost": "1600",
 		"Tier": "2",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": [
-			"MagicDamage"
+			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "30",
+		"AbilityCooldown": "35",
-		"AbilityDuration": "12",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "40m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"MagicResistReduction": "-12",
+		"DamageWindow": "3.5",
-		"BonusHealth": "75",
+		"DamageThreshold": "150",
-		"TechPowerReduction": "-18"
+		"CombatBarrier": "325",
+		"OutOfCombatHealthRegen": "2.5",
+		"BarrierDuration": "8",
+		"BonusMoveSpeed": "1.5m"
 	},
-	"upgrade_spirit_snatch": {
+	"upgrade_spirit_burn": {
-		"Name": "Spirit Snatch",
+		"Name": null,
-		"Description": "When you perform a \u003Cspan class=\"highlight\"\u003ELight or Heavy Melee\u003C/span\u003E attack against a hero, the attack deals extra \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E and steals \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.\u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003ECooldown is 2x longer for Light Melee hits.\u003C/span\u003E",
+		"Description": "Dealing significant \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E to an enemy within 5s causes an explosion dealing damage and a burn to nearby enemies.  While burning, enemies take damage over time and receive reduced healing.\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003EDeals half-damage to non-heroes and does not expend its cooldown unless a hero is hit.\u003C/span\u003E",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "Passive",
 		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_acolytes_glove"
+		"TargetTypes": [
-		],
+			"AllEnemy"
-		"TargetTypes": [
-			"HeroEnemy"
 		],
 		"ShopFilters": [
 			"MagicDamage",
-			"Melee"
+			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 6,
+		"AbilityCooldown": "20",
-		"AbilityDuration": "14",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 6,583: / Line 6,691: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"LightMeleeCooldownMult": "2",
+		"TechRangeMultiplier": "10",
-		"SpiritDamage": "75",
+		"TechRadiusMultiplier": "10",
-		"TechArmorDamageReduction": "-15",
+		"DamageThreshold": "500",
-		"TechArmorGain": "15",
+		"DamageThresholdDuration": "5",
-		"TechPowerReduction": "-15",
+		"ExplosionDamage": "120",
-		"TechPowerGain": "15",
+		"ExplosionRadius": "12m",
-		"BonusMeleeDamagePercent": "10",
+		"DPS": "24",
-		"BonusHealth": "100"
+		"DebuffDuration": "8",
+		"HealAmpReceivePenaltyPercent": "-70",
+		"HealAmpRegenPenaltyPercent": "-70",
+		"TickRate": "0.5",
+		"CooldownReductionPctOnNonHeroes": "100",
+		"DamagePctVsNonHeroes": "50"
 	},
-	"upgrade_split_shot": {
+	"upgrade_spirit_sap": {
-		"Name": "Split Shot",
+		"Name": null,
-		"Description": "Make your weapon fire \u003Cspan class=\"highlight\"\u003Emultishot\u003C/span\u003E. \u003Cbr\u003E\u003Cbr\u003E Hitting more than one Hero per attack will grant a \u003Cspan class=\"highlight\"\u003Estacking weapon damage bonus\u003C/span\u003E.  \u003Cbr\u003E\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003ETargets can only be hit once per multishot.\u003C/span\u003E",
+		"Description": "Target an enemy to \u003Cspan class=\"highlight\"\u003Ereduce their Spirit Resist\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.",
 		"Cost": "1600",
 		"Tier": "2",
-		"Activation": "InstantCast",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": [
-			"WeaponDamage"
+			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "14",
+		"AbilityCooldown": "30",
-		"AbilityDuration": "0",
+		"AbilityDuration": "12",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "40m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusBulletSpeedPercent": "0",
+		"MagicResistReduction": "-12",
-		"BonusShotsDuration": "5",
+		"BonusHealth": "75",
-		"BulletSplitShot": "5",
+		"TechPowerReduction": "-18"
-		"SpreadAngleDegrees": "45",
-		"SpecialShotsBonusFireRate": "0",
-		"WeaponDamageBonusDuration": "12",
-		"WeaponDamagePerStack": "10",
-		"MaxStacks": "6"
 	},
-	"upgrade_sprint_booster": {
+	"upgrade_spirit_snatch": {
-		"Name": "Sprint Boots",
+		"Name": null,
-		"Description": "Increases your \u003Cspan class=\"highlight\"\u003Eforward move speed\u003C/span\u003E over time. Taking damage resets the effect for \u003Cspan class=\"highlight\"\u003E1.5s\u003C/span\u003E",
+		"Description": "When you perform a \u003Cspan class=\"highlight\"\u003ELight or Heavy Melee\u003C/span\u003E attack against a hero, the attack deals extra \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E and steals \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.\u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003ECooldown is 2x longer for Light Melee hits.\u003C/span\u003E",
-		"Cost": "800",
+		"Cost": "3200",
-		"Tier": "1",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_acolytes_glove"
+		],
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"MagicDamage",
-			"Healing",
+			"Melee"
-			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 6,
-		"AbilityDuration": "0",
+		"AbilityDuration": "14",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 6,655: / Line 6,768: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusSprintSpeed": "2m",
+		"LightMeleeCooldownMult": "2",
-		"OutOfCombatHealthRegen": "2"
+		"SpiritDamage": "75",
+		"TechArmorDamageReduction": "-15",
+		"TechArmorGain": "15",
+		"TechPowerReduction": "-15",
+		"TechPowerGain": "15",
+		"BonusMeleeDamagePercent": "10",
+		"BonusHealth": "100"
 	},
-	"upgrade_stabilizer": {
+	"upgrade_split_shot": {
-		"Name": "Stabilizer",
+		"Name": "Split Shot",
-		"Description": "Removes the \u003Cspan class=\"highlight\"\u003Emove speed penalty\u003C/span\u003E while shooting, and increases \u003Cspan class=\"highlight\"\u003Ebullet speed\u003C/span\u003E.",
+		"Description": "Make your weapon fire \u003Cspan class=\"highlight\"\u003Emultishot\u003C/span\u003E. \u003Cbr\u003E\u003Cbr\u003E Hitting more than one Hero per attack will grant a \u003Cspan class=\"highlight\"\u003Estacking weapon damage bonus\u003C/span\u003E.  \u003Cbr\u003E\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003ETargets can only be hit once per multishot.\u003C/span\u003E",
-		"Cost": "800",
+		"Cost": "1600",
-		"Tier": "1",
+		"Tier": "2",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
 		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage"
-		"AbilityCooldown": "0",
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "14",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 6,682: / Line 6,803: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"MoveWhileShootingSpeedPenaltyReductionPercent": "100",
+		"BonusBulletSpeedPercent": "0",
-		"MoveWhileZoomedSpeedPenaltyReductionPercent": "100",
+		"BonusShotsDuration": "5",
-		"BonusBulletSpeedPercent": "30"
+		"BulletSplitShot": "5",
+		"SpreadAngleDegrees": "45",
+		"SpecialShotsBonusFireRate": "0",
+		"WeaponDamageBonusDuration": "12",
+		"WeaponDamagePerStack": "10",
+		"MaxStacks": "6"
 	},
-	"upgrade_stabilizing_tripod": {
+	"upgrade_sprint_booster": {
-		"Name": "Stabilizing Tripod",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003EDisarm yourself\u003C/span\u003E to toss your weapon to the target location where it transforms into a \u003Cspan class=\"highlight\"\u003EField Sentry that will attack enemies using your weapon with an unlimited clip\u003C/span\u003E.  You can melee the sentry to end the effect early.",
+		"Description": "Increases your \u003Cspan class=\"highlight\"\u003Eforward move speed\u003C/span\u003E over time. Taking damage resets the effect for \u003Cspan class=\"highlight\"\u003E1.5s\u003C/span\u003E",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"AllEnemy"
+		"ShopFilters": [
+			"WeaponDamage",
+			"Healing",
+			"Movement"
 		],
-		"ShopFilters": null,
+		"IsDisabled": false,
-		"IsDisabled": true,
+		"AbilityCooldown": "0",
-		"AbilityCooldown": 64,
+		"AbilityDuration": "0",
-		"AbilityDuration": "20",
+		"AbilityCastRange": "0",
-		"AbilityCastRange": "15m",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 6,712: / Line 6,840: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ModelScale": "1.0",
+		"BonusSprintSpeed": "2m",
-		"TickRate": "0.5",
+		"OutOfCombatHealthRegen": "2"
-		"TrackingSpeed": "125",
-		"TurretAttackDelay": "0.35",
-		"TurretAttackRange": "50m",
-		"TurretDeployTime": "2.0",
-		"TurretLifetime": "20",
-		"AttackConeAngle": "10",
-		"StationaryWeaponPower": "40",
-		"StationaryRecoilReduction": "25",
-		"CasterHealthPercent": "100",
-		"BulletSpeedOverride": "6500"
 	},
-	"upgrade_stasis_bomb": {
+	"upgrade_stabilizer": {
-		"Name": "Stasis Bomb",
+		"Name": null,
-		"Description": null,
+		"Description": "Removes the \u003Cspan class=\"highlight\"\u003Emove speed penalty\u003C/span\u003E while shooting, and increases \u003Cspan class=\"highlight\"\u003Ebullet speed\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "800",
-		"Tier": "4",
+		"Tier": "1",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": 37,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "6",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "20m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 6,749: / Line 6,867: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"StasisRadius": "7m",
+		"MoveWhileShootingSpeedPenaltyReductionPercent": "100",
-		"ExplodeRadius": "7m",
+		"MoveWhileZoomedSpeedPenaltyReductionPercent": "100",
-		"ExplodeDamage": "250",
+		"BonusBulletSpeedPercent": "30"
-		"StunDuration": "1.5",
-		"ImmunityDuration": "4",
-		"EMPDuration": "3",
-		"EMPProcChance": "100",
-		"BuildUpPerShot": "1.6",
-		"BuildUpDuration": "10",
-		"DampingFactor": "0.5",
-		"MaxFallSpeed": "0",
-		"LiftHeight": "120",
-		"SlamdownSpeed": "500",
-		"MoveSpeedMax": "4m"
 	},
-	"upgrade_superacolytes_glove": {
+	"upgrade_stabilizing_tripod": {
-		"Name": "Hex-Sealed Knuckles",
+		"Name": null,
-		"Description": "After dealing an accumulated \u003Cspan class=\"highlight\"\u003E{s:StoredSpiritDamage}\u003C/span\u003E spirit damage, your next \u003Cspan class=\"highlight\"\u003EHeavy Melee Attack\u003C/span\u003E deals an additional \u003Cspan class=\"highlight\"\u003E{s:StoredSpiritDamage} spirit damage\u003C/span\u003E.",
+		"Description": "\u003Cspan class=\"highlight\"\u003EDisarm yourself\u003C/span\u003E to toss your weapon to the target location where it transforms into a \u003Cspan class=\"highlight\"\u003EField Sentry that will attack enemies using your weapon with an unlimited clip\u003C/span\u003E.  You can melee the sentry to end the effect early.",
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
-		],
-		"ShopFilters": [
-			"MagicDamage",
-			"Melee"
 		],
+		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": "3",
+		"AbilityCooldown": 64,
-		"AbilityDuration": "13",
+		"AbilityDuration": "20",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "15m",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 6,793: / Line 6,897: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"StoredSpiritDamage": "200",
+		"ModelScale": "1.0",
-		"BonusHealth": "75",
+		"TickRate": "0.5",
-		"BonusHealthRegen": "1",
+		"TrackingSpeed": "125",
-		"BonusMeleeDamagePercent": "30"
+		"TurretAttackDelay": "0.35",
+		"TurretAttackRange": "50m",
+		"TurretDeployTime": "2.0",
+		"TurretLifetime": "20",
+		"AttackConeAngle": "10",
+		"StationaryWeaponPower": "40",
+		"StationaryRecoilReduction": "25",
+		"CasterHealthPercent": "100",
+		"BulletSpeedOverride": "6500"
 	},
-	"upgrade_superior_stamina": {
+	"upgrade_stasis_bomb": {
-		"Name": "Stamina Mastery",
+		"Name": null,
 		"Description": null,
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
 		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_improved_stamina"
-		],
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"MagicDamage",
+		"IsDisabled": true,
-			"Movement",
+		"AbilityCooldown": 37,
-			"FireRate"
+		"AbilityDuration": "6",
-		],
+		"AbilityCastRange": "20m",
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
 		"AbilityCastDelay": "0",
@@ Line 6,828: / Line 6,934: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"Stamina": "2",
+		"StasisRadius": "7m",
-		"StaminaCooldownReduction": "20",
+		"ExplodeRadius": "7m",
-		"AirMoveIncreasePercent": "30"
+		"ExplodeDamage": "250",
+		"StunDuration": "1.5",
+		"ImmunityDuration": "4",
+		"EMPDuration": "3",
+		"EMPProcChance": "100",
+		"BuildUpPerShot": "1.6",
+		"BuildUpDuration": "10",
+		"DampingFactor": "0.5",
+		"MaxFallSpeed": "0",
+		"LiftHeight": "120",
+		"SlamdownSpeed": "500",
+		"MoveSpeedMax": "4m"
 	},
-	"upgrade_suppressor": {
+	"upgrade_superacolytes_glove": {
-		"Name": "Suppressor",
+		"Name": null,
-		"Description": "When you deal \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E to enemies, you also reduce their \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
+		"Description": "After dealing an accumulated \u003Cspan class=\"highlight\"\u003E{s:StoredSpiritDamage}\u003C/span\u003E spirit damage, your next \u003Cspan class=\"highlight\"\u003EHeavy Melee Attack\u003C/span\u003E deals an additional \u003Cspan class=\"highlight\"\u003E{s:StoredSpiritDamage} spirit damage\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroEnemy"
 		],
 		"ShopFilters": [
-			"Healing",
+			"MagicDamage",
-			"Disruption"
+			"Melee"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "3",
-		"AbilityDuration": "4",
+		"AbilityDuration": "13",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 6,861: / Line 6,978: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "6",
+		"TechPower": "0",
 		"WeaponPower": "0",
-		"FireRateSlow": "30",
+		"StoredSpiritDamage": "200",
-		"BonusHealth": "75"
+		"BonusHealth": "75",
+		"BonusHealthRegen": "1",
+		"BonusMeleeDamagePercent": "30"
 	},
-	"upgrade_surging_power": {
+	"upgrade_superior_stamina": {
-		"Name": "Vampiric Burst",
+		"Name": null,
 		"Description": null,
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": [
-			"upgrade_vampire"
+			"upgrade_improved_stamina"
-		],
-		"TargetTypes": [
-			"HeroFriendly"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"FireRate",
+			"MagicDamage",
-			"WeaponDamage",
 			"Movement",
-			"Healing"
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 30,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "4.5",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 6,897: / Line 7,013: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"ActiveBonusFireRate": "40",
+		"Stamina": "2",
-		"ActiveBonusLifesteal": "80",
+		"StaminaCooldownReduction": "20",
-		"BonusHealth": "100",
+		"AirMoveIncreasePercent": "30"
-		"ActiveReloadPercent": "75",
-		"BulletResist": "10",
-		"BulletLifestealPercent": "16"
 	},
-	"upgrade_target_stun": {
+	"upgrade_suppressor": {
-		"Name": "Knockdown",
+		"Name": null,
-		"Description": "Apply a \u003Cspan class=\"highlight\"\u003EStun\u003C/span\u003E after \u003Cspan class=\"highlight\"\u003E2s\u003C/span\u003E. Stun duration is increased against \u003Cspan class=\"highlight\"\u003Eairborne\u003C/span\u003E targets.",
+		"Description": "When you deal \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E to enemies, you also reduce their \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
-		"Activation": "Press",
+		"Activation": "Passive",
 		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"Healing",
 			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 35,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "4",
-		"AbilityCastRange": "45m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
-		"TechPower": "0",
+		"TechPower": "6",
 		"WeaponPower": "0",
-		"StunDelay": "2",
+		"FireRateSlow": "30",
-		"StunDuration": "0.5",
+		"BonusHealth": "75"
-		"VisualContractRadius": "3m",
-		"BonusHealth": "100",
-		"MaxBonusDuration": "1.5",
-		"MaxHeightForBonus": "30m",
-		"TechRangeMultiplier": "6",
-		"TechRadiusMultiplier": "6"
 	},
-	"upgrade_targeted_silence": {
+	"upgrade_surging_power": {
-		"Name": "Silence Wave",
+		"Name": null,
-		"Description": "Launch an expanding projectile which \u003Cspan class=\"highlight\"\u003ESilences\u003C/span\u003E enemies for a short duration. Affected enemies also have their \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E reduced for a longer duration. \u003Cbr\u003E\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003ESilence does not interrupt channeling abilities.\u003C/span\u003E",
+		"Description": null,
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": [
-			"upgrade_spirit_sap"
+			"upgrade_vampire"
 		],
 		"TargetTypes": [
-			"HeroEnemy"
+			"HeroFriendly"
 		],
 		"ShopFilters": [
+			"FireRate",
 			"WeaponDamage",
-			"Disruption"
+			"Movement",
+			"Healing"
 		],
 		"IsDisabled": false,
 		"AbilityCooldown": 30,
-		"AbilityDuration": "3.75",
+		"AbilityDuration": "4.5",
-		"AbilityCastRange": "40m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "75",
+		"ActiveBonusFireRate": "40",
-		"CooldownOnMiss": 30,
+		"ActiveBonusLifesteal": "80",
-		"HeightOffGround": "1m",
+		"BonusHealth": "100",
-		"GrowthPerMeter": "0.135m",
+		"ActiveReloadPercent": "75",
-		"InitialWidth": "4.5m",
+		"BulletResist": "10",
-		"MagicResistReduction": "-12",
+		"BulletLifestealPercent": "16"
-		"Damage": "0",
-		"ResistReductionDuration": "12",
-		"TechPowerReduction": "-18"
 	},
-	"upgrade_tech_armor": {
+	"upgrade_target_stun": {
-		"Name": "Spirit Armor",
+		"Name": null,
-		"Description": "Reduces the damage you take from \u003Cspan class=\"highlight\"\u003ESpirit\u003C/span\u003E abilities.",
+		"Description": "Apply a \u003Cspan class=\"highlight\"\u003EStun\u003C/span\u003E after \u003Cspan class=\"highlight\"\u003E2s\u003C/span\u003E. Stun duration is increased against \u003Cspan class=\"highlight\"\u003Eairborne\u003C/span\u003E targets.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": [
 			"MagicDamage",
-			"Durability"
+			"Disruption"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 35,
 		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "45m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechResist": "15"
+		"StunDelay": "2",
+		"StunDuration": "0.5",
+		"VisualContractRadius": "3m",
+		"BonusHealth": "100",
+		"MaxBonusDuration": "1.5",
+		"MaxHeightForBonus": "30m",
+		"TechRangeMultiplier": "6",
+		"TechRadiusMultiplier": "6"
 	},
-	"upgrade_tech_bleed": {
+	"upgrade_targeted_silence": {
-		"Name": "Mystic Reverb",
+		"Name": null,
-		"Description": "Imbue an ability to apply \u003Cspan class=\"highlight\"\u003Eslow\u003C/span\u003E on a hit target and deal an \u003Cspan class=\"highlight\"\u003Eadditional percentage of the damage dealt\u003C/span\u003E to enemies around the target after a short delay.",
+		"Description": "Launch an expanding projectile which \u003Cspan class=\"highlight\"\u003ESilences\u003C/span\u003E enemies for a short duration. Affected enemies also have their \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E reduced for a longer duration. \u003Cbr\u003E\u003Cbr\u003E\u003Cspan class=\"diminish\"\u003ESilence does not interrupt channeling abilities.\u003C/span\u003E",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
 		"Slot": "Tech",
-		"Components": null,
+		"Components": [
+			"upgrade_spirit_sap"
+		],
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroEnemy"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
-			"Healing"
+			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 6.25,
+		"AbilityCooldown": 30,
-		"AbilityDuration": "0",
+		"AbilityDuration": "3.75",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "40m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechDamagePercent": "50",
+		"BonusHealth": "75",
-		"DelayDuration": "3",
+		"CooldownOnMiss": 30,
-		"MinimumDamage": "100",
+		"HeightOffGround": "1m",
-		"Radius": "16m",
+		"GrowthPerMeter": "0.135m",
-		"AbilityLifestealPercentHero": "15",
+		"InitialWidth": "4.5m",
-		"MovementSpeedSlow": "40",
+		"MagicResistReduction": "-12",
-		"MaxHealthDamage": "10"
+		"Damage": "0",
+		"ResistReductionDuration": "12",
+		"TechPowerReduction": "-18"
 	},
-	"upgrade_tech_cleave": {
+	"upgrade_tech_armor": {
-		"Name": "Quantum Chimaera",
+		"Name": null,
-		"Description": "Your Tech attacks strike additional nearby enemies for \u003Cspan class=\"highlight\"\u003E75% of the total damage\u003C/span\u003E.",
+		"Description": "Reduces the damage you take from \u003Cspan class=\"highlight\"\u003ESpirit\u003C/span\u003E abilities.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
+			"MagicDamage",
+			"Durability"
+		],
 		"IsDisabled": true,
 		"AbilityCooldown": "0",
@@ Line 7,073: / Line 7,195: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechCleaveDamagePercent": "75",
+		"TechResist": "15"
-		"TechCleaveRadius": "10m",
-		"ProcCooldown": "0.05"
 	},
-	"upgrade_tech_damage_pulse": {
+	"upgrade_tech_bleed": {
-		"Name": "Torment Pulse",
+		"Name": null,
-		"Description": "Periodically deals \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E to the closest two enemies nearby.",
+		"Description": "Imbue an ability to apply \u003Cspan class=\"highlight\"\u003Eslow\u003C/span\u003E on a hit target and deal an \u003Cspan class=\"highlight\"\u003Eadditional percentage of the damage dealt\u003C/span\u003E to enemies around the target after a short delay.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "Passive",
 		"Slot": "Tech",
@@ Line 7,094: / Line 7,214: @@
 		"ShopFilters": [
 			"MagicDamage",
-			"Durability"
+			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 1.5,
+		"AbilityCooldown": 6.25,
+		"AbilityDuration": "0",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"TechDamagePercent": "50",
+		"DelayDuration": "3",
+		"MinimumDamage": "100",
+		"Radius": "16m",
+		"AbilityLifestealPercentHero": "15",
+		"MovementSpeedSlow": "40",
+		"MaxHealthDamage": "10"
+	},
+	"upgrade_tech_cleave": {
+		"Name": null,
+		"Description": "Your Tech attacks strike additional nearby enemies for \u003Cspan class=\"highlight\"\u003E75% of the total damage\u003C/span\u003E.",
+		"Cost": "3200",
+		"Tier": "3",
+		"Activation": "Passive",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityCooldown": "0",
+		"AbilityDuration": "0",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"TechCleaveDamagePercent": "75",
+		"TechCleaveRadius": "10m",
+		"ProcCooldown": "0.05"
+	},
+	"upgrade_tech_damage_pulse": {
+		"Name": null,
+		"Description": "Periodically deals \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E to the closest two enemies nearby.",
+		"Cost": "3200",
+		"Tier": "3",
+		"Activation": "Passive",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Durability"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 1.5,
+		"AbilityDuration": "0",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"BonusHealth": "125",
+		"DamagePulseAmount": "27",
+		"DamagePulseRadius": "9m",
+		"MeleeResistPercent": "15"
+	},
+	"upgrade_tech_defender": {
+		"Name": null,
+		"Description": null,
+		"Cost": "6400",
+		"Tier": "4",
+		"Activation": "InstantCast",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityCooldown": 95,
+		"AbilityDuration": "6",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"BonusHealth": "85",
+		"TechArmor": "1"
+	},
+	"upgrade_tech_defense_shredders": {
+		"Name": null,
+		"Description": "Your bullets apply a debuff that reduces the \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E of the target and grants you and your allies \u003Cspan class=\"highlight\"\u003ESpirit Lifesteal\u003C/span\u003E against them.",
+		"Cost": "1600",
+		"Tier": "2",
+		"Activation": "Passive",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Healing"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
+		"AbilityDuration": "0",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"TechArmorDamageReduction": "-8",
+		"DebuffDuration": "8",
+		"AbilityLifestealPercentHero": "8"
+	},
+	"upgrade_tech_overflow": {
+		"Name": null,
+		"Description": "Gain bonus \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E by \u003Cspan class=\"highlight\"\u003Echarging up\u003C/span\u003E when shooting enemy heroes.",
+		"Cost": "6400",
+		"Tier": "4",
+		"Activation": "Passive",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"FireRate"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
+		"AbilityDuration": "15",
+		"AbilityCastRange": "0",
+		"AbilityUnitTargetLimit": "1",
+		"AbilityCastDelay": "0",
+		"AbilityChannelTime": "0",
+		"AbilityPostCastDuration": "0",
+		"AbilityCharges": "0",
+		"AbilityCooldownBetweenCharge": "0",
+		"ChannelMoveSpeed": "-1",
+		"AbilityResourceCost": "0",
+		"TechPower": "0",
+		"WeaponPower": "0",
+		"AbilityLifestealPercentHero": "15",
+		"BonusFireRate": "30",
+		"BonusSpirit": "30",
+		"BonusAbilityDurationPercent": "20",
+		"BuildUpPerShot": "0.75",
+		"BuildUpDuration": "5"
+	},
+	"upgrade_tech_purge": {
+		"Name": "Spirit Resilience",
+		"Description": "When below \u003Cspan class=\"highlight\"\u003E30% health\u003C/span\u003E, gain additional Spirit Resist.",
+		"Cost": "3200",
+		"Tier": "3",
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": [
+			"Durability"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 7,106: / Line 7,418: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "125",
+		"TechResist": "25",
-		"DamagePulseAmount": "27",
+		"HealthThreshold": "30",
-		"DamagePulseRadius": "9m",
+		"TechResistBelowThreshold": "30"
-		"MeleeResistPercent": "15"
 	},
-	"upgrade_tech_defender": {
+	"upgrade_tech_range": {
-		"Name": "Tech Defender",
+		"Name": null,
-		"Description": null,
+		"Description": "Increases the \u003Cspan class=\"highlight\"\u003Erange\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eeffect radius\u003C/span\u003E of your abilities and items.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
+			"upgrade_magic_reach"
+		],
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"MagicDamage",
-		"AbilityCooldown": 95,
+			"Durability"
-		"AbilityDuration": "6",
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,135: / Line 7,451: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "85",
+		"TechRangeMultiplier": "35",
-		"TechArmor": "1"
+		"TechRadiusMultiplier": "35",
+		"TechResist": "8"
 	},
-	"upgrade_tech_defense_shredders": {
+	"upgrade_thermal_detonator": {
-		"Name": "Spirit Shredder Bullets",
+		"Name": null,
-		"Description": "Your bullets apply a debuff that reduces the \u003Cspan class=\"highlight\"\u003ESpirit Resist\u003C/span\u003E of the target and grants you and your allies \u003Cspan class=\"highlight\"\u003ESpirit Lifesteal\u003C/span\u003E against them.",
+		"Description": "Throw a flask that explodes on contact, creating an area that does increasing \u003Cspan class=\"highlight\"\u003ESpirit Damage per second\u003C/span\u003E and reduces enemy \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.\u003Cbr\u003E\u003Cbr\u003E50% less effective vs non-heroes.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "Press",
 		"Slot": "Weapon",
 		"Components": null,
@@ Line 7,154: / Line 7,471: @@
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
-			"Healing"
+			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 30,
-		"AbilityDuration": "0",
+		"AbilityDuration": "5",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.2",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechArmorDamageReduction": "-8",
+		"DPS": "45",
-		"DebuffDuration": "8",
+		"DPSIncrease": "7",
-		"AbilityLifestealPercentHero": "8"
+		"DPSMax": "95",
+		"NonHeroReductionPercent": "50",
+		"Radius": "10m",
+		"HeightOffGround": "50",
+		"TickRate": "0.5",
+		"BulletArmorReduction": "-8",
+		"SpiritPower": "8"
 	},
-	"upgrade_tech_overflow": {
+	"upgrade_titan_round": {
-		"Name": "Spiritual Overflow",
+		"Name": null,
-		"Description": "Gain bonus \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E by \u003Cspan class=\"highlight\"\u003Echarging up\u003C/span\u003E when shooting enemy heroes.",
+		"Description": null,
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Weapon",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_clip_size"
-			"HeroEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"ClipSize",
-			"FireRate"
+			"WeaponDamage"
 		],
 		"IsDisabled": false,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "15",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,200: / Line 7,523: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"AbilityLifestealPercentHero": "15",
+		"BonusClipSizePercent": "90",
-		"BonusFireRate": "30",
+		"BaseAttackDamagePercent": "12"
-		"BonusSpirit": "30",
-		"BonusAbilityDurationPercent": "20",
-		"BuildUpPerShot": "0.75",
-		"BuildUpDuration": "5"
 	},
-	"upgrade_tech_purge": {
+	"upgrade_toughness_3": {
-		"Name": "Spirit Resilience",
+		"Name": null,
-		"Description": "When below \u003Cspan class=\"highlight\"\u003E30% health\u003C/span\u003E, gain additional Spirit Resist.",
+		"Description": "Increases \u003Cspan class=\"highlight\"\u003EHealth\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Ehealth regen\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"Durability"
+		"IsDisabled": true,
-		],
-		"IsDisabled": false,
 		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
@@ Line 7,233: / Line 7,550: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechResist": "25",
+		"BonusHealth": "125",
-		"HealthThreshold": "30",
+		"BonusHealthRegen": "2"
-		"TechResistBelowThreshold": "30"
 	},
-	"upgrade_tech_range": {
+	"upgrade_toxic_bullets": {
-		"Name": "Greater Expansion",
+		"Name": null,
-		"Description": "Increases the \u003Cspan class=\"highlight\"\u003Erange\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eeffect radius\u003C/span\u003E of your abilities and items.",
+		"Description": "Your bullets build up a \u003Cspan class=\"highlight\"\u003EBleed\u003C/span\u003E on enemies, causing them to lose a \u003Cspan class=\"highlight\"\u003Epercentage\u003C/span\u003E of their \u003Cspan class=\"highlight\"\u003EMax Health\u003C/span\u003E over time. Also applies \u003Cspan class=\"highlight\"\u003EHealing Reduction\u003C/span\u003E on the bleeding target.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_magic_reach"
+		"TargetTypes": [
+			"HeroEnemy",
+			"CreepEnemy",
+			"MinionEnemy"
 		],
-		"TargetTypes": null,
 		"ShopFilters": [
 			"MagicDamage",
-			"Durability"
+			"Disruption"
 		],
 		"IsDisabled": false,
@@ Line 7,266: / Line 7,584: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"TechRangeMultiplier": "35",
+		"DotHealthPercent": "2.1",
-		"TechRadiusMultiplier": "35",
+		"DotDuration": "3",
-		"TechResist": "8"
+		"BuildUpPerShot": "1.058",
+		"BuildUpDuration": "5",
+		"TickRate": "0.5",
+		"HealAmpReceivePenaltyPercent": "-30",
+		"HealAmpRegenPenaltyPercent": "-30",
+		"DotMultiplerTroopers": "0.5"
 	},
-	"upgrade_thermal_detonator": {
+	"upgrade_transcendent_cooldown": {
-		"Name": "Alchemical Fire",
+		"Name": null,
-		"Description": "Throw a flask that explodes on contact, creating an area that does increasing \u003Cspan class=\"highlight\"\u003ESpirit Damage per second\u003C/span\u003E and reduces enemy \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.\u003Cbr\u003E\u003Cbr\u003E50% less effective vs non-heroes.",
+		"Description": "Reduces the \u003Cspan class=\"highlight\"\u003ECooldown\u003C/span\u003E of your abilities and items.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_cooldown_reduction"
-			"AllEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"Healing"
-			"MagicDamage"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 30,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "5",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.2",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DPS": "45",
+		"CooldownReduction": "30",
-		"DPSIncrease": "7",
+		"ItemCooldownReduction": "30",
-		"DPSMax": "95",
+		"OutOfCombatHealthRegen": "4"
-		"NonHeroReductionPercent": "50",
-		"Radius": "10m",
-		"HeightOffGround": "50",
-		"TickRate": "0.5",
-		"BulletArmorReduction": "-8",
-		"SpiritPower": "8"
 	},
-	"upgrade_titan_round": {
+	"upgrade_trophy_collector": {
-		"Name": "Titanic Magazine",
+		"Name": "Trophy Collector",
-		"Description": null,
+		"Description": "Whenever you score an \u003Cspan class=\"highlight\"\u003Eassist or kill\u003C/span\u003E, gain extra \u003Cspan class=\"highlight\"\u003Ehealth\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003Esprint\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003Eability range\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Epassive soul generation\u003C/span\u003E. This effect stacks and persists through death.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": [
-			"upgrade_clip_size"
+			"upgrade_sprint_booster"
 		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"ClipSize",
+			"WeaponDamage",
-			"WeaponDamage"
+			"Healing",
+			"Movement"
 		],
 		"IsDisabled": false,
@@ Line 7,338: / Line 7,655: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSizePercent": "90",
+		"BonusSprintSpeed": "2m",
-		"BaseAttackDamagePercent": "12"
+		"OutOfCombatHealthRegen": "3.5",
+		"StackingBonusHealth": "25",
+		"StackingBonusSprintSpeed": "0.2m",
+		"StackingTechRangeMultiplier": "1",
+		"StackingTechRadiusMultiplier": "1",
+		"StackingGoldPerMinute": "23",
+		"ThinkRate": "3",
+		"MaxStacks": "16"
 	},
-	"upgrade_toughness_3": {
+	"upgrade_ultimate_burst": {
-		"Name": "Toughness",
+		"Name": null,
-		"Description": "Increases \u003Cspan class=\"highlight\"\u003EHealth\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Ehealth regen\u003C/span\u003E.",
+		"Description": "Damage from your ultimate applies a {g:citadel_inline_attribute:'Stun'} and deals {g:citadel_inline_attribute:'BonusSpiritDamage'} after a short delay.\u003C/span\u003E",
-		"Cost": "1600",
+		"Cost": "6400",
-		"Tier": "2",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": null,
+			"upgrade_magic_slow"
-		"ShopFilters": null,
+		],
-		"IsDisabled": true,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Disruption"
+		],
+		"IsDisabled": false,
 		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
+		"AbilityDuration": "2",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,365: / Line 7,696: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "125",
+		"SlowDuration": "0",
-		"BonusHealthRegen": "2"
+		"Damage": "150",
+		"SlowPercent": "80",
+		"BonusHealth": "75",
+		"StunDuration": "0.75",
+		"DelayBeforeStun": "3",
+		"BonusSprintSpeed": "1m",
+		"MovementSpeedSlow": "30"
 	},
-	"upgrade_toxic_bullets": {
+	"upgrade_unstoppable": {
-		"Name": "Toxic Bullets",
+		"Name": null,
-		"Description": "Your bullets build up a \u003Cspan class=\"highlight\"\u003EBleed\u003C/span\u003E on enemies, causing them to lose a \u003Cspan class=\"highlight\"\u003Epercentage\u003C/span\u003E of their \u003Cspan class=\"highlight\"\u003EMax Health\u003C/span\u003E over time. Also applies \u003Cspan class=\"highlight\"\u003EHealing Reduction\u003C/span\u003E on the bleeding target.",
+		"Description": "Temporarily suppress \u003Cspan class=\"highlight\"\u003Enegative status effects\u003C/span\u003E and become \u003Cspan class=\"highlight\"\u003Eimmune\u003C/span\u003E to \u003Cspan class=\"highlight\"\u003EStun, Silence, Sleep, Root, and Disarm\u003C/span\u003E. \u003Cbr\u003ECannot be used while \u003Cspan class=\"highlight\"\u003EStunned\u003C/span\u003E or \u003Cspan class=\"highlight\"\u003ESlept\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Armor",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_debuff_reducer"
-			"HeroEnemy",
-			"CreepEnemy",
-			"MinionEnemy"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"Durability",
-			"Disruption"
+			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 65,
-		"AbilityDuration": "0",
+		"AbilityDuration": "5",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,399: / Line 7,734: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"DotHealthPercent": "2.1",
+		"BonusHealth": "75",
-		"DotDuration": "3",
+		"StatusResistancePercent": "20"
-		"BuildUpPerShot": "1.058",
-		"BuildUpDuration": "5",
-		"TickRate": "0.5",
-		"HealAmpReceivePenaltyPercent": "-30",
-		"HealAmpRegenPenaltyPercent": "-30",
-		"DotMultiplerTroopers": "0.5"
 	},
-	"upgrade_transcendent_cooldown": {
+	"upgrade_vampire": {
-		"Name": "Transcendent Cooldown",
+		"Name": null,
-		"Description": "Reduces the \u003Cspan class=\"highlight\"\u003ECooldown\u003C/span\u003E of your abilities and items.",
+		"Description": "Your \u003Cspan class=\"highlight\"\u003Ebullets heal you\u003C/span\u003E for a percentage of the damage they deal to enemies. Half as effective vs Non-Heroes.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_cooldown_reduction"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
+			"Durability",
 			"Healing"
 		],
@@ Line 7,436: / Line 7,764: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"CooldownReduction": "30",
+		"BulletLifestealPercent": "16",
-		"ItemCooldownReduction": "30",
+		"BonusHealth": "90"
-		"OutOfCombatHealthRegen": "4"
 	},
-	"upgrade_trophy_collector": {
+	"upgrade_veil_walker": {
-		"Name": "Trophy Collector",
+		"Name": null,
-		"Description": "Whenever you score an \u003Cspan class=\"highlight\"\u003Eassist or kill\u003C/span\u003E, gain extra \u003Cspan class=\"highlight\"\u003Ehealth\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003Esprint\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003Eability range\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Epassive soul generation\u003C/span\u003E. This effect stacks and persists through death.",
+		"Description": "Walking through a \u003Cspan class=\"highlight\"\u003Ecosmic veil\u003C/span\u003E grants you \u003Cspan class=\"highlight\"\u003EStealth\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003EHeal\u003C/span\u003E and increased \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E.",
 		"Cost": "3200",
 		"Tier": "3",
 		"Activation": "Passive",
 		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_sprint_booster"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"Durability",
-			"Healing",
+			"ClipSize"
-			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 12,
-		"AbilityDuration": "0",
+		"AbilityDuration": "16",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,470: / Line 7,794: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusSprintSpeed": "2m",
+		"InvisAlertWhenFading": "1",
-		"OutOfCombatHealthRegen": "3.5",
+		"InvisCancelOnDamage": "0",
-		"StackingBonusHealth": "25",
+		"InvisFadeToDuration": "0",
-		"StackingBonusSprintSpeed": "0.2m",
+		"InvisMoveSpeedMod": "0",
-		"StackingTechRangeMultiplier": "1",
+		"SpottedRadius": "20m",
-		"StackingTechRadiusMultiplier": "1",
+		"RevealOnDamageDuration": "0.25",
-		"StackingGoldPerMinute": "23",
+		"RevealOnSpottedDuration": "0.25",
-		"ThinkRate": "3",
+		"BonusHealth": "175",
-		"MaxStacks": "16"
+		"SpiritPower": "10",
+		"BonusClipSize": "0",
+		"InvisDuration": "6",
+		"BonusMoveSpeed": "4m",
+		"HealOnVeil": "150"
 	},
-	"upgrade_ultimate_burst": {
+	"upgrade_vex_barrier": {
-		"Name": "Lightning Scroll",
+		"Name": null,
-		"Description": "Damage from your ultimate applies a {g:citadel_inline_attribute:'Stun'} and deals {g:citadel_inline_attribute:'BonusSpiritDamage'} after a short delay.\u003C/span\u003E",
+		"Description": "Automatically \u003Cspan class=\"highlight\"\u003Erestores one stamina\u003C/span\u003E and gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E when you are \u003Cspan class=\"highlight\"\u003Emovement locked, Stunned, Chained, Immobilized, or Slept\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_magic_slow"
+		"TargetTypes": null,
-		],
-		"TargetTypes": [
-			"AllEnemy"
-		],
 		"ShopFilters": [
-			"MagicDamage",
+			"Durability"
-			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 22,
-		"AbilityDuration": "2",
+		"AbilityDuration": "12",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,511: / Line 7,834: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"SlowDuration": "0",
+		"VexBarrierCombatBarrier": "325",
-		"Damage": "150",
+		"TechResist": "6"
-		"SlowPercent": "80",
-		"BonusHealth": "75",
-		"StunDuration": "0.75",
-		"DelayBeforeStun": "3",
-		"BonusSprintSpeed": "1m",
-		"MovementSpeedSlow": "30"
 	},
-	"upgrade_unstoppable": {
+	"upgrade_warp_stone": {
-		"Name": "Unstoppable",
+		"Name": null,
-		"Description": "Temporarily suppress \u003Cspan class=\"highlight\"\u003Enegative status effects\u003C/span\u003E and become \u003Cspan class=\"highlight\"\u003Eimmune\u003C/span\u003E to \u003Cspan class=\"highlight\"\u003EStun, Silence, Sleep, Root, and Disarm\u003C/span\u003E. \u003Cbr\u003ECannot be used while \u003Cspan class=\"highlight\"\u003EStunned\u003C/span\u003E or \u003Cspan class=\"highlight\"\u003ESlept\u003C/span\u003E.",
+		"Description": "\u003Cspan class=\"highlight\"\u003ETeleport\u003C/span\u003E straight ahead, gaining \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "3200",
-		"Tier": "4",
+		"Tier": "3",
 		"Activation": "InstantCast",
 		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_debuff_reducer"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Durability",
+			"WeaponDamage",
 			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 65,
+		"AbilityCooldown": 16,
-		"AbilityDuration": "5",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
+		"AbilityCastRange": "11m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "75",
+		"BulletResist": "40",
-		"StatusResistancePercent": "20"
+		"CasterBuffDuration": "6"
 	},
-	"upgrade_vampire": {
+	"upgrade_weapon_backstabber": {
-		"Name": "Bullet Lifesteal",
+		"Name": "Backstabber",
-		"Description": "Your \u003Cspan class=\"highlight\"\u003Ebullets heal you\u003C/span\u003E for a percentage of the damage they deal to enemies. Half as effective vs Non-Heroes.",
+		"Description": "Attacking enemies from behind with your weapon or melee opens a wound dealing {g:citadel_inline_attribute:'SpiritDPS'} and reducing their bullet resist.  During this time, if you or any allies are near the target, will see them \u003Cspan class=\"highlight\"\u003Ethrough walls\u003C/span\u003E and be given {g:citadel_inline_attribute:'BonusMoveSpeed'}.",
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Durability",
+			"WeaponDamage"
-			"Healing"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": "4",
-		"AbilityDuration": "0",
+		"AbilityDuration": "5",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,579: / Line 7,893: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletLifestealPercent": "16",
+		"BonusHealth": "75",
-		"BonusHealth": "90"
+		"DPS": "20",
+		"TickRate": "0.5",
+		"DebuffRadius": "25m",
+		"BulletResistReduction": "-6",
+		"DebuffDuration": "5",
+		"BonusMoveSpeed": "1.75m",
+		"ReduceFootstepSound": "-50"
 	},
-	"upgrade_veil_walker": {
+	"upgrade_weapon_detention_ammo": {
-		"Name": "Veil Walker",
+		"Name": null,
-		"Description": "Walking through a \u003Cspan class=\"highlight\"\u003Ecosmic veil\u003C/span\u003E grants you \u003Cspan class=\"highlight\"\u003EStealth\u003C/span\u003E, \u003Cspan class=\"highlight\"\u003EHeal\u003C/span\u003E and increased \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E.",
+		"Description": "Your bullets build up on enemies, causing them to be \u003Cspan class=\"highlight\"\u003Etethered\u003C/span\u003E to their position.",
-		"Cost": "3200",
+		"Cost": "6400",
-		"Tier": "3",
+		"Tier": "4",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": [
-			"Durability",
+			"Disruption"
-			"ClipSize"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": 12,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "16",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,609: / Line 7,930: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"InvisAlertWhenFading": "1",
+		"BonusHealth": "100",
-		"InvisCancelOnDamage": "0",
+		"BonusFireRate": "15",
-		"InvisFadeToDuration": "0",
+		"TetherDuration": "2.3",
-		"InvisMoveSpeedMod": "0",
+		"ImmunityDuration": "8",
-		"SpottedRadius": "20m",
+		"BuildUpPerShot": "1.2",
-		"RevealOnDamageDuration": "0.25",
+		"BuildUpDuration": "10",
-		"RevealOnSpottedDuration": "0.25",
+		"TetherRadius": "7m"
-		"BonusHealth": "175",
-		"SpiritPower": "10",
-		"BonusClipSize": "0",
-		"InvisDuration": "6",
-		"BonusMoveSpeed": "4m",
-		"HealOnVeil": "150"
 	},
-	"upgrade_vex_barrier": {
+	"upgrade_weapon_eater": {
-		"Name": "Reactive Barrier",
+		"Name": null,
-		"Description": "Automatically \u003Cspan class=\"highlight\"\u003Erestores one stamina\u003C/span\u003E and gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E when you are \u003Cspan class=\"highlight\"\u003Emovement locked, Stunned, Chained, Immobilized, or Slept\u003C/span\u003E.",
+		"Description": "Reduces Courage by \u003Cspan class=\"highlight_weapon\"\u003E{s:BaseBonusCounter}\u003C/span\u003E. \u003Cbr\u003EGain \u003Cspan class=\"highlight_weapon\"\u003E{s:WeaponPowerPerKill} Courage\u003C/span\u003E (Up to \u003Cspan class=\"highlight_weapon\"\u003E{s:MaxWeaponPower}\u003C/span\u003E) for \u003Cspan class=\"highlight\"\u003Ekilling an enemy Hero\u003C/span\u003E but lose \u003Cspan class=\"highlight_weapon\"\u003E{s:WeaponPowerPerDeath} gained Courage\u003C/span\u003E on \u003Cspan class=\"highlight\"\u003EDeath\u003C/span\u003E. Bonus applied if damage was done within {s:KillWindow}s of enemy killed.",
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"Durability"
+		"IsDisabled": true,
-		],
+		"AbilityCooldown": "0",
-		"IsDisabled": false,
+		"AbilityDuration": "0",
-		"AbilityCooldown": 22,
-		"AbilityDuration": "12",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,649: / Line 7,962: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"VexBarrierCombatBarrier": "325",
+		"WeaponPowerPerKill": "3.5",
-		"TechResist": "6"
+		"WeaponPowerPerDeath": "6",
+		"KillWindow": "1",
+		"MaxWeaponPower": "30",
+		"BaseBonusCounter": "-5"
 	},
-	"upgrade_warp_stone": {
+	"upgrade_weapon_instant_reload": {
-		"Name": "Warp Stone",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003ETeleport\u003C/span\u003E straight ahead, gaining \u003Cspan class=\"highlight\"\u003EBullet Resist\u003C/span\u003E.",
+		"Description": "Press the [Reload] key while reloading to instantly finish your reload",
 		"Cost": "3200",
 		"Tier": "3",
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage",
+		"IsDisabled": true,
-			"Movement"
+		"AbilityCooldown": 21,
-		],
-		"IsDisabled": false,
-		"AbilityCooldown": 16,
 		"AbilityDuration": "0",
-		"AbilityCastRange": "11m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.0",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BulletResist": "40",
+		"BonusClipSizePercent": "60"
-		"CasterBuffDuration": "6"
 	},
-	"upgrade_weapon_backstabber": {
+	"upgrade_weapon_overdrive_clip": {
-		"Name": "Backstabber",
+		"Name": null,
-		"Description": "Attacking enemies from behind with your weapon or melee opens a wound dealing {g:citadel_inline_attribute:'SpiritDPS'} and reducing their bullet resist.  During this time, if you or any allies are near the target, will see them \u003Cspan class=\"highlight\"\u003Ethrough walls\u003C/span\u003E and be given {g:citadel_inline_attribute:'BonusMoveSpeed'}.",
+		"Description": "\u003Cspan class=\"highlight\"\u003EDeal non-lethal damage based on your max health to yourself\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Ereload bullets in your clip equal to your max ammo, no matter how many bullets are left.\u003C/span\u003E  The bullets in this clip have additional \u003Cspan class=\"highlight\"\u003Ecourage\u003C/span\u003E.",
-		"Cost": "1600",
+		"Cost": "3200",
-		"Tier": "2",
+		"Tier": "3",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
 		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage"
+		"IsDisabled": true,
-		],
+		"AbilityCooldown": 53,
-		"IsDisabled": false,
+		"AbilityDuration": "0",
-		"AbilityCooldown": "4",
-		"AbilityDuration": "5",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,708: / Line 8,018: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "75",
+		"HealthDamagePercent": "20",
-		"DPS": "20",
+		"BonusReloadSpeed": "-75",
-		"TickRate": "0.5",
+		"BonusWeaponPower": "100",
-		"DebuffRadius": "25m",
+		"OverdriveClipDuration": "5"
-		"BulletResistReduction": "-6",
-		"DebuffDuration": "5",
-		"BonusMoveSpeed": "1.75m",
-		"ReduceFootstepSound": "-50"
 	},
-	"upgrade_weapon_detention_ammo": {
+	"upgrade_weapon_power_and_health_drain": {
-		"Name": "Detention Rounds",
+		"Name": null,
-		"Description": "Your bullets build up on enemies, causing them to be \u003Cspan class=\"highlight\"\u003Etethered\u003C/span\u003E to their position.",
+		"Description": "Increase your \u003Cspan class=\"highlight\"\u003ECourage\u003C/span\u003E while draining your own \u003Cspan class=\"highlight\"\u003Ehealth\u003C/span\u003E.",
-		"Cost": "6400",
+		"Cost": "1600",
-		"Tier": "4",
+		"Tier": "2",
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
+		"ShopFilters": null,
-		],
-		"ShopFilters": [
-			"Disruption"
-		],
 		"IsDisabled": true,
-		"AbilityCooldown": "0",
+		"AbilityCooldown": 11.5,
-		"AbilityDuration": "0",
+		"AbilityDuration": "4",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,745: / Line 8,047: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusHealth": "100",
+		"WeaponPowerWhileActivated": "135",
-		"BonusFireRate": "15",
+		"HealthDrainedPerSecond": "35",
-		"TetherDuration": "2.3",
+		"Interval": "0.1"
-		"ImmunityDuration": "8",
-		"BuildUpPerShot": "1.2",
-		"BuildUpDuration": "10",
-		"TetherRadius": "7m"
 	},
-	"upgrade_weapon_eater": {
+	"upgrade_weapon_shielding": {
-		"Name": "Weapon Eater",
+		"Name": "Emergency Shielding",
-		"Description": "Reduces Courage by \u003Cspan class=\"highlight_weapon\"\u003E{s:BaseBonusCounter}\u003C/span\u003E. \u003Cbr\u003EGain \u003Cspan class=\"highlight_weapon\"\u003E{s:WeaponPowerPerKill} Courage\u003C/span\u003E (Up to \u003Cspan class=\"highlight_weapon\"\u003E{s:MaxWeaponPower}\u003C/span\u003E) for \u003Cspan class=\"highlight\"\u003Ekilling an enemy Hero\u003C/span\u003E but lose \u003Cspan class=\"highlight_weapon\"\u003E{s:WeaponPowerPerDeath} gained Courage\u003C/span\u003E on \u003Cspan class=\"highlight\"\u003EDeath\u003C/span\u003E. Bonus applied if damage was done within {s:KillWindow}s of enemy killed.",
+		"Description": "Gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E whenever you take significant {g:citadel_inline_attribute:'WeaponDamage'} from enemy Heroes in a small time frame.",
 		"Cost": "1600",
 		"Tier": "2",
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"Durability"
-		"AbilityCooldown": "0",
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "35",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 7,777: / Line 8,077: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"WeaponPowerPerKill": "3.5",
+		"DamageWindow": "3.5",
-		"WeaponPowerPerDeath": "6",
+		"DamageThreshold": "200",
-		"KillWindow": "1",
+		"CombatBarrier": "325",
-		"MaxWeaponPower": "30",
+		"OutOfCombatHealthRegen": "2.5",
-		"BaseBonusCounter": "-5"
+		"BarrierDuration": "8",
+		"BonusMoveSpeed": "1.5m"
 	},
-	"upgrade_weapon_instant_reload": {
+	"upgrade_weighted_shots": {
-		"Name": "Reloader + Huge Clip",
+		"Name": null,
-		"Description": "Press the [Reload] key while reloading to instantly finish your reload",
+		"Description": null,
 		"Cost": "3200",
 		"Tier": "3",
@@ Line 7,796: / Line 8,097: @@
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage"
-		"AbilityCooldown": 21,
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 7,807: / Line 8,110: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"BonusClipSizePercent": "60"
+		"BaseAttackDamagePercent": "30",
+		"StatusResistancePercent": "16",
+		"TechResist": "16",
+		"BonusBulletSpeedPercent": "-30",
+		"StaminaCooldownReduction": "-20"
 	},
-	"upgrade_weapon_overdrive_clip": {
+	"upgrade_withering_whip": {
-		"Name": "Overdrive Clip",
+		"Name": null,
-		"Description": "\u003Cspan class=\"highlight\"\u003EDeal non-lethal damage based on your max health to yourself\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Ereload bullets in your clip equal to your max ammo, no matter how many bullets are left.\u003C/span\u003E  The bullets in this clip have additional \u003Cspan class=\"highlight\"\u003Ecourage\u003C/span\u003E.",
+		"Description": "Target an enemy to reduce their \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EBullet Resistance\u003C/span\u003E.",
-		"Cost": "3200",
+		"Cost": "800",
-		"Tier": "3",
+		"Tier": "1",
-		"Activation": "InstantCast",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
-		"ShopFilters": null,
+			"HeroEnemy"
-		"IsDisabled": true,
+		],
-		"AbilityCooldown": 53,
+		"ShopFilters": [
-		"AbilityDuration": "0",
+			"Disruption",
-		"AbilityCastRange": "0",
+			"MagicDamage"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 20,
+		"AbilityDuration": "5",
+		"AbilityCastRange": "23m",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
+		"AbilityCastDelay": "0.1",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
 		"WeaponPower": "0",
-		"HealthDamagePercent": "20",
+		"FireRateSlow": "35",
-		"BonusReloadSpeed": "-75",
+		"BonusHealth": "60",
-		"BonusWeaponPower": "100",
+		"BonusSprintSpeed": "0.5m",
-		"OverdriveClipDuration": "5"
+		"BulletArmorReduction": "-5"
 	},
-	"upgrade_weapon_power_and_health_drain": {
+	"weapon_upgrade_base": {
-		"Name": "Overdrive",
+		"Name": null,
-		"Description": "Increase your \u003Cspan class=\"highlight\"\u003ECourage\u003C/span\u003E while draining your own \u003Cspan class=\"highlight\"\u003Ehealth\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "None",
-		"Tier": "2",
+		"Tier": null,
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 11.5,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "4",
+		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
@@ Line 7,862: / Line 8,174: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"WeaponPowerWhileActivated": "135",
-		"HealthDrainedPerSecond": "35",
-		"Interval": "0.1"
 	},
-	"upgrade_weapon_shielding": {
+	"weapon_upgrade_t1": {
-		"Name": "Weapon Shielding",
+		"Name": null,
-		"Description": "Gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E whenever you take significant {g:citadel_inline_attribute:'WeaponDamage'} from enemy Heroes in a small time frame.",
+		"Description": null,
-		"Cost": "1600",
+		"Cost": "800",
-		"Tier": "2",
+		"Tier": "1",
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"Durability"
-		],
 		"IsDisabled": false,
-		"AbilityCooldown": "35",
+		"AbilityCooldown": "0",
 		"AbilityDuration": "0",
 		"AbilityCastRange": "0",
@@ Line 7,892: / Line 8,199: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"DamageWindow": "3.5",
-		"DamageThreshold": "200",
-		"CombatBarrier": "325",
-		"OutOfCombatHealthRegen": "2.5",
-		"BarrierDuration": "8",
-		"BonusMoveSpeed": "1.5m"
 	},
-	"upgrade_weighted_shots": {
+	"weapon_upgrade_t2": {
-		"Name": "Weighted Shots",
+		"Name": null,
 		"Description": null,
-		"Cost": "3200",
+		"Cost": "1600",
-		"Tier": "3",
+		"Tier": "2",
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage"
-		],
 		"IsDisabled": false,
 		"AbilityCooldown": "0",
@@ Line 7,925: / Line 8,224: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"BaseAttackDamagePercent": "30",
-		"StatusResistancePercent": "16",
-		"TechResist": "16",
-		"BonusBulletSpeedPercent": "-30",
-		"StaminaCooldownReduction": "-20"
 	},
-	"upgrade_withering_whip": {
+	"weapon_upgrade_t3": {
-		"Name": "Rusted Barrel",
+		"Name": null,
-		"Description": "Target an enemy to reduce their \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003EBullet Resistance\u003C/span\u003E.",
+		"Description": null,
-		"Cost": "800",
+		"Cost": "3200",
-		"Tier": "1",
+		"Tier": "3",
-		"Activation": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
+		"ShopFilters": null,
-		],
-		"ShopFilters": [
-			"Disruption",
-			"MagicDamage"
-		],
 		"IsDisabled": false,
-		"AbilityCooldown": 20,
+		"AbilityCooldown": "0",
-		"AbilityDuration": "5",
+		"AbilityDuration": "0",
-		"AbilityCastRange": "23m",
+		"AbilityCastRange": "0",
 		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0.1",
+		"AbilityCastDelay": "0",
 		"AbilityChannelTime": "0",
 		"AbilityPostCastDuration": "0",
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
-		"WeaponPower": "0",
+		"WeaponPower": "0"
-		"FireRateSlow": "35",
-		"BonusHealth": "60",
-		"BonusSprintSpeed": "0.5m",
-		"BulletArmorReduction": "-5"
-	},
-	"weapon_upgrade_base": {
-		"Name": null,
-		"Description": null,
-		"Cost": "None",
-		"Tier": null,
-		"Activation": "Passive",
-		"Slot": "Weapon",
-		"Components": null,
-		"TargetTypes": null,
-		"ShopFilters": null,
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
-		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
-		"AbilityChannelTime": "0",
-		"AbilityPostCastDuration": "0",
-		"AbilityCharges": "0",
-		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
-		"AbilityResourceCost": "0",
-		"TechPower": "0",
-		"WeaponPower": "0"
-	},
-	"weapon_upgrade_t1": {
-		"Name": null,
-		"Description": null,
-		"Cost": "800",
-		"Tier": "1",
-		"Activation": "Passive",
-		"Slot": "Weapon",
-		"Components": null,
-		"TargetTypes": null,
-		"ShopFilters": null,
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
-		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
-		"AbilityChannelTime": "0",
-		"AbilityPostCastDuration": "0",
-		"AbilityCharges": "0",
-		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
-		"AbilityResourceCost": "0",
-		"TechPower": "0",
-		"WeaponPower": "0"
-	},
-	"weapon_upgrade_t2": {
-		"Name": null,
-		"Description": null,
-		"Cost": "1600",
-		"Tier": "2",
-		"Activation": "Passive",
-		"Slot": "Weapon",
-		"Components": null,
-		"TargetTypes": null,
-		"ShopFilters": null,
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
-		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
-		"AbilityChannelTime": "0",
-		"AbilityPostCastDuration": "0",
-		"AbilityCharges": "0",
-		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
-		"AbilityResourceCost": "0",
-		"TechPower": "0",
-		"WeaponPower": "0"
-	},
-	"weapon_upgrade_t3": {
-		"Name": null,
-		"Description": null,
-		"Cost": "3200",
-		"Tier": "3",
-		"Activation": "Passive",
-		"Slot": "Weapon",
-		"Components": null,
-		"TargetTypes": null,
-		"ShopFilters": null,
-		"IsDisabled": false,
-		"AbilityCooldown": "0",
-		"AbilityDuration": "0",
-		"AbilityCastRange": "0",
-		"AbilityUnitTargetLimit": "1",
-		"AbilityCastDelay": "0",
-		"AbilityChannelTime": "0",
-		"AbilityPostCastDuration": "0",
-		"AbilityCharges": "0",
-		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
-		"AbilityResourceCost": "0",
-		"TechPower": "0",
-		"WeaponPower": "0"
 	},
 	"weapon_upgrade_t4": {
@@ Line 8,089: / Line 8,274: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",
@@ Line 8,114: / Line 8,299: @@
 		"AbilityCharges": "0",
 		"AbilityCooldownBetweenCharge": "0",
-		"ChannelMoveSpeed": "50",
+		"ChannelMoveSpeed": "-1",
 		"AbilityResourceCost": "0",
 		"TechPower": "0",

Data:ItemData.json: Difference between revisionsGive feedback

Deadbot (talk | contribs)