@@ Line 15: / Line 15: @@
 		"AbilityDuration": 2,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 29: / Line 30: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 43: / Line 45: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 57: / Line 60: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 71: / Line 75: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 85: / Line 90: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 99: / Line 105: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 188: / Line 195: @@
 			}
 		}
+	},
+	"cosmetic_item_voting_poster": {
+		"Name": "Place Poster",
+		"Description": null,
+		"Cost": null,
+		"Tier": null,
+		"Activation": "Press",
+		"Slot": null,
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": [
+			"WeaponDamage"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 0.5,
+		"AbilityCastRange": 550,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCastDelay": 0.15,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"Radius": 5
 	},
 	"item_projectile_test_01": {
@@ Line 209: / Line 237: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.01,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "0.5m",
@@ Line 233: / Line 262: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.01,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "0.5m",
@@ Line 257: / Line 287: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.01,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "0.5m",
@@ Line 281: / Line 312: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.01,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "0.5m",
@@ Line 305: / Line 337: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.01,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "0.5m",
@@ Line 329: / Line 362: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.01,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "0.5m",
@@ Line 345: / Line 379: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 359: / Line 394: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 373: / Line 409: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 387: / Line 424: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 401: / Line 439: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 415: / Line 454: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 434: / Line 474: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 5,
@@ Line 455: / Line 496: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.6,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechResist": 14,
@@ Line 472: / Line 514: @@
 		"AbilityCooldown": 21,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"MaxBulletResist": 30,
@@ Line 495: / Line 538: @@
 		"AbilityCooldown": 1,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 14,
@@ Line 521: / Line 565: @@
 		"AbilityDuration": 6,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"LightMeleeCooldownMult": 2,
@@ Line 551: / Line 596: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.25,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "30m",
@@ Line 571: / Line 617: @@
 		"AbilityDuration": 7,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletLifestealPercent": 18,
@@ Line 592: / Line 639: @@
 		"AbilityCooldown": 26,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ActivateTime": 0.75,
@@ Line 601: / Line 649: @@
 		"AssaultFireRate": 60,
 		"ExplodeRadius": "3m"
+	},
+	"upgrade_aerial_supremacy": {
+		"Name": "Aerial Supremacy",
+		"Description": null,
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": [
+			"upgrade_superior_stamina"
+		],
+		"TargetTypes": null,
+		"ShopFilters": [
+			"MagicDamage",
+			"Movement",
+			"FireRate"
+		],
+		"IsDisabled": true,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"Stamina": 7,
+		"AirMoveIncreasePercent": 70,
+		"StaminaCooldownReduction": 40
 	},
 	"upgrade_ammo_scavenger": {
@@ Line 618: / Line 690: @@
 		"AbilityDuration": 45,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"AmmoPerSoul": 2,
@@ Line 623: / Line 696: @@
 		"MaxStacks": 18,
 		"BonusSprintSpeed": "2m"
+	},
+	"upgrade_ancient_shield": {
+		"Name": "Ancient Shield",
+		"Description": null,
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": [
+			"WeaponDamage"
+		],
+		"IsDisabled": true,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"StatusResistancePercent": 40,
+		"TechResist": 40,
+		"BulletResist": 40,
+		"OutOfCombatHealthRegen": 40,
+		"DegenResistance": 40
 	},
 	"upgrade_aoe_root": {
@@ Line 643: / Line 738: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CaptureRadius": "12m",
@@ Line 673: / Line 769: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DebuffDuration": 5,
@@ Line 698: / Line 795: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 1.5,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"InvisAlertWhenFading": 1,
@@ Line 726: / Line 824: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.25,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TempTechShieldHealth": 400,
 		"Radius": "30m"
 	},
-	"upgrade_aprounds": {
+	"upgrade_apex_combat": {
-		"Name": "Armor Piercing Rounds",
+		"Name": "Apex Combat",
+		"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": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Weapon",
+		"Components": [
+			"upgrade_ricochet"
+		],
+		"TargetTypes": [
+			"HeroEnemy",
+			"BossEnemy",
+			"TrooperEnemy",
+			"PropEnemy",
+			"MinionEnemy",
+			"Neutral"
+		],
+		"ShopFilters": [
+			"ClipSize"
+		],
+		"IsDisabled": true,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"RicochetDamagePercent": 65,
+		"RicochetRadius": "13m",
+		"RicochetTargetsTooltipOnly": 4,
+		"ProcChance": 40,
+		"CritDamagePercent": 125
+	},
+	"upgrade_aprounds": {
+		"Name": "Armor Piercing Rounds",
 		"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": 6400,
@@ Line 747: / Line 877: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusBulletSpeedPercent": 50,
@@ Line 768: / Line 899: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 7,
@@ Line 788: / Line 920: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusAbilityDurationPercent": 22
@@ Line 806: / Line 939: @@
 		"AbilityDuration": 12,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 35,
@@ Line 831: / Line 965: @@
 		"AbilityDuration": 7,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusAbilityDurationPercent": 15,
@@ Line 860: / Line 995: @@
 		"AbilityCooldown": 24,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"SpreadDuration": 0.5,
@@ Line 898: / Line 1,034: @@
 		"AbilityDuration": 8,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ResistReduction": -60,
@@ Line 915: / Line 1,052: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 15
@@ Line 930: / Line 1,068: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 25
@@ Line 950: / Line 1,089: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 125,
@@ Line 971: / Line 1,111: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 988: / Line 1,129: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSizePercent": 125,
@@ Line 1,011: / Line 1,153: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DamageDuration": 10,
@@ Line 1,034: / Line 1,177: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 20,
@@ Line 1,043: / Line 1,187: @@
 		"Cost": 3200,
 		"Tier": 3,
-		"Activation": "Toggle",
+		"Activation": "InstantCastToggle",
 		"Slot": "Weapon",
 		"Components": null,
@@ Line 1,052: / Line 1,196: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechResist": 10,
@@ Line 1,075: / Line 1,220: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusAbilityCharges": 3
@@ Line 1,096: / Line 1,242: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 35,
@@ Line 1,104: / Line 1,251: @@
 	"upgrade_boxing_glove": {
 		"Name": "Lifestrike",
-		"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\"\u003EMelee Attack\u003C/span\u003E applies \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E and \u003Cspan class=\"highlight\"\u003Eheals you\u003C/span\u003E for a percentage of the \u003Cspan class=\"highlight\"\u003EMelee Damage\u003C/span\u003E dealt plus a fixed amount. \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": 3200,
 		"Tier": 3,
@@ Line 1,123: / Line 1,270: @@
 		"AbilityCooldown": 4,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"LightMeleeCooldownMult": 2,
@@ Line 1,148: / Line 1,296: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletResist": 18
@@ Line 1,163: / Line 1,312: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletArmor": 2
@@ Line 1,186: / Line 1,336: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 100,
@@ Line 1,210: / Line 1,361: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "12m",
@@ Line 1,234: / Line 1,386: @@
 		"AbilityDuration": 8,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletArmorReduction": -12,
 		"BonusHealth": 65,
 		"BulletResist": 7
+	},
+	"upgrade_bulletshredimbue": {
+		"Name": "Ballistic Enchantment",
+		"Description": "Imbue an ability with increased \u003Cspan class=\"highlight\"\u003Erange\u003C/span\u003E. Dealing damage with that ability grants you increased \u003Cspan class=\"highlight\"\u003Eweapon damage\u003C/span\u003E per \u003Cspan class=\"highlight\"\u003Eunique hero hit\u003C/span\u003E. Has reduced effect on non-heroes.",
+		"Cost": 3200,
+		"Tier": 3,
+		"Activation": "Passive",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"WeaponDamage"
+		],
+		"IsDisabled": false,
+		"AbilityDuration": 14,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"TechRangeMultiplier": 30,
+		"TechRadiusMultiplier": 30,
+		"WeaponPowerPerStack": 18,
+		"WeaponPowerPerStackNonHero": 4,
+		"NonHeroStackLimit": 8
 	},
 	"upgrade_burst_fire": {
@@ Line 1,257: / Line 1,435: @@
 		"AbilityDuration": 3.5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 10,
@@ Line 1,277: / Line 1,456: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BurstFireShotPercent": 100,
@@ Line 1,298: / Line 1,478: @@
 		"AbilityCooldown": 10.5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"InvisAlertWhenFading": 1,
@@ Line 1,330: / Line 1,511: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ProcCooldown": 0.25,
@@ Line 1,372: / Line 1,554: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusMoveSpeed": "2.0m",
@@ Line 1,377: / Line 1,560: @@
 		"OutOfCombatHealthRegen": 2
 	},
-	"upgrade_chain_lightning": {
+	"upgrade_celestial_guidance": {
-		"Name": "Tesla Bullets",
+		"Name": "Celestial Blessing",
-		"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": "Applies an extremely powerful cleanse that replenishes your allies globally.",
-		"Cost": 3200,
+		"Cost": 9999,
-		"Tier": 3,
+		"Tier": 5,
+		"Activation": "InstantCast",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": [
+			"HeroFriendly",
+			"TrooperFriendly",
+			"MinionFriendly"
+		],
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityCooldown": 50,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"MinHeal": 300,
+		"HealPercentAmount": 50,
+		"Radius": "999m",
+		"BuffDuration": 6,
+		"StaminaCooldownReduction": 100,
+		"BuffMoveSpeedBonus": "5m"
+	},
+	"upgrade_chain_lightning": {
+		"Name": "Tesla Bullets",
+		"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": 3200,
+		"Tier": 3,
 		"Activation": "Passive",
 		"Slot": "Weapon",
@@ Line 1,394: / Line 1,603: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ProcCooldown": 0.25,
@@ Line 1,427: / Line 1,637: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusAbilityCharges": 4,
@@ Line 1,448: / Line 1,659: @@
 		"AbilityCooldown": 26,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CooldownReductionFlat": 8,
@@ Line 1,467: / Line 1,679: @@
 		"AbilityCooldown": 90,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DeathImmunityDuration": 4.5,
@@ Line 1,478: / Line 1,691: @@
 	"upgrade_chonky": {
 		"Name": "Fortitude",
-		"Description": "After not taking damage for \u003Cspan class=\"highlight\"\u003E13s\u003C/span\u003E, gain \u003Cspan class=\"highlight\"\u003E2% Max Health Regen\u003C/span\u003E.",
+		"Description": "After not taking damage for a period, gain health regen.",
 		"Cost": 3200,
 		"Tier": 3,
@@ Line 1,495: / Line 1,708: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"RestoreDelay": 13,
@@ Line 1,517: / Line 1,731: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSizePercent": 30,
@@ Line 1,533: / Line 1,748: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSizePercent": 30
@@ Line 1,548: / Line 1,764: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSizePercent": 60
@@ Line 1,563: / Line 1,780: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSize": 6
@@ Line 1,578: / Line 1,796: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSize": 12
+	},
+	"upgrade_cloak_of_opportunity": {
+		"Name": "Cloak of Opportunity",
+		"Description": "Block the next debuff that would apply \u003Cspan class=\"highlight\"\u003Emovement lock, Stun, Chained, Immobilize, or Sleep\u003C/span\u003E and become \u003Cspan class=\"highlight\"\u003EUnstoppable\u003C/span\u003E.  Also gain a \u003Cspan class=\"highlight\"\u003EBarrier\u003C/span\u003E and bonus {g:citadel_inline_attribute:'MoveSpeed'}",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": [
+			"AllFriendly"
+		],
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityCooldown": 14,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"CombatBarrier": 300,
+		"BonusMoveSpeed": "3m",
+		"BuffDuration": 6,
+		"StatusImmuneDuration": 4
 	},
 	"upgrade_cloaking_device": {
@@ Line 1,594: / Line 1,835: @@
 		"AbilityCooldown": 10.5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"InvisAlertWhenFading": 1,
@@ Line 1,622: / Line 1,864: @@
 		"AbilityDuration": 18,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"InvisAlertWhenFading": 1,
@@ Line 1,658: / Line 1,901: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CloseRangeBonusWeaponPower": 50,
@@ Line 1,681: / Line 1,925: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CloseRangeBonusWeaponPower": 20,
@@ Line 1,706: / Line 1,951: @@
 		"AbilityDuration": 4,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"SpreadDuration": 0.5,
@@ Line 1,724: / Line 1,970: @@
 	"upgrade_colossus": {
 		"Name": "Colossus",
-		"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": "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. Increases your model size.",
 		"Cost": 6400,
 		"Tier": 4,
@@ Line 1,740: / Line 1,986: @@
 		"AbilityDuration": 7,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 300,
@@ Line 1,749: / Line 1,996: @@
 		"GroundDashReductionPercent": -25,
 		"Radius": "14m",
-		"ModelScaleGrowth": 1.2
+		"ModelScaleGrowth": 1.2,
+		"ModelScaleGrowthTooltip": 20
 	},
 	"upgrade_combo_breaker": {
@@ Line 1,766: / Line 2,014: @@
 		"AbilityCooldown": 23,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechArmor": 2,
@@ Line 1,794: / Line 2,043: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"SlowPercent": 20,
@@ Line 1,815: / Line 2,065: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CooldownReduction": 20,
@@ Line 1,836: / Line 2,087: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 6,
@@ Line 1,865: / Line 2,117: @@
 		"AbilityCooldown": 20,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"SpiritPower": 20,
@@ Line 1,892: / Line 2,145: @@
 		"AbilityCooldown": 8,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "1m",
@@ Line 1,922: / Line 2,176: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "1m",
@@ Line 1,950: / Line 2,205: @@
 		"AbilityCooldown": 7,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletResist": 12,
@@ Line 1,983: / Line 2,239: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 12,
@@ Line 2,004: / Line 2,261: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"StatusResistancePercent": 20,
@@ Line 2,023: / Line 2,281: @@
 		"AbilityCooldown": 1,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DeflectionPercent": 30,
@@ Line 2,049: / Line 2,308: @@
 		"AbilityCastRange": "17m",
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"FireRateSlow": 30,
@@ Line 2,073: / Line 2,333: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.25,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TickRate": 0.25,
@@ Line 2,103: / Line 2,364: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CooldownReductionPctOnOthers": 50,
@@ Line 2,128: / Line 2,390: @@
 		"AbilityCooldown": 64,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 35,
@@ Line 2,147: / Line 2,410: @@
 		"AbilityCooldown": 8.5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"AirJumps": 1,
 		"AirJumpVerticalSpeedPercent": 75,
-		"InteruptCooldown": 4
+		"InterruptCooldown": 4
 	},
 	"upgrade_dps_aura": {
@@ Line 2,172: / Line 2,436: @@
 		"AbilityDuration": 7,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 30,
@@ Line 2,193: / Line 2,458: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSize": 20,
@@ Line 2,211: / Line 2,477: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusAbilityDurationPercent": 20
 	},
-	"upgrade_enchanted_holsters": {
+	"upgrade_eldritch_shot": {
-		"Name": "Spellslinger",
+		"Name": "Haunting Shot",
-		"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": "Your next bullet applies a powerful debuff reducing the enemy's damage output, healing and movement speed. It also deals {g:citadel_inline_attribute:'BonusSpiritDamage'} based on the targets current Health. \u003Cbr\u003E\u003Cbr\u003EThe bullet is larger and penetrates through targets.",
-		"Cost": 6400,
+		"Cost": 9999,
-		"Tier": 4,
+		"Tier": 5,
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
-			"FireRate"
+			"MagicDamage"
 		],
 		"IsDisabled": false,
+		"AbilityCooldown": 2.5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"CooldownReduction": 6,
+		"Radius": "1m",
-		"BonusFireRate": 12,
+		"ProcChance": 100,
+		"ProcCooldown": 1,
+		"BulletRadius": "1.5m",
+		"DebuffDuration": 4,
+		"HealthPctDamage": 10,
+		"OutgoingDamagePenaltyPercent": -40,
+		"HealAmpReceivePenaltyPercent": -40,
+		"HealAmpRegenPenaltyPercent": -40,
+		"MovementSpeedSlow": 40,
+		"GroundDashReductionPercent": -40
+	},
+	"upgrade_electric_slippers": {
+		"Name": "Electric Slippers",
+		"Description": "When sliding, evade bullets, gain fire rate and deal damage to enemies around you.  \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003ECooldown is per target.\u003C/span\u003E",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"Radius": "8m",
+		"ProcCooldown": 0.3,
+		"Damage": 100,
+		"SlideScale": 80,
+		"SlideTurnScale": 100,
+		"EvasionWhileSliding": 60,
+		"Stamina": 2,
+		"FireRateWhileSliding": 50
+	},
+	"upgrade_enchanted_holsters": {
+		"Name": "Spellslinger",
+		"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": 6400,
+		"Tier": 4,
+		"Activation": "Passive",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": [
+			"MagicDamage",
+			"FireRate"
+		],
+		"IsDisabled": false,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"CooldownReduction": 6,
+		"BonusFireRate": 12,
 		"ReloadSpeedMultipler": -10,
 		"BuffDuration": 18,
@@ Line 2,251: / Line 2,576: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealthRegen": 3
@@ Line 2,274: / Line 2,600: @@
 		"AbilityDuration": 12,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ProcCooldown": 0.7,
@@ Line 2,280: / Line 2,607: @@
 		"MaxStacks": 12,
 		"TechArmorDamageReduction": -8
+	},
+	"upgrade_eternal_gift": {
+		"Name": "Eternal Gift",
+		"Description": "Periodically gain a random permanent stat buff.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityCooldown": 165,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"RespawnTime": -90,
+		"BuffFrequency": 2
 	},
 	"upgrade_ethereal_bullets": {
@@ Line 2,301: / Line 2,646: @@
 		"AbilityCooldown": 15,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 7,
@@ Line 2,334: / Line 2,680: @@
 		"AbilityCooldown": 8,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusBulletSpeedPercent": 50,
@@ Line 2,368: / Line 2,715: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusAbilityCharges": 1,
@@ Line 2,389: / Line 2,737: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"LowHealthThreshold": 50,
@@ Line 2,413: / Line 2,762: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 10,
@@ Line 2,435: / Line 2,785: @@
 		"AbilityDuration": 5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"MoveWhileShootingSpeedPenaltyReductionPercent": 100,
@@ Line 2,466: / Line 2,817: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"PercentDamage": 30,
@@ Line 2,485: / Line 2,837: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletLifestealPercent": 25,
@@ Line 2,508: / Line 2,861: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechRangeMultiplier": 60,
@@ Line 2,538: / Line 2,892: @@
 		"AbilityDuration": 6,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletLifestealPercent": 22,
@@ Line 2,558: / Line 2,913: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DamagePerChain": {
@@ Line 2,603: / Line 2,959: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BaseAttackDamagePercent": 80,
@@ Line 2,631: / Line 2,988: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BaseAttackDamagePercent": 100,
@@ Line 2,659: / Line 3,017: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"SkipFrames": 6,
@@ Line 2,686: / Line 3,045: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusSprintSpeed": "0.75m",
@@ Line 2,711: / Line 3,071: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CooldownReductionPctOnOthers": 50,
@@ Line 2,719: / Line 3,080: @@
 		"TechRadiusMultiplier": 10
 	},
-	"upgrade_headhunter": {
+	"upgrade_haunting_scream": {
+		"Name": "Haunting Scream",
+		"Description": "Launch an expanding projectile which \u003Cspan class=\"highlight\"\u003ECurses\u003C/span\u003E enemies for a short duration.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "InstantCast",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"WeaponDamage",
+			"Disruption"
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 25,
+		"AbilityDuration": 3,
+		"AbilityCastRange": "40m",
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"TechPowerPercent": 30,
+		"HeightOffGround": "1m",
+		"GrowthPerMeter": "0.15m",
+		"InitialWidth": "5.0m",
+		"Damage": 400,
+		"SkipFrames": 6
+	},
+	"upgrade_headhunter": {
 		"Name": "Headhunter",
 		"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'}.",
@@ Line 2,736: / Line 3,127: @@
 		"AbilityCooldown": 8,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"HeadShotBonusDamage": {
@@ Line 2,773: / Line 3,165: @@
 		"AbilityCooldown": 9,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"HeadShotBonusDamage": 45,
@@ Line 2,793: / Line 3,186: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletResistReduction": -13,
@@ Line 2,838: / Line 3,232: @@
 		"AbilityDuration": 8,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 7,
@@ Line 2,846: / Line 3,241: @@
 	"upgrade_healbuff": {
 		"Name": "Healing Tempo",
-		"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": "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 passive Bullet/Spirit Lifesteals.\u003C/span\u003E",
 		"Cost": 6400,
 		"Tier": 4,
@@ Line 2,862: / Line 3,257: @@
 		"AbilityCooldown": 1,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 40,
@@ Line 2,874: / Line 3,270: @@
 	"upgrade_healing_booster": {
 		"Name": "Healing Booster",
-		"Description": "Increases the effectiveness of your \u003Cspan class=\"highlight\"\u003Ehealing\u003C/span\u003E by \u003Cspan class=\"highlight\"\u003E20%\u003C/span\u003E.",
+		"Description": "Increases the effectiveness of your \u003Cspan class=\"highlight\"\u003Ehealing\u003C/span\u003E.",
 		"Cost": 1600,
 		"Tier": 2,
@@ Line 2,888: / Line 3,284: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"HealAmpCastPercent": 20,
@@ Line 2,908: / Line 3,305: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 185
@@ Line 2,926: / Line 3,324: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 200
@@ Line 2,940: / Line 3,339: @@
 		],
 		"TargetTypes": [
-			"AllFriendly"
+			"HeroFriendly",
+			"TrooperFriendly",
+			"MinionFriendly"
 		],
 		"ShopFilters": [
@@ Line 2,949: / Line 3,350: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.25,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TotalHealthRegen": {
@@ Line 2,975: / Line 3,377: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealthRegen": 2.75
@@ Line 2,992: / Line 3,395: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"HealInterval": 3,
@@ Line 3,013: / Line 3,417: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 6,
@@ Line 3,038: / Line 3,443: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TotalHealthRegen": {
@@ Line 3,061: / Line 3,467: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"HighGroundBonusWeaponPower": 50
@@ Line 3,076: / Line 3,483: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DamageThreshold": 40,
@@ Line 3,094: / Line 3,502: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusBulletSpeedPercent": 50,
@@ Line 3,115: / Line 3,524: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"LifeThreshold": 65,
@@ Line 3,122: / Line 3,532: @@
 		"BulletArmorReduction": -12,
 		"DebuffDuration": 8
+	},
+	"upgrade_icarus_wings": {
+		"Name": "Seraphim Wings",
+		"Description": "When Airborne, You deal more damage and take reduced damage. Allows an additional use of \u003Cspan class=\"highlight\"\u003EAir Jump\u003C/span\u003E or \u003Cspan class=\"highlight\"\u003EAir Dash\u003C/span\u003E before landing.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"AirBonusDamageGiven": 40,
+		"AirBonusDamageTaken": -40,
+		"StaminaCooldownReduction": 120,
+		"GravityScale": -70,
+		"AirControlPercent": 100,
+		"AirControlAccelPercent": 50
 	},
 	"upgrade_imbued_ability": {
@@ Line 3,137: / Line 3,568: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ImbuedBonusDuration": 25,
@@ Line 3,160: / Line 3,592: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusAbilityDurationPercent": 28,
@@ Line 3,178: / Line 3,611: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletResist": 30,
@@ Line 3,198: / Line 3,632: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 10
@@ Line 3,216: / Line 3,651: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Stamina": 1,
 		"StaminaCooldownReduction": 12
+	},
+	"upgrade_infinite_rounds": {
+		"Name": "Infinite Rounds",
+		"Description": "You have \u003Cspan class=\"highlight\"\u003Einfinite\u003C/span\u003E ammo.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": [
+			"ClipSize",
+			"WeaponDamage"
+		],
+		"IsDisabled": false,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"BonusBulletSpeedPercent": 200,
+		"ProcChance": 65,
+		"BonusFireRate": 30
 	},
 	"upgrade_infinitemagazine": {
@@ Line 3,238: / Line 3,695: @@
 		"AbilityDuration": 6,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSizePercent": 100,
@@ Line 3,262: / Line 3,720: @@
 		"AbilityDuration": 6,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 100,
@@ Line 3,288: / Line 3,747: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 125,
@@ Line 3,313: / Line 3,773: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSizePercent": 20,
@@ Line 3,335: / Line 3,796: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"MeleeResistPercent": 25,
@@ Line 3,363: / Line 3,825: @@
 		"AbilityDuration": 7,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusFireRate": 30,
@@ Line 3,388: / Line 3,851: @@
 		"AbilityCooldown": 8,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"LightMeleeCooldownMult": 2,
@@ Line 3,409: / Line 3,873: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"LongRangeBonusWeaponPower": 40,
@@ Line 3,430: / Line 3,895: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechRangeMultiplier": 30,
@@ Line 3,454: / Line 3,920: @@
 		"AbilityCooldown": 14,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Damage": 40,
@@ Line 3,476: / Line 3,943: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 14,
@@ Line 3,497: / Line 3,965: @@
 		"AbilityDuration": 8,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusMovespeed": "2m",
@@ Line 3,520: / Line 3,989: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BaseAttackDamagePercent": 70,
@@ Line 3,542: / Line 4,012: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechRangeMultiplier": 20,
@@ Line 3,561: / Line 4,032: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 15,
@@ Line 3,588: / Line 4,060: @@
 		"AbilityCooldown": 14,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"MinimumDamage": 165,
@@ Line 3,614: / Line 4,087: @@
 		"AbilityDuration": 2,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"MovementSpeedSlow": 30,
@@ Line 3,638: / Line 4,112: @@
 		"AbilityCooldown": 14,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ImbuedTechPower": 24,
@@ Line 3,660: / Line 4,135: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CooldownReduction": 18
@@ Line 3,681: / Line 4,157: @@
 		"AbilityDuration": 7,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechArmorDamageReduction": -8,
@@ Line 3,703: / Line 4,180: @@
 		"AbilityCooldown": 6,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "1m",
@@ Line 3,730: / Line 4,208: @@
 		"AbilityCooldown": 7,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletResist": 6,
@@ Line 3,754: / Line 4,233: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 75,
@@ Line 3,779: / Line 4,259: @@
 		"AbilityDuration": 5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletResist": 15,
@@ Line 3,801: / Line 4,282: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DPS": {
@@ Line 3,842: / Line 4,324: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Regeneration": 4,
 		"RegenerationDuration": 5
+	},
+	"upgrade_mystical_piano": {
+		"Name": "Mystical Piano",
+		"Description": "After a short delay, enemies in the target area will be stunned and have their stamina depleted.  After the stun they will be temporarily dazed.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Press",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityCooldown": 23,
+		"AbilityDuration": 1.7,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"StunDelay": 1.7,
+		"StunDuration": 2,
+		"DazeMoveSpeed": "2m",
+		"DazeDuration": 2,
+		"Radius": "11m"
 	},
 	"upgrade_nearby_enemy_boost": {
@@ Line 3,864: / Line 4,372: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Radius": "20m",
@@ Line 3,889: / Line 4,398: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"NonPlayerBonusWeaponPower": 25,
@@ Line 3,919: / Line 4,429: @@
 		"AbilityCastRange": "7m",
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"NonPlayerBonusWeaponPower": 30,
@@ Line 3,942: / Line 4,453: @@
 		"TechRadiusMultiplier": 15
 	},
-	"upgrade_personal_rejuvenator": {
+	"upgrade_nullification_aura": {
-		"Name": "Rebirth",
+		"Name": "Nullification Burst",
-		"Description": "Respawns the hero at the spot they died.",
+		"Description": "Removes any positive buffs and prevents stamina usage and healing effects on enemies.",
-		"Cost": 3200,
+		"Cost": 9999,
-		"Tier": 3,
+		"Tier": 5,
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Tech",
-		"Components": null,
-		"TargetTypes": null,
-		"ShopFilters": null,
-		"IsDisabled": true,
-		"AbilityCooldown": 509,
-		"AbilityUnitTargetLimit": 1,
-		"ChannelMoveSpeed": -1,
-		"RespawnDelay": 5
-	},
-	"upgrade_phantom_strike": {
-		"Name": "Phantom Strike",
-		"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": 6400,
-		"Tier": 4,
-		"Activation": "Press",
 		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
 		],
 		"ShopFilters": [
-			"WeaponDamage",
-			"Durability",
-			"Movement",
 			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 35,
+		"AbilityCooldown": 18,
-		"AbilityCastRange": "25m",
+		"AbilityDuration": 7,
 		"AbilityUnitTargetLimit": 1,
-		"AbilityCastDelay": 0.35,
+		"AbilityCooldownBetweenCharge": -1,
-		"ChannelMoveSpeed": "1.3m",
+		"ChannelMoveSpeed": -1,
-		"TechPower": 8,
+		"SpreadDuration": 0.5,
-		"BaseAttackDamagePercent": 15,
+		"StartRadius": "2m",
-		"SlowPercent": 50,
+		"EndRadius": "12m",
-		"SlowDuration": 3,
+		"Damage": {
-		"ImpactDamage": {
+			"Value": 250,
-			"Value": 75,
 			"Scale": {
-				"Value": 0.93,
+				"Value": 0.465,
 				"Type": "spirit"
 			}
-		}
+		},
+		"DamageHeight": "2.5m",
+		"BonusHealth": 300
 	},
-	"upgrade_predator_precision": {
+	"upgrade_omnicharge_pendant": {
-		"Name": "Predator Precision",
+		"Name": "Omnicharge Signet",
-		"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": "Imbue any active non-ultimate ability with \u003Cspan class=\"highlight\"\u003EBonus Ability Charges\u003C/span\u003E.  Already charged items recieve more bonus charges.",
-		"Cost": 1600,
+		"Cost": 9999,
-		"Tier": 2,
+		"Tier": 5,
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": [
+		"ShopFilters": null,
-			"FireRate"
+		"IsDisabled": false,
-		],
-		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"BonusFireRate": 8,
+		"CooldownBetweenChargeReduction": 70,
-		"LifeThreshold": 50,
+		"BonusAbilityCharges": 4,
-		"BaseAttackDamagePercent": 50
+		"BonusAbilityChargesNonCharge": 2,
+		"EnableAbilityCharges": 1,
+		"CooldownReductionOnChargedAbilities": 30,
+		"BonusSpiritForChargedAbilities": 50
 	},
-	"upgrade_pristine_emblem": {
+	"upgrade_patrons_blessing": {
-		"Name": "Opening Rounds",
+		"Name": "Mystic Conduit",
-		"Description": "Your attacks have additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E against \u003Cspan class=\"highlight\"\u003Eenemies above 50% health\u003C/span\u003E.",
+		"Description": "Provides yourself and allies with a powerful spirit focused aura. Has reduced values on allies.",
-		"Cost": 1600,
+		"Cost": 9999,
-		"Tier": 2,
+		"Tier": 5,
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"AllFriendly"
 		],
-		"ShopFilters": [
+		"ShopFilters": null,
-			"MagicDamage",
+		"IsDisabled": false,
-			"Durability"
+		"AbilityCooldown": 25,
-		],
-		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"TechPower": 8,
+		"TechPower": 40,
-		"EnemyLifeThreshold": 50,
+		"Radius": "25m",
-		"BaseAttackDamagePercentBonus": 40
+		"TechRangeMultiplier": 40,
+		"TechRadiusMultiplier": 40,
+		"CooldownReduction": 40,
+		"AllyPercentage": 50,
+		"HealAmount": 700,
+		"HealRadius": "35m",
+		"DamageThreshold": 300,
+		"DamageThresholdDuration": 5
 	},
-	"upgrade_proc_disarm": {
+	"upgrade_personal_rejuvenator": {
-		"Name": "Disarming Bullets",
+		"Name": "Rebirth",
-		"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": "Respawns the hero at the spot they died.",
-		"Cost": 1600,
+		"Cost": 3200,
-		"Tier": 2,
+		"Tier": 3,
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": [
+		"TargetTypes": null,
-			"HeroEnemy"
-		],
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityDuration": 5,
+		"AbilityCooldown": 509,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"ImmunityDuration": 3,
+		"RespawnDelay": 5
-		"BuildUpPerShot": 1,
-		"BuildUpDuration": 10
 	},
-	"upgrade_proc_silence": {
+	"upgrade_phantom_strike": {
-		"Name": "Silencer",
+		"Name": "Phantom Strike",
-		"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": "\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": 6400,
 		"Tier": 4,
-		"Activation": "Passive",
+		"Activation": "Press",
-		"Slot": "Weapon",
+		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
@@ Line 4,066: / Line 4,564: @@
 		],
 		"ShopFilters": [
-			"Disruption",
+			"WeaponDamage",
-			"WeaponDamage"
+			"Durability",
+			"Movement",
+			"Disruption"
 		],
 		"IsDisabled": false,
+		"AbilityCooldown": 35,
+		"AbilityCastRange": "25m",
 		"AbilityUnitTargetLimit": 1,
-		"ChannelMoveSpeed": -1,
+		"AbilityCastDelay": 0.35,
-		"TechResist": 15,
+		"AbilityCooldownBetweenCharge": -1,
-		"TechDamageReduction": -25,
+		"ChannelMoveSpeed": "1.3m",
-		"SilenceDuration": 2.5,
+		"TechPower": 8,
-		"DebuffDuration": 6,
+		"BaseAttackDamagePercent": 15,
-		"ImmunityDuration": 10,
+		"SlowPercent": 50,
-		"BuildUpPerShot": 1.04,
+		"SlowDuration": 3,
-		"BuildUpDuration": 5
+		"ImpactDamage": {
+			"Value": 75,
+			"Scale": {
+				"Value": 0.93,
+				"Type": "spirit"
+			}
+		}
 	},
-	"upgrade_proc_tech_damage": {
+	"upgrade_predator_precision": {
-		"Name": "Magitech Rounds",
+		"Name": "Predator Precision",
-		"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": "Gain additional \u003Cspan class=\"highlight\"\u003Eweapon damage\u003C/span\u003E against enemy Heroes that are \u003Cspan class=\"highlight\"\u003Elow health\u003C/span\u003E",
-		"Cost": 3200,
+		"Cost": 1600,
-		"Tier": 3,
+		"Tier": 2,
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
+			"FireRate"
+		],
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"ProcCooldown": 1,
+		"BonusFireRate": 8,
-		"BaseDamagePct": {
+		"LifeThreshold": 50,
-			"Value": 0.0001,
+		"BaseAttackDamagePercent": 50
-			"Scale": {
-				"Value": 3.04668,
-				"Type": "spirit"
-			}
-		},
-		"NanoTechPerShot": {
-			"Value": 1,
-			"Scale": {
-				"Value": 3.04668,
-				"Type": "spirit"
-			}
-		},
-		"BaseDamagePerShot": 1,
-		"SpellAmplificationMultiplier": 5
 	},
-	"upgrade_quarantine": {
+	"upgrade_prism_blast": {
-		"Name": "Quarantine",
+		"Name": "Prism Blast",
-		"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": "You enter a void state and become \u003Cspan class=\"highlight\"\u003Euntargetable and invincible\u003C/span\u003E for a short duration, during which lasers blast out and rotate around you.",
-		"Cost": 1600,
+		"Cost": 9999,
-		"Tier": 2,
+		"Tier": 5,
-		"Activation": "Press",
+		"Activation": "InstantCast",
 		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"AllEnemy"
+		],
+		"ShopFilters": [
+			"FireRate"
 		],
-		"ShopFilters": null,
+		"IsDisabled": false,
-		"IsDisabled": true,
+		"AbilityCooldown": 40,
-		"AbilityCooldown": 42,
+		"AbilityDuration": 6,
-		"AbilityDuration": 4.5,
-		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": 1,
-		"ChannelMoveSpeed": -1
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"BeamLength": "30m",
+		"BeamWidth": "2.9m",
+		"DPS": {
+			"Value": 300,
+			"Scale": {
+				"Value": 1.75,
+				"Type": "spirit"
+			}
+		},
+		"DampingFactor": 3,
+		"LiftHeight": 100,
+		"FloatMoveSpeed": "2.5m"
 	},
-	"upgrade_quick_silver": {
+	"upgrade_pristine_emblem": {
-		"Name": "Quicksilver Reload",
+		"Name": "Opening Rounds",
-		"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 attacks have additional \u003Cspan class=\"highlight\"\u003EWeapon Damage\u003C/span\u003E against \u003Cspan class=\"highlight\"\u003Eenemies above 50% health\u003C/span\u003E.",
 		"Cost": 1600,
 		"Tier": 2,
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
@@ Line 4,143: / Line 4,654: @@
 		"ShopFilters": [
 			"MagicDamage",
-			"FireRate"
+			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 18,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"BonusFireRate": 10,
+		"TechPower": 8,
-		"BuffDuration": 12,
+		"EnemyLifeThreshold": 50,
-		"Damage": 44,
+		"BaseAttackDamagePercentBonus": 40
-		"AmmoReloadPercent": 100,
-		"AbilityChargeUpTime": 18
 	},
-	"upgrade_rapid_recharge": {
+	"upgrade_proc_disarm": {
-		"Name": "Rapid Recharge",
+		"Name": "Disarming Bullets",
-		"Description": 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.",
-		"Cost": 3200,
+		"Cost": 1600,
-		"Tier": 3,
+		"Tier": 2,
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_extra_charge"
+		"TargetTypes": [
+			"HeroEnemy"
 		],
-		"TargetTypes": null,
 		"ShopFilters": null,
-		"IsDisabled": false,
+		"IsDisabled": true,
+		"AbilityDuration": 5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"CooldownBetweenChargeReduction": 50,
+		"ImmunityDuration": 3,
-		"BonusAbilityCharges": 2,
+		"BuildUpPerShot": 1,
-		"BonusSpiritForChargedAbilities": 16
+		"BuildUpDuration": 10
 	},
-	"upgrade_rapid_rounds": {
+	"upgrade_proc_silence": {
-		"Name": "Rapid Rounds",
+		"Name": "Silencer",
-		"Description": 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.",
-		"Cost": 800,
+		"Cost": 6400,
-		"Tier": 1,
+		"Tier": 4,
 		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
 		"ShopFilters": [
-			"FireRate",
+			"Disruption",
-			"Movement"
+			"WeaponDamage"
 		],
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"BonusFireRate": 10
+		"TechResist": 15,
-	},
+		"TechDamageReduction": -25,
-	"upgrade_rebirth": {
+		"SilenceDuration": 2.5,
-		"Name": "Soul Rebirth",
+		"DebuffDuration": 6,
-		"Description": null,
+		"ImmunityDuration": 10,
-		"Cost": 6400,
+		"BuildUpPerShot": 1.04,
-		"Tier": 4,
+		"BuildUpDuration": 5
+	},
+	"upgrade_proc_tech_damage": {
+		"Name": "Magitech Rounds",
+		"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": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": 240,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"TechPower": 12,
+		"ProcCooldown": 1,
-		"SpawnTimePenalty": 30,
+		"BaseDamagePct": {
-		"RespawnDelay": 4,
+			"Value": 0.0001,
-		"RespawnHealthPercent": 50
+			"Scale": {
+				"Value": 3.04668,
+				"Type": "spirit"
+			}
+		},
+		"NanoTechPerShot": {
+			"Value": 1,
+			"Scale": {
+				"Value": 3.04668,
+				"Type": "spirit"
+			}
+		},
+		"BaseDamagePerShot": 1,
+		"SpellAmplificationMultiplier": 5
 	},
-	"upgrade_reduce_debuff_duration": {
+	"upgrade_quarantine": {
-		"Name": "Debuff Remover",
+		"Name": "Quarantine",
-		"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": 3200,
+		"Cost": 1600,
-		"Tier": 3,
+		"Tier": 2,
-		"Activation": "InstantCast",
+		"Activation": "Press",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": [
+		"Components": null,
-			"upgrade_debuff_reducer"
+		"TargetTypes": [
+			"HeroEnemy"
 		],
-		"TargetTypes": null,
+		"ShopFilters": null,
-		"ShopFilters": [
+		"IsDisabled": true,
-			"WeaponDamage"
+		"AbilityCooldown": 42,
-		],
+		"AbilityDuration": 4.5,
-		"IsDisabled": false,
+		"AbilityCastRange": "30m",
-		"AbilityCooldown": 50,
 		"AbilityUnitTargetLimit": 1,
-		"ChannelMoveSpeed": -1,
+		"AbilityCooldownBetweenCharge": -1,
-		"StatusResistancePercent": 30,
+		"ChannelMoveSpeed": -1
-		"ActiveBonusMoveSpeed": "2.25m",
-		"BuffDuration": 3,
-		"HealOnActivate": 250,
-		"BonusHealth": 100
 	},
-	"upgrade_regenerating_bullet_shield": {
+	"upgrade_quick_silver": {
-		"Name": "Battle Vest",
+		"Name": "Quicksilver Reload",
-		"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": "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": 1600,
 		"Tier": 2,
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"WeaponDamage",
+			"MagicDamage",
-			"Durability"
+			"FireRate"
 		],
 		"IsDisabled": false,
+		"AbilityCooldown": 18,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"BulletResist": 18,
+		"BonusFireRate": 10,
-		"OutOfCombatHealthRegen": 3,
+		"BuffDuration": 12,
-		"LifeThreshold": 65,
+		"Damage": 44,
-		"BaseAttackDamagePercent": 15,
+		"AmmoReloadPercent": 100,
-		"BonusFireRate": 8
+		"AbilityChargeUpTime": 18
 	},
-	"upgrade_regenerative_armor": {
+	"upgrade_rapid_recharge": {
-		"Name": "Regenerative Armor",
+		"Name": "Rapid Recharge",
-		"Description": "Gain a short burst of health regeneration when taking bullet damage from heroes",
+		"Description": null,
-		"Cost": 1600,
+		"Cost": 3200,
-		"Tier": 2,
+		"Tier": 3,
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
+			"upgrade_extra_charge"
+		],
 		"TargetTypes": null,
 		"ShopFilters": null,
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityDuration": 5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"BonusHealthRegen": 20
+		"CooldownBetweenChargeReduction": 50,
+		"BonusAbilityCharges": 2,
+		"BonusSpiritForChargedAbilities": 16
 	},
-	"upgrade_reinforcing_casings": {
+	"upgrade_rapid_rounds": {
-		"Name": "Escalating Resilience",
+		"Name": "Rapid Rounds",
-		"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,
+		"Cost": 800,
-		"Tier": 3,
+		"Tier": 1,
 		"Activation": "Passive",
 		"Slot": "Weapon",
-		"Components": [
+		"Components": null,
-			"upgrade_clip_size"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"FireRate",
-			"Durability",
+			"Movement"
-			"FireRate"
 		],
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"MaxArmorStacks": 30,
+		"BonusFireRate": 10
-		"BulletResistPerStack": 2,
-		"BulletResistDuration": 24,
-		"BaseAttackDamagePercent": 15,
-		"BonusHealth": 75,
-		"BonusClipSizePercent": 30
 	},
-	"upgrade_reload_speed": {
+	"upgrade_rebirth": {
-		"Name": "Fast Reload",
+		"Name": "Soul Rebirth",
-		"Description": "Increased \u003Cspan class=\"highlight\"\u003Ereload speed\u003C/span\u003E.",
+		"Description": null,
+		"Cost": 6400,
+		"Tier": 4,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityCooldown": 240,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"TechPower": 12,
+		"SpawnTimePenalty": 30,
+		"RespawnDelay": 4,
+		"RespawnHealthPercent": 50
+	},
+	"upgrade_rechargingbullets": {
+		"Name": "Recharging Rush",
+		"Description": "Dealing significant {g:citadel_inline_attribute:'WeaponDamage'} replenishes a charge for \u003Cspan class=\"highlight\"\u003Eeach of your charged abilities\u003C/span\u003E.",
 		"Cost": 1600,
 		"Tier": 2,
@@ Line 4,308: / Line 4,858: @@
 		"Components": null,
 		"TargetTypes": null,
-		"ShopFilters": null,
+		"ShopFilters": [
-		"IsDisabled": true,
+			"WeaponDamage",
+			"Durability"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 20,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"ReloadSpeedMultipler": -35
+		"BonusClipSizePercent": 20,
+		"BaseAttackDamagePercent": 10,
+		"DamageThreshold": 200,
+		"DamageWindow": 3.5
 	},
-	"upgrade_rescue_beam": {
+	"upgrade_reduce_debuff_duration": {
-		"Name": "Rescue Beam",
+		"Name": "Debuff Remover",
-		"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": null,
 		"Cost": 3200,
 		"Tier": 3,
-		"Activation": "Press",
+		"Activation": "InstantCast",
 		"Slot": "Armor",
 		"Components": [
-			"upgrade_health_stimpak"
+			"upgrade_debuff_reducer"
-		],
-		"TargetTypes": [
-			"HeroFriendly"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage"
-			"Durability",
-			"Healing",
-			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 60,
+		"AbilityCooldown": 50,
-		"AbilityCastRange": "32m",
 		"AbilityUnitTargetLimit": 1,
-		"AbilityChannelTime": 2.5,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"HealPercentAmount": 20,
+		"StatusResistancePercent": 30,
-		"HealInterval": 0.2,
+		"ActiveBonusMoveSpeed": "2.25m",
-		"BonusMoveSpeed": "0m",
+		"BuffDuration": 3,
-		"BonusSprintSpeed": "0.75m",
+		"HealOnActivate": 250,
-		"SelfModifier": 100,
+		"BonusHealth": 100
-		"TechRangeMultiplier": 8,
-		"TechRadiusMultiplier": 8
 	},
-	"upgrade_resilience": {
+	"upgrade_regenerating_bullet_shield": {
-		"Name": "Enduring Spirit",
+		"Name": "Battle Vest",
-		"Description": 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.",
-		"Cost": 800,
+		"Cost": 1600,
-		"Tier": 1,
+		"Tier": 2,
 		"Activation": "Passive",
 		"Slot": "Armor",
@@ Line 4,357: / Line 4,907: @@
 		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
 			"Durability"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"BonusHealth": 25,
+		"BulletResist": 18,
-		"AbilityLifestealPercentHero": 7
+		"OutOfCombatHealthRegen": 3,
+		"LifeThreshold": 65,
+		"BaseAttackDamagePercent": 15,
+		"BonusFireRate": 8
 	},
-	"upgrade_resonant_healing": {
+	"upgrade_regenerative_armor": {
-		"Name": "Radiant Regeneration",
+		"Name": "Regenerative Armor",
-		"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": "Gain a short burst of health regeneration when taking bullet damage from heroes",
-		"Cost": 3200,
+		"Cost": 1600,
-		"Tier": 3,
+		"Tier": 2,
 		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_mystic_regeneration"
+		"TargetTypes": null,
-		],
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityDuration": 5,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"BonusHealthRegen": 20
+	},
+	"upgrade_reinforcing_casings": {
+		"Name": "Escalating Resilience",
+		"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": "Passive",
+		"Slot": "Weapon",
+		"Components": [
+			"upgrade_clip_size"
+		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"MagicDamage",
+			"WeaponDamage",
-			"Movement",
+			"Durability",
-			"Healing"
+			"FireRate"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 6,
-		"AbilityDuration": 3,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"HealingPerCast": {
+		"MaxArmorStacks": 30,
-			"Value": 70,
+		"BulletResistPerStack": 2,
-			"Scale": {
+		"BulletResistDuration": 24,
-				"Value": 1.5,
+		"BaseAttackDamagePercent": 15,
-				"Type": "power_increase"
+		"BonusHealth": 75,
-			}
+		"BonusClipSizePercent": 30
-		},
-		"BonusMoveSpeed": "1.75m",
-		"Regeneration": {
-			"Value": 4,
-			"Scale": {
-				"Value": 0.04,
-				"Type": "spirit"
-			}
-		},
-		"RegenerationDuration": 5
 	},
-	"upgrade_restorative_locket": {
+	"upgrade_reload_speed": {
-		"Name": "Restorative Locket",
+		"Name": "Fast Reload",
-		"Description": null,
+		"Description": "Increased \u003Cspan class=\"highlight\"\u003Ereload speed\u003C/span\u003E.",
 		"Cost": 1600,
 		"Tier": 2,
+		"Activation": "Passive",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"ReloadSpeedMultipler": -35
+	},
+	"upgrade_rescue_beam": {
+		"Name": "Rescue Beam",
+		"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": "Press",
 		"Slot": "Armor",
-		"Components": null,
+		"Components": [
+			"upgrade_health_stimpak"
+		],
 		"TargetTypes": [
 			"HeroFriendly"
 		],
 		"ShopFilters": [
+			"MagicDamage",
+			"Durability",
 			"Healing",
-			"Durability"
+			"Movement"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 30,
+		"AbilityCooldown": 60,
-		"AbilityCastRange": "30m",
+		"AbilityCastRange": "32m",
 		"AbilityUnitTargetLimit": 1,
-		"AbilityCastDelay": 0.1,
+		"AbilityChannelTime": 2.5,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"Radius": "30m",
+		"HealPercentAmount": 20,
-		"TechResist": 6,
+		"HealInterval": 0.2,
-		"HealPerStack": {
+		"BonusMoveSpeed": "0m",
-			"Value": 20,
+		"BonusSprintSpeed": "0.75m",
-			"Scale": {
+		"SelfModifier": 100,
-				"Value": 0.4,
+		"TechRangeMultiplier": 8,
-				"Type": "power_increase"
+		"TechRadiusMultiplier": 8
-			}
-		},
-		"MaxStacks": 20,
-		"StaminaToRestore": 2
 	},
-	"upgrade_return_fire": {
+	"upgrade_resilience": {
-		"Name": "Return Fire",
+		"Name": "Enduring Spirit",
-		"Description": "Automatically \u003Cspan class=\"highlight\"\u003Efire a bullet\u003C/span\u003E towards any attacker who damages you with their abilities or weapon.",
+		"Description": null,
-		"Cost": 1600,
+		"Cost": 800,
-		"Tier": 2,
+		"Tier": 1,
-		"Activation": "InstantCast",
+		"Activation": "Passive",
 		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": [
-			"Durability",
 			"MagicDamage",
-			"FireRate"
+			"Durability"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
-		"AbilityCooldown": 25,
-		"AbilityDuration": 6,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"BulletDamageReflectedPct": 60,
+		"BonusHealth": 25,
-		"SpiritDamageReflectedPct": 25,
+		"AbilityLifestealPercentHero": 7
-		"BulletResist": 8
 	},
-	"upgrade_ricochet": {
+	"upgrade_resonant_healing": {
-		"Name": "Ricochet",
+		"Name": "Radiant Regeneration",
-		"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": "\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": 6400,
+		"Cost": 3200,
-		"Tier": 4,
+		"Tier": 3,
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
+			"upgrade_mystic_regeneration"
-			"HeroEnemy",
-			"BossEnemy",
-			"TrooperEnemy",
-			"PropEnemy",
-			"MinionEnemy",
-			"Neutral"
 		],
+		"TargetTypes": null,
 		"ShopFilters": [
-			"ClipSize"
+			"MagicDamage",
+			"Movement",
+			"Healing"
 		],
 		"IsDisabled": false,
+		"AbilityCooldown": 6,
+		"AbilityDuration": 3,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"RicochetDamagePercent": 65,
+		"HealingPerCast": {
-		"RicochetRadius": "13m",
+			"Value": 70,
-		"RicochetTargetsTooltipOnly": 2,
+			"Scale": {
-		"BonusFireRate": 20
+				"Value": 1.5,
+				"Type": "power_increase"
+			}
+		},
+		"BonusMoveSpeed": "1.75m",
+		"Regeneration": {
+			"Value": 4,
+			"Scale": {
+				"Value": 0.04,
+				"Type": "spirit"
+			}
+		},
+		"RegenerationDuration": 5
 	},
-	"upgrade_rocket_booster": {
+	"upgrade_restorative_locket": {
-		"Name": "Majestic Leap",
+		"Name": "Restorative Locket",
-		"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": null,
-		"Cost": 3200,
+		"Cost": 1600,
-		"Tier": 3,
+		"Tier": 2,
-		"Activation": "InstantCast",
+		"Activation": "Press",
 		"Slot": "Armor",
 		"Components": null,
 		"TargetTypes": [
-			"AllEnemy"
+			"HeroFriendly"
 		],
 		"ShopFilters": [
-			"Movement"
+			"Healing",
+			"Durability"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 45,
+		"AbilityCooldown": 30,
+		"AbilityCastRange": "30m",
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"JumpVelocityHidden": "27m",
+		"Radius": "30m",
-		"InteruptCooldown": 5,
+		"TechResist": 6,
-		"AirControlPercent": 100,
+		"HealPerStack": {
-		"SlamDownRadius": "10m",
+			"Value": 20,
-		"VerticalDifferenceTolerance": "2m",
+			"Scale": {
-		"TossSpeed": 500,
+				"Value": 0.4,
-		"SlowPercent": 40,
-		"SlowDuration": 2.5,
-		"DropDownSpeed": "35m",
-		"MaxLandingSpeed": "20m",
-		"ImpactHeight": "2m",
-		"MinAimAngle": 30,
-		"CombatBarrier": {
-			"Value": 140,
-			"Scale": {
-				"Value": 8,
 				"Type": "power_increase"
 			}
 		},
-		"BarrierDuration": 8
+		"MaxStacks": 20,
+		"StaminaToRestore": 2
 	},
-	"upgrade_rocket_boots": {
+	"upgrade_return_fire": {
-		"Name": "Majestic Leap - Disabled",
+		"Name": "Return Fire",
-		"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": "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",
@@ Line 4,536: / Line 5,117: @@
 		"TargetTypes": null,
 		"ShopFilters": [
+			"Durability",
 			"MagicDamage",
-			"Movement"
+			"FireRate"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 16,
+		"AbilityCooldown": 25,
+		"AbilityDuration": 6,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"TechPower": 8,
+		"BulletDamageReflectedPct": 60,
-		"JumpVelocityHidden": "22.5m",
+		"SpiritDamageReflectedPct": 25,
-		"InteruptCooldown": 4,
+		"BulletResist": 8
-		"AirControlPercent": 100,
-		"BonusHealth": 50
 	},
-	"upgrade_rupture": {
+	"upgrade_ricochet": {
-		"Name": "Decay",
+		"Name": "Ricochet",
-		"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": "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": "Press",
+		"Activation": "Passive",
-		"Slot": "Tech",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"HeroEnemy",
+			"BossEnemy",
+			"TrooperEnemy",
+			"PropEnemy",
+			"MinionEnemy",
+			"Neutral"
 		],
 		"ShopFilters": [
-			"MagicDamage",
+			"ClipSize"
-			"Disruption"
 		],
 		"IsDisabled": false,
-		"AbilityCooldown": 32,
-		"AbilityDuration": 10,
-		"AbilityCastRange": {
-			"Value": "20m",
-			"Scale": {
-				"Value": 0.1,
-				"Type": "spirit"
-			}
-		},
 		"AbilityUnitTargetLimit": 1,
-		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"TechPower": 8,
+		"RicochetDamagePercent": 65,
-		"HealAmpReceivePenaltyPercent": -45,
+		"RicochetRadius": "13m",
-		"HealAmpRegenPenaltyPercent": -45,
+		"RicochetTargetsTooltipOnly": 2,
-		"TickRate": 1,
+		"BonusFireRate": 20
-		"DotHealthPercent": {
-			"Value": 2.6,
-			"Scale": {
-				"Value": 0.0055,
-				"Type": "spirit"
-			}
-		},
-		"BonusHealth": 65
 	},
-	"upgrade_self_bubble": {
+	"upgrade_rocket_booster": {
-		"Name": "Ethereal Shift",
+		"Name": "Majestic Leap",
-		"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 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": 6400,
+		"Cost": 3200,
-		"Tier": 4,
+		"Tier": 3,
 		"Activation": "InstantCast",
-		"Slot": "Tech",
+		"Slot": "Armor",
 		"Components": null,
-		"TargetTypes": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
 		"ShopFilters": [
-			"FireRate"
+			"Movement"
 		],
 		"IsDisabled": false,
 		"AbilityCooldown": 45,
-		"AbilityDuration": 4,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"BuffDuration": 5,
+		"JumpVelocityHidden": "27m",
-		"TechResist": 30,
+		"InterruptCooldown": 5,
-		"DampingFactor": 3,
+		"AirControlPercent": 100,
-		"LiftHeight": 120,
+		"SlamDownRadius": "10m",
-		"BonusSpirit": 20,
+		"VerticalDifferenceTolerance": "2m",
-		"MoveSpeedMax": "2.5m",
+		"TossSpeed": 500,
-		"BonusMoveSpeed": "3m"
+		"SlowPercent": 40,
+		"SlowDuration": 2.5,
+		"DropDownSpeed": "35m",
+		"MaxLandingSpeed": "20m",
+		"ImpactHeight": "2m",
+		"MinAimAngle": 30,
+		"CombatBarrier": {
+			"Value": 140,
+			"Scale": {
+				"Value": 8,
+				"Type": "power_increase"
+			}
+		},
+		"BarrierDuration": 8
 	},
-	"upgrade_sharpshooter": {
+	"upgrade_rocket_boots": {
-		"Name": "Sharpshooter",
+		"Name": "Majestic Leap - Disabled",
-		"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": "\u003Cspan class=\"highlight\"\u003ELaunch yourself\u003C/span\u003E high into the air. Cannot be used for {s:InterruptCooldown}s if damaged by enemy Hero.",
 		"Cost": 3200,
 		"Tier": 3,
-		"Activation": "Passive",
+		"Activation": "InstantCast",
-		"Slot": "Weapon",
+		"Slot": "Armor",
-		"Components": [
+		"Components": null,
-			"upgrade_long_range"
-		],
 		"TargetTypes": null,
 		"ShopFilters": [
-			"WeaponDamage",
+			"MagicDamage",
-			"ClipSize"
+			"Movement"
 		],
-		"IsDisabled": false,
+		"IsDisabled": true,
+		"AbilityCooldown": 16,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"LongRangeBonusWeaponPower": 70,
+		"TechPower": 8,
-		"LongRangeBonusWeaponPowerMinRange": "15m",
+		"JumpVelocityHidden": "22.5m",
-		"BonusAttackRangePercent": 20,
+		"InterruptCooldown": 4,
-		"BonusZoomPercent": 25,
+		"AirControlPercent": 100,
-		"BonusMoveSpeed": "-1m",
+		"BonusHealth": 50
-		"BonusSprintSpeed": "1.0m"
+	},
-	},
+	"upgrade_runed_gauntlets": {
-	"upgrade_silencer": {
+		"Name": "Runed Gauntlets",
-		"Name": "Silencer",
+		"Description": "Everytime you land a heavy melee, your existing cooldowns get reduced.",
-		"Description": null,
+		"Cost": 9999,
-		"Cost": 6400,
+		"Tier": 5,
-		"Tier": 4,
+		"Activation": "Passive",
-		"Activation": "InstantCast",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityCooldown": 10,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"MeleeDistanceScale": 130,
+		"MeleeResistPercent": 50,
+		"BonusMeleeDamagePercent": 30,
+		"CooldownReductionOnHitMin": 3,
+		"CooldownReductionOnHitPct": 12
+	},
+	"upgrade_rupture": {
+		"Name": "Decay",
+		"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": "Press",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"MagicDamage",
+			"Disruption"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 32,
+		"AbilityDuration": 10,
+		"AbilityCastRange": {
+			"Value": "20m",
+			"Scale": {
+				"Value": 0.1,
+				"Type": "spirit"
+			}
+		},
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"TechPower": 8,
+		"HealAmpReceivePenaltyPercent": -45,
+		"HealAmpRegenPenaltyPercent": -45,
+		"TickRate": 1,
+		"DotHealthPercent": {
+			"Value": 2.6,
+			"Scale": {
+				"Value": 0.0055,
+				"Type": "spirit"
+			}
+		},
+		"BonusHealth": 65
+	},
+	"upgrade_self_bubble": {
+		"Name": "Ethereal Shift",
+		"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": "Tech",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": [
+			"FireRate"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 45,
+		"AbilityDuration": 4,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"BuffDuration": 5,
+		"TechResist": 30,
+		"DampingFactor": 3,
+		"LiftHeight": 200,
+		"BonusSpirit": 20,
+		"FloatMoveSpeed": "2.5m",
+		"BonusMoveSpeed": "3m"
+	},
+	"upgrade_shadow_step": {
+		"Name": "Shadow Step",
+		"Description": "\u003Cspan class=\"highlight\"\u003ETeleport\u003C/span\u003E straight ahead.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "InstantCast",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": [
+			"WeaponDamage",
+			"Movement"
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 3,
+		"AbilityCastRange": "12m",
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"DamagePulseInterval": 0.5,
+		"DamagePulseAmount": 50,
+		"DamagePulseRadius": "13m"
+	},
+	"upgrade_shadow_strike": {
+		"Name": "Shadow Strike",
+		"Description": "Go \u003Cspan class=\"highlight\"\u003EInvisible\u003C/span\u003E on \u003Cspan class=\"highlight\"\u003EStamina use\u003C/span\u003E with no detection range. Doing a \u003Cspan class=\"highlight\"\u003Emelee attack\u003C/span\u003E while invisible will cause you to \u003Cspan class=\"highlight\"\u003Esteal bullet and spirit resistance\u003C/span\u003E from them and deal \u003Cspan class=\"highlight\"\u003Edamage over time\u003C/span\u003E.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityDuration": 2.5,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"InvisAlertWhenFading": 1,
+		"InvisFadeToDuration": 0.2,
+		"SpottedRadius": "0m",
+		"RevealOnDamageDuration": 1.5,
+		"RevealOnSpottedDuration": 0.25,
+		"ResistStealAmount": 40,
+		"TickRate": 1,
+		"DPS": {
+			"Value": 75,
+			"Scale": {
+				"Value": 0.2,
+				"Type": "spirit"
+			}
+		},
+		"MaxStacks": 1,
+		"StealDuration": 6,
+		"Stamina": 2
+	},
+	"upgrade_sharpshooter": {
+		"Name": "Sharpshooter",
+		"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": 3200,
+		"Tier": 3,
+		"Activation": "Passive",
+		"Slot": "Weapon",
+		"Components": [
+			"upgrade_long_range"
+		],
+		"TargetTypes": null,
+		"ShopFilters": [
+			"WeaponDamage",
+			"ClipSize"
+		],
+		"IsDisabled": false,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"LongRangeBonusWeaponPower": 70,
+		"LongRangeBonusWeaponPowerMinRange": "15m",
+		"BonusAttackRangePercent": 20,
+		"BonusZoomPercent": 25,
+		"BonusMoveSpeed": "-1m",
+		"BonusSprintSpeed": "1.0m"
+	},
+	"upgrade_shivas_bracelet": {
+		"Name": "Frostbite Charm",
+		"Description": "Imbued ability has its \u003Cspan class=\"highlight\"\u003ECooldown reduced\u003C/span\u003E and gains \u003Cspan class=\"highlight\"\u003ESpirit Power\u003C/span\u003E.  When the ability deals damage, \u003Cspan class=\"highlight\"\u003Efreeze\u003C/span\u003E the target and apply \u003Cspan class=\"highlight\"\u003Ebonus damage\u003C/span\u003E. \u003Cspan class=\"diminish\"\u003E\u003Cbr\u003E\u003Cbr\u003ECooldown is per target.\u003C/span\u003E",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityCooldown": 10,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"ImbuedCooldownReduction": 50,
+		"ImbuedTechPower": 70,
+		"Damage": 200,
+		"FreezeDuration": 1
+	},
+	"upgrade_shrink_ray": {
+		"Name": "Shrink Ray",
+		"Description": "Reduces \u003Cspan class=\"highlight\"\u003EModel Size\u003C/span\u003E and grants \u003Cspan class=\"highlight\"\u003EMove Speed\u003C/span\u003E to the target. Allows \u003Cspan class=\"highlight\"\u003Eusage of tunnels\u003C/span\u003E in this mode. Can be self-cast.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Press",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": [
+			"HeroFriendly"
+		],
+		"ShopFilters": [
+			"Healing"
+		],
+		"IsDisabled": false,
+		"AbilityCooldown": 30,
+		"AbilityCastRange": "40m",
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"ShrinkDuration": 60,
+		"BonusMoveSpeed": "5.0m",
+		"ModelScaleGrowth": 0.5,
+		"ModelScaleGrowthTooltip": -50
+	},
+	"upgrade_silencer": {
+		"Name": "Silencer",
+		"Description": null,
+		"Cost": 6400,
+		"Tier": 4,
+		"Activation": "InstantCast",
+		"Slot": "Weapon",
+		"Components": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"Disruption"
+		],
+		"IsDisabled": true,
+		"AbilityCooldown": 36,
+		"AbilityDuration": 4,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"EMPDuration": 2,
+		"BaseAttackDamagePercent": 20
+	},
+	"upgrade_siphon_bullets": {
+		"Name": "Siphon Bullets",
+		"Description": null,
+		"Cost": 6400,
+		"Tier": 4,
+		"Activation": "Passive",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": [
+			"HeroEnemy"
+		],
+		"ShopFilters": [
+			"WeaponDamage",
+			"Healing"
+		],
+		"IsDisabled": false,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"BaseAttackDamagePercent": 15,
+		"BulletResist": 10,
+		"StealPerHit": 1,
+		"StealPerKill": 1,
+		"StackLostPerDeath": 2,
+		"MaxStacks": 9999,
+		"StealDuration": 17,
+		"ProcCooldown": 1.2,
+		"HealthSteal": {
+			"Value": 35,
+			"Scale": {
+				"Value": 0.8,
+				"Type": "power_increase"
+			}
+		},
+		"ParticleRadius": "1m"
+	},
+	"upgrade_slow_immunity": {
+		"Name": "Unstoppable - Deprecated",
+		"Description": "Purges any roots and chains on use and makes you immune to slows for the duration",
+		"Cost": 1600,
+		"Tier": 2,
+		"Activation": "InstantCast",
+		"Slot": "Armor",
+		"Components": null,
+		"TargetTypes": null,
+		"ShopFilters": null,
+		"IsDisabled": true,
+		"AbilityCooldown": 32,
+		"AbilityDuration": 6,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1
+	},
+	"upgrade_slowing_bullets": {
+		"Name": "Slowing Bullets",
+		"Description": "Your bullets build up a \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E on enemies.",
+		"Cost": 1600,
+		"Tier": 2,
+		"Activation": "Passive",
 		"Slot": "Weapon",
 		"Components": null,
@@ Line 4,652: / Line 5,534: @@
 		],
 		"ShopFilters": [
+			"WeaponDamage",
 			"Disruption"
 		],
-		"IsDisabled": true,
+		"IsDisabled": false,
-		"AbilityCooldown": 36,
-		"AbilityDuration": 4,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
-		"EMPDuration": 2,
+		"SlowPercent": 30,
-		"BaseAttackDamagePercent": 20
+		"GroundDashReductionPercent": -20,
+		"SlowDuration": 3.5,
+		"BonusFireRate": 7,
+		"BuildUpDuration": 5,
+		"BuildUpPerShot": 0.77
 	},
-	"upgrade_siphon_bullets": {
+	"upgrade_slowing_tech": {
-		"Name": "Siphon Bullets",
+		"Name": "Slowing Spirit",
-		"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": 6400,
+		"Cost": 800,
-		"Tier": 4,
+		"Tier": 1,
 		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Tech",
 		"Components": null,
 		"TargetTypes": [
-			"HeroEnemy"
+			"HeroEnemy",
+			"CreepEnemy"
 		],
-		"ShopFilters": [
+		"ShopFilters": null,
-			"WeaponDamage",
+		"IsDisabled": true,
-			"Healing"
+		"AbilityUnitTargetLimit": 1,
-		],
+		"AbilityCooldownBetweenCharge": -1,
-		"IsDisabled": false,
-		"AbilityUnitTargetLimit": 1,
 		"ChannelMoveSpeed": -1,
-		"BaseAttackDamagePercent": 15,
+		"SlowPercent": 15,
-		"BulletResist": 10,
+		"SlowDuration": 2
-		"StealPerHit": 1,
-		"StealPerKill": 1,
-		"StackLostPerDeath": 2,
-		"MaxStacks": 9999,
-		"StealDuration": 17,
-		"ProcCooldown": 1.2,
-		"HealthSteal": {
-			"Value": 35,
-			"Scale": {
-				"Value": 0.8,
-				"Type": "power_increase"
-			}
-		},
-		"ParticleRadius": "1m"
 	},
-	"upgrade_slow_immunity": {
+	"upgrade_small_attack_speed": {
-		"Name": "Unstoppable - Deprecated",
+		"Name": "Basic Fire Rate",
-		"Description": "Purges any roots and chains on use and makes you immune to slows for the duration",
+		"Description": "Increases your \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
-		"Cost": 1600,
+		"Cost": 800,
-		"Tier": 2,
+		"Tier": 1,
-		"Activation": "InstantCast",
+		"Activation": "Passive",
-		"Slot": "Armor",
+		"Slot": "Weapon",
 		"Components": null,
 		"TargetTypes": null,
 		"ShopFilters": null,
 		"IsDisabled": true,
-		"AbilityCooldown": 32,
-		"AbilityDuration": 6,
 		"AbilityUnitTargetLimit": 1,
-		"ChannelMoveSpeed": -1
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"BonusFireRate": 8
 	},
-	"upgrade_slowing_bullets": {
+	"upgrade_soaring_spirit": {
-		"Name": "Slowing Bullets",
+		"Name": "Improved Spirit",
-		"Description": "Your bullets build up a \u003Cspan class=\"highlight\"\u003EMovement Slow\u003C/span\u003E on enemies.",
+		"Description": null,
 		"Cost": 1600,
 		"Tier": 2,
 		"Activation": "Passive",
-		"Slot": "Weapon",
+		"Slot": "Tech",
-		"Components": null,
+		"Components": [
-		"TargetTypes": [
-			"HeroEnemy"
-		],
-		"ShopFilters": [
-			"WeaponDamage",
-			"Disruption"
-		],
-		"IsDisabled": false,
-		"AbilityUnitTargetLimit": 1,
-		"ChannelMoveSpeed": -1,
-		"SlowPercent": 30,
-		"GroundDashReductionPercent": -20,
-		"SlowDuration": 3.5,
-		"BonusFireRate": 7,
-		"BuildUpDuration": 5,
-		"BuildUpPerShot": 0.77
-	},
-	"upgrade_slowing_tech": {
-		"Name": "Slowing Spirit",
-		"Description": "Dealing \u003Cspan class=\"highlight\"\u003ESpirit Damage\u003C/span\u003E applies \u003Cspan class=\"highlight\"\u003EMovement Slows\u003C/span\u003E to your target.",
-		"Cost": 800,
-		"Tier": 1,
-		"Activation": "Passive",
-		"Slot": "Tech",
-		"Components": null,
-		"TargetTypes": [
-			"HeroEnemy",
-			"CreepEnemy"
-		],
-		"ShopFilters": null,
-		"IsDisabled": true,
-		"AbilityUnitTargetLimit": 1,
-		"ChannelMoveSpeed": -1,
-		"SlowPercent": 15,
-		"SlowDuration": 2
-	},
-	"upgrade_small_attack_speed": {
-		"Name": "Basic Fire Rate",
-		"Description": "Increases your \u003Cspan class=\"highlight\"\u003EFire Rate\u003C/span\u003E.",
-		"Cost": 800,
-		"Tier": 1,
-		"Activation": "Passive",
-		"Slot": "Weapon",
-		"Components": null,
-		"TargetTypes": null,
-		"ShopFilters": null,
-		"IsDisabled": true,
-		"AbilityUnitTargetLimit": 1,
-		"ChannelMoveSpeed": -1,
-		"BonusFireRate": 8
-	},
-	"upgrade_soaring_spirit": {
-		"Name": "Improved Spirit",
-		"Description": null,
-		"Cost": 1600,
-		"Tier": 2,
-		"Activation": "Passive",
-		"Slot": "Tech",
-		"Components": [
 			"upgrade_improved_spirit"
 		],
@@ Line 4,789: / Line 5,601: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 18,
@@ Line 4,810: / Line 5,623: @@
 		"AbilityCooldown": 9,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechResist": 25,
@@ Line 4,855: / Line 5,669: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ProcCooldown": 2.25,
@@ Line 4,879: / Line 5,694: @@
 		"AbilityCooldown": 45,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DamageWindow": 3.5,
@@ Line 4,911: / Line 5,727: @@
 		"AbilityCooldown": 20,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechRangeMultiplier": 8,
@@ Line 4,946: / Line 5,763: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"MagicResistReduction": -9,
@@ Line 4,972: / Line 5,790: @@
 		"AbilityDuration": 10,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"LightMeleeScale": 70,
@@ Line 5,003: / Line 5,822: @@
 		"AbilityCooldown": 32,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusShotsDuration": 5,
@@ Line 5,027: / Line 5,847: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusSprintSpeed": "2.0m",
@@ Line 5,043: / Line 5,864: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"MoveWhileShootingSpeedPenaltyReductionPercent": 100,
@@ Line 5,065: / Line 5,887: @@
 		"AbilityCastRange": "15m",
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ModelScale": 1,
@@ Line 5,094: / Line 5,917: @@
 		"AbilityCastRange": "20m",
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"StasisRadius": "7m",
@@ Line 5,134: / Line 5,958: @@
 		"AbilityDuration": 13,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"StoredSpiritDamage": {
@@ Line 5,164: / Line 5,989: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Stamina": 2,
@@ Line 5,187: / Line 6,013: @@
 		"AbilityDuration": 4,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechPower": 6,
@@ Line 5,215: / Line 6,042: @@
 		"AbilityDuration": 4.5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"ActiveBonusFireRate": 40,
@@ Line 5,243: / Line 6,071: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"StunDelay": 2,
@@ Line 5,274: / Line 6,103: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 50,
@@ Line 5,303: / Line 6,133: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechResist": 15
@@ Line 5,324: / Line 6,155: @@
 		"AbilityCooldown": 6.25,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechDamagePercent": 50,
@@ Line 5,345: / Line 6,177: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechCleaveDamagePercent": 75,
@@ Line 5,368: / Line 6,201: @@
 		"AbilityCooldown": 1.4,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 100,
@@ Line 5,394: / Line 6,228: @@
 		"AbilityDuration": 6,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 85,
@@ Line 5,415: / Line 6,250: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechArmorDamageReduction": -8,
@@ Line 5,438: / Line 6,274: @@
 		"AbilityDuration": 15,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"AbilityLifestealPercentHero": 15,
@@ Line 5,460: / Line 6,297: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechResist": 30,
@@ Line 5,482: / Line 6,320: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"TechRangeMultiplier": 35,
@@ Line 5,507: / Line 6,346: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.2,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DPS": {
@@ Line 5,541: / Line 6,381: @@
 		},
 		"SpiritPower": 8
+	},
+	"upgrade_timeless_emblem": {
+		"Name": "Timeless Emblem",
+		"Description": null,
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "Passive",
+		"Slot": "Tech",
+		"Components": [
+			"upgrade_transcendent_cooldown"
+		],
+		"TargetTypes": null,
+		"ShopFilters": [
+			"Healing"
+		],
+		"IsDisabled": true,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"CooldownReduction": 50,
+		"TechRangeMultiplier": 50,
+		"TechRadiusMultiplier": 50,
+		"BonusAbilityDurationPercent": 50,
+		"ItemCooldownReduction": 50
 	},
 	"upgrade_titan_round": {
@@ Line 5,559: / Line 6,423: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSizePercent": 90,
@@ Line 5,575: / Line 6,440: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 125,
@@ Line 5,598: / Line 6,464: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DotHealthPercent": {
@@ Line 5,630: / Line 6,497: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"CooldownReduction": 25,
@@ Line 5,653: / Line 6,521: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusSprintSpeed": "2.0m",
@@ Line 5,684: / Line 6,553: @@
 		"AbilityDuration": 2,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"Damage": 150,
@@ Line 5,693: / Line 6,563: @@
 		"MovementSpeedSlow": 30,
 		"GroundDashReductionPercent": -10
+	},
+	"upgrade_unstable_concoction": {
+		"Name": "Unstable Concoction",
+		"Description": "Consume a concotion that grants you increased \u003Cspan class=\"highlight\"\u003Espeed, health, spirit and weapon damage\u003C/span\u003E.  After a short duration \u003Cspan class=\"highlight\"\u003Eyou die and explode\u003C/span\u003E, stunning nearby enemies and dealing damage based on your maximum health.",
+		"Cost": 9999,
+		"Tier": 5,
+		"Activation": "InstantCast",
+		"Slot": "Tech",
+		"Components": null,
+		"TargetTypes": [
+			"AllEnemy"
+		],
+		"ShopFilters": null,
+		"IsDisabled": false,
+		"AbilityCooldown": 25,
+		"AbilityDuration": 4,
+		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
+		"ChannelMoveSpeed": -1,
+		"TechPower": 150,
+		"BonusMoveSpeed": "10m",
+		"BonusHealth": 3000,
+		"BaseAttackDamagePercent": 150,
+		"MaxHPDamage": 30,
+		"StunDuration": 3,
+		"Radius": "18m"
 	},
 	"upgrade_unstoppable": {
@@ Line 5,713: / Line 6,609: @@
 		"AbilityDuration": 5.5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 75,
@@ Line 5,732: / Line 6,629: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletLifestealPercent": 16,
@@ Line 5,753: / Line 6,651: @@
 		"AbilityDuration": 16,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"InvisAlertWhenFading": 1,
@@ Line 5,787: / Line 6,686: @@
 		"AbilityDuration": 10,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"VexBarrierCombatBarrier": {
@@ Line 5,814: / Line 6,714: @@
 		"AbilityCastRange": "11m",
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BulletResist": 30,
@@ Line 5,834: / Line 6,735: @@
 		"AbilityDuration": 5,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 50,
@@ Line 5,860: / Line 6,762: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusHealth": 100,
@@ Line 5,881: / Line 6,784: @@
 		"IsDisabled": true,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"WeaponPowerPerKill": 3.5,
@@ Line 5,901: / Line 6,805: @@
 		"AbilityCooldown": 21,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BonusClipSizePercent": 60
@@ Line 5,917: / Line 6,822: @@
 		"AbilityCooldown": 53,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"HealthDamagePercent": 20,
@@ Line 5,937: / Line 6,843: @@
 		"AbilityDuration": 4,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"WeaponPowerWhileActivated": 135,
@@ Line 5,957: / Line 6,864: @@
 		"AbilityCooldown": 45,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"DamageWindow": 3.5,
@@ Line 5,985: / Line 6,893: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"BaseAttackDamagePercent": 35,
@@ Line 6,013: / Line 6,922: @@
 		"AbilityUnitTargetLimit": 1,
 		"AbilityCastDelay": 0.1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1,
 		"FireRateSlow": 35,
@@ Line 6,031: / Line 6,941: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 6,045: / Line 6,956: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 6,059: / Line 6,971: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 6,073: / Line 6,986: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 6,087: / Line 7,001: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	},
@@ Line 6,101: / Line 7,016: @@
 		"IsDisabled": false,
 		"AbilityUnitTargetLimit": 1,
+		"AbilityCooldownBetweenCharge": -1,
 		"ChannelMoveSpeed": -1
 	}
 }

Data:ItemData.json: Difference between revisionsGive feedback

Deadbot (talk | contribs)