Merge remote-tracking branch 'origin/dev'

2017-05-29 23:05:52 +10:00
parent f0c57f030e 8873a4e7ad
commit a233c21856
21 changed files with 1183 additions and 24 deletions
--- a/Classes/SkillsTab.lua
+++ b/Classes/SkillsTab.lua
@@ -429,9 +429,7 @@ function SkillsTabClass:ProcessSocketGroup(socketGroup)
 					gem.level = gem.data.defaultLevel
 					gem.defaultLevel = gem.data.defaultLevel
 				end
-				if not gem.data.levels[gem.level] then
-					gem.level = m_max(1, m_min(#gem.data.levels, gem.level))
-				end
+				calcLib.validateGemLevel(gem)
 				if gem.data.gemTags then
 					gem.reqLevel = gem.data.levels[gem.level][1]
 					gem.reqStr = calcLib.gemStatRequirement(gem.reqLevel, gem.data.support, gem.data.gemStr)
--- a/Data/Minions.lua
+++ b/Data/Minions.lua
@@ -15,6 +15,7 @@ minions["RaisedZombie"] = {
 	damage = 1.5,
 	damageSpread = 0.4,
 	attackTime = 1.755,
+	attackRange = 9,
 	damageFixup = 0.33,
 	limit = "ActiveZombieLimit",
 	skillList = {
@@ -36,6 +37,7 @@ minions["SummonedChaosGolem"] = {
 	damage = 2.48,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	damageFixup = 0.22,
 	limit = "ActiveGolemLimit",
 	skillList = {
@@ -57,6 +59,7 @@ minions["SummonedFlameGolem"] = {
 	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 4,
 	damageFixup = 0.22,
 	limit = "ActiveGolemLimit",
 	skillList = {
@@ -78,6 +81,7 @@ minions["SummonedIceGolem"] = {
 	damage = 3.06,
 	damageSpread = 0.2,
 	attackTime = 1.275,
+	attackRange = 4,
 	damageFixup = 0.33,
 	limit = "ActiveGolemLimit",
 	skillList = {
@@ -99,6 +103,7 @@ minions["SummonedLightningGolem"] = {
 	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.755,
+	attackRange = 6,
 	damageFixup = 0.22,
 	limit = "ActiveGolemLimit",
 	skillList = {
@@ -119,6 +124,7 @@ minions["SummonedStoneGolem"] = {
 	damage = 3,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	weaponType1 = "One Handed Sword",
 	limit = "ActiveGolemLimit",
 	skillList = {
@@ -139,6 +145,7 @@ minions["SummonedRagingSpirit"] = {
 	damage = 0.77,
 	damageSpread = 0.2,
 	attackTime = 0.855,
+	attackRange = 6,
 	limit = "ActiveRagingSpiritLimit",
 	skillList = {
 		"PlayerRagingSpiritMeleeAttack",
@@ -160,6 +167,7 @@ minions["SummonedEssenceSpirit"] = {
 	damage = 0.77,
 	damageSpread = 0.2,
 	attackTime = 0.855,
+	attackRange = 6,
 	skillList = {
 		"RagingSpiritMeleeAttack",
 		"SpectralSkullShieldCharge",
@@ -169,7 +177,7 @@ minions["SummonedEssenceSpirit"] = {
 	},
 }
 minions["SummonedSpectralWolf"] = {
-	name = "Spectral Wolf",
+	name = "Spectral Wolf Companion",
 	life = 4.5,
 	fireResist = 40,
 	coldResist = 40,
@@ -178,6 +186,7 @@ minions["SummonedSpectralWolf"] = {
 	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 9,
 	weaponType1 = "Dagger",
 	limit = "ActiveWolfLimit",
 	skillList = {
@@ -196,6 +205,7 @@ minions["RaisedSkeleton"] = {
 	damage = 1.72,
 	damageSpread = 0.4,
 	attackTime = 1.305,
+	attackRange = 6,
 	damageFixup = 0.33,
 	weaponType1 = "One Handed Sword",
 	weaponType2 = "Shield",
@@ -216,6 +226,7 @@ minions["RaisedSkeletonCaster"] = {
 	damage = 0.98,
 	damageSpread = 0.3,
 	attackTime = 1.605,
+	attackRange = 46,
 	damageFixup = 0.33,
 	limit = "ActiveSkeletonLimit",
 	skillList = {
@@ -236,6 +247,7 @@ minions["RaisedSkeletonArcher"] = {
 	damage = 0.98,
 	damageSpread = 0.16,
 	attackTime = 1.995,
+	attackRange = 40,
 	damageFixup = 0.33,
 	weaponType1 = "Bow",
 	limit = "ActiveSkeletonLimit",
@@ -255,6 +267,7 @@ minions["Clone"] = {
 	damage = 1,
 	damageSpread = 0,
 	attackTime = 1.245,
+	attackRange = 4,
 	skillList = {
 		"Melee",
 	},
@@ -273,6 +286,7 @@ minions["SpiderMinion"] = {
 	damage = 1.32,
 	damageSpread = 0.2,
 	attackTime = 1.44,
+	attackRange = 3,
 	weaponType1 = "One Handed Sword",
 	limit = "ActiveSpiderLimit",
 	skillList = {
--- a/Data/ModItem.lua
+++ b/Data/ModItem.lua
--- a/Data/Skills/act_str.lua
+++ b/Data/Skills/act_str.lua
@@ -1750,7 +1750,7 @@ skills["InfernalBlow"] = {
 		mod("SkillPhysicalDamageConvertToFire", "BASE", 50), --"skill_physical_damage_%_to_convert_to_fire" = 50
 		skill("duration", 0.5), --"base_skill_effect_duration" = 500
 		--"corpse_explosion_monster_life_%" = 10
-		skill("radius", 24), 
+		skill("radius", 15), 
 	},
 	qualityMods = {
 		mod("AreaOfEffect", "INC", 0.5), --"base_skill_area_of_effect_+%" = 0.5
--- a/Data/Skills/minion.lua
+++ b/Data/Skills/minion.lua
@@ -1059,6 +1059,7 @@ skills["ZombieSlam"] = {
 		mod("Damage", "MORE", 45, ModFlag.Hit), --"active_skill_damage_+%_final" = 45
 		skill("duration", 0.28), --"base_skill_effect_duration" = 280
 		--"is_area_damage" = ?
+		skill("radius", 18), 
 	},
 	qualityMods = {
 	},
--- a/Data/Skills/sup_str.lua
+++ b/Data/Skills/sup_str.lua
@@ -1334,7 +1334,7 @@ skills["SupportMeleeSplash"] = {
 	levelMods = {
 		[1] = nil, 
 		--[2] = "support_melee_splash_damage_+%_final_for_splash"
-		[3] = mod("AreaOfEffect", "MORE", nil, ModFlag.Melee), --"melee_splash_area_of_effect_+%_final"
+		--[3] = "melee_splash_area_of_effect_+%_final"
 	},
 	levels = {
 		[1] = { 8, -35, 0, },
--- a/Data/Spectres.lua
+++ b/Data/Spectres.lua
@@ -18,6 +18,7 @@ minions["Metadata/Monsters/Axis/AxisCaster"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.305,
+	attackRange = 40,
 	weaponType1 = "Wand",
 	weaponType2 = "Shield",
 	skillList = {
@@ -42,6 +43,7 @@ minions["Metadata/Monsters/Axis/AxisCasterArc"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.305,
+	attackRange = 40,
 	weaponType1 = "Wand",
 	weaponType2 = "Shield",
 	skillList = {
@@ -66,6 +68,7 @@ minions["Metadata/Monsters/Axis/AxisExperimenter"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Wand",
 	skillList = {
 		"Melee",
@@ -88,6 +91,7 @@ minions["Metadata/Monsters/Axis/AxisExperimenter2"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Wand",
 	skillList = {
 		"ExperimenterDetonateDead",
@@ -112,6 +116,7 @@ minions["Metadata/Monsters/Axis/AxisExperimenterRaiseZombie"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Wand",
 	skillList = {
 		"Melee",
@@ -134,6 +139,7 @@ minions["Metadata/Monsters/Bandits/BanditBowExplosiveArrow"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -153,6 +159,7 @@ minions["Metadata/Monsters/Bandits/BanditBowPoisonArrow"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -172,6 +179,7 @@ minions["Metadata/Monsters/Bandits/BanditMeleeWarlordsMarkMaul"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.35,
+	attackRange = 5,
 	weaponType1 = "Two Handed Mace",
 	skillList = {
 		"Melee",
@@ -192,6 +200,7 @@ minions["Metadata/Monsters/Beasts/BeastCaveDegenAura"] = {
 	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.605,
+	attackRange = 12,
 	damageFixup = 0.33,
 	skillList = {
 		"Melee",
@@ -211,6 +220,7 @@ minions["Metadata/Monsters/Beasts/BeastCleaveEnduringCry"] = {
 	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.605,
+	attackRange = 12,
 	damageFixup = 0.33,
 	skillList = {
 		"Melee",
@@ -234,6 +244,7 @@ minions["Metadata/Monsters/BloodChieftain/MonkeyChiefBloodEnrage"] = {
 	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.395,
+	attackRange = 5,
 	damageFixup = 0.22,
 	weaponType1 = "One Handed Mace",
 	skillList = {
@@ -258,6 +269,7 @@ minions["Metadata/Monsters/Bull/Bull"] = {
 	damage = 1.28,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 7,
 	weaponType1 = "One Handed Mace",
 	skillList = {
 		"Melee",
@@ -277,6 +289,7 @@ minions["Metadata/Monsters/Cannibal/CannibalMaleChampion"] = {
 	damage = 1.2,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 5,
 	weaponType1 = "One Handed Mace",
 	skillList = {
 		"Melee",
@@ -297,6 +310,7 @@ minions["Metadata/Monsters/Goatman/GoatmanLeapSlam"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.455,
+	attackRange = 5,
 	skillList = {
 		"MonsterLeapSlam",
 		"Melee",
@@ -317,6 +331,7 @@ minions["Metadata/Monsters/Goatman/GoatmanLightningLeapSlamMaps"] = {
 	damage = 0.8,
 	damageSpread = 0.2,
 	attackTime = 1.455,
+	attackRange = 5,
 	skillList = {
 		"MonsterLeapSlam",
 		"Melee",
@@ -339,6 +354,7 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanFireball"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	damageFixup = 0.11,
 	weaponType1 = "Staff",
 	skillList = {
@@ -363,6 +379,7 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanFireChampion"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	damageFixup = 0.11,
 	weaponType1 = "Staff",
 	skillList = {
@@ -386,6 +403,7 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanLightning"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	damageFixup = 0.11,
 	weaponType1 = "Staff",
 	skillList = {
@@ -411,6 +429,7 @@ minions["Metadata/Monsters/DemonFemale/DemonFemale"] = {
 	damage = 0.88,
 	damageSpread = 0.2,
 	attackTime = 2.445,
+	attackRange = 16,
 	skillList = {
 		"Melee",
 	},
@@ -428,6 +447,7 @@ minions["Metadata/Monsters/DemonModular/DemonFemaleRanged"] = {
 	damage = 0.84,
 	damageSpread = 0.2,
 	attackTime = 3,
+	attackRange = 4,
 	skillList = {
 		"DemonFemaleRangedProjectile",
 	},
@@ -445,6 +465,7 @@ minions["Metadata/Monsters/DemonModular/DemonModularBladeVortex"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 4,
 	skillList = {
 		"Melee",
 		"DemonModularBladeVortex",
@@ -463,6 +484,7 @@ minions["Metadata/Monsters/DemonModular/DemonModularFire"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 4,
 	skillList = {
 		"Melee",
 		"MonsterRighteousFire",
@@ -483,6 +505,7 @@ minions["Metadata/Monsters/Frog/Frog"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.455,
+	attackRange = 5,
 	skillList = {
 		"MonsterLeapSlam",
 		"Melee",
@@ -501,6 +524,7 @@ minions["Metadata/Monsters/Frog/Frog2"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.455,
+	attackRange = 5,
 	skillList = {
 		"MonsterLeapSlam",
 		"Melee",
@@ -521,6 +545,7 @@ minions["Metadata/Monsters/GemMonster/Iguana"] = {
 	damage = 1.12,
 	damageSpread = 0.2,
 	attackTime = 1.005,
+	attackRange = 7,
 	skillList = {
 		"IguanaProjectile",
 		"Melee",
@@ -542,6 +567,7 @@ minions["Metadata/Monsters/GhostPirates/GhostPirateBlackBowMaps"] = {
 	damage = 0.48,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -563,6 +589,7 @@ minions["Metadata/Monsters/GhostPirates/GhostPirateBlackFlickerStrikeMaps"] = {
 	damage = 0.8,
 	damageSpread = 0.2,
 	attackTime = 1.65,
+	attackRange = 6,
 	weaponType1 = "One Handed Sword",
 	weaponType2 = "Shield",
 	skillList = {
@@ -585,6 +612,7 @@ minions["Metadata/Monsters/GhostPirates/GhostPirateGreenBladeVortex"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.65,
+	attackRange = 6,
 	weaponType1 = "One Handed Sword",
 	weaponType2 = "Shield",
 	skillList = {
@@ -607,6 +635,7 @@ minions["Metadata/Monsters/Grappler/Grappler"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.245,
+	attackRange = 5,
 	skillList = {
 		"Melee",
 		"MonsterFlickerStrike",
@@ -628,6 +657,7 @@ minions["Metadata/Monsters/Grappler/GrapplerLabyrinth"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.245,
+	attackRange = 5,
 	skillList = {
 		"Melee",
 		"MonsterFlickerStrike",
@@ -651,6 +681,7 @@ minions["Metadata/Monsters/Guardians/GuardianFire"] = {
 	damage = 1.2,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	skillList = {
 		"MonsterMultiFireball",
 		"MonsterSplitFireball",
@@ -674,6 +705,7 @@ minions["Metadata/Monsters/Guardians/GuardianLightning"] = {
 	damage = 1.2,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 4,
 	skillList = {
 		"GuardianArc",
 	},
@@ -692,6 +724,7 @@ minions["Metadata/Monsters/HalfSkeleton/HalfSkeleton"] = {
 	damage = 1.1,
 	damageSpread = 0.3,
 	attackTime = 1.5,
+	attackRange = 8,
 	weaponType1 = "Dagger",
 	skillList = {
 		"Melee",
@@ -713,6 +746,7 @@ minions["Metadata/Monsters/incaminion/Fragment"] = {
 	damage = 0.84,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 25,
 	skillList = {
 		"IncaMinionProjectile",
 	},
@@ -730,6 +764,7 @@ minions["Metadata/Monsters/InsectSpawner/InsectSpawner"] = {
 	damage = 0.91,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 4,
 	skillList = {
 		"InsectSpawnerSpit",
 		"InsectSpawnerSpawn",
@@ -749,6 +784,7 @@ minions["Metadata/Monsters/KaomWarrior/KaomWarrior2"] = {
 	damage = 1.16,
 	damageSpread = 0.2,
 	attackTime = 1.755,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"KaomWarriorMoltenStrike",
@@ -766,6 +802,7 @@ minions["Metadata/Monsters/KaomWarrior/KaomWarrior3"] = {
 	damage = 1.16,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	skillList = {
 		"Melee",
 		"KaomWarriorGroundSlam",
@@ -785,6 +822,7 @@ minions["Metadata/Monsters/Kiweth/Kiweth"] = {
 	damage = 1.68,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 4,
 	damageFixup = 0.11,
 	skillList = {
 		"Melee",
@@ -807,6 +845,7 @@ minions["Metadata/Monsters/Kiweth/KiwethSeagull"] = {
 	damage = 1.56,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 4,
 	damageFixup = 0.11,
 	skillList = {
 		"Melee",
@@ -829,6 +868,7 @@ minions["Metadata/Monsters/Lion/LionDesertSkinPuncture"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 8,
 	skillList = {
 		"Melee",
 		"MonsterPuncture",
@@ -848,6 +888,7 @@ minions["Metadata/Monsters/MassSkeleton/MassSkeleton"] = {
 	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 9,
 	skillList = {
 		"Melee",
 		"SkeletonMassBowProjectile",
@@ -867,6 +908,7 @@ minions["Metadata/Monsters/Miner/MinerLantern"] = {
 	damage = 1.21,
 	damageSpread = 0.2,
 	attackTime = 1.395,
+	attackRange = 7,
 	skillList = {
 		"MinerThrowFire",
 		"MinerThrowFireSpectre",
@@ -885,6 +927,7 @@ minions["Metadata/Monsters/Miner/MinerLanternCrystalVeins"] = {
 	damage = 1.21,
 	damageSpread = 0.2,
 	attackTime = 1.395,
+	attackRange = 7,
 	skillList = {
 		"MinerThrowFire",
 		"MinerThrowFireSpectre",
@@ -904,6 +947,7 @@ minions["Metadata/Monsters/Monkeys/FlameBearer"] = {
 	damage = 1.1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 5,
 	skillList = {
 		"Melee",
 		"FlamebearerFlameBlue",
@@ -922,6 +966,7 @@ minions["Metadata/Monsters/MossMonster/FireMonster"] = {
 	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.695,
+	attackRange = 5,
 	damageFixup = 0.33,
 	skillList = {
 		"Melee",
@@ -945,6 +990,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerConductivity"] = {
 	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"NecromancerReviveSkeleton",
@@ -967,6 +1013,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerEnfeebleCurse"] = {
 	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"NecromancerReviveSkeleton",
@@ -989,6 +1036,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerFlamability"] = {
 	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"NecromancerReviveSkeleton",
@@ -1012,6 +1060,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerFrostbite"] = {
 	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"NecromancerReviveSkeleton",
@@ -1034,6 +1083,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerElementalWeakness"] = {
 	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"NecromancerReviveSkeleton",
@@ -1056,6 +1106,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerProjectileWeakness"] = {
 	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"NecromancerReviveSkeleton",
@@ -1078,6 +1129,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerVulnerability"] = {
 	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"NecromancerReviveSkeleton",
@@ -1100,6 +1152,7 @@ minions["Metadata/Monsters/Pyromaniac/PyromaniacFire"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 5,
 	skillList = {
 		"PyroFireball",
 		"PyroSuicideExplosion",
@@ -1121,6 +1174,7 @@ minions["Metadata/Monsters/Pyromaniac/PyromaniacPoison"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 5,
 	skillList = {
 		"Melee",
 		"MonsterCausticBomb",
@@ -1141,6 +1195,7 @@ minions["Metadata/Monsters/Revenant/Revenant"] = {
 	damage = 1.4,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 8,
 	skillList = {
 		"RevenantReviveUndead",
 		"RevenantSpellProjectile",
@@ -1162,6 +1217,7 @@ minions["Metadata/Monsters/Seawitch/SeaWitchScreech"] = {
 	damage = 1.02,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	damageFixup = 0.11,
 	skillList = {
 		"SeaWitchWave",
@@ -1183,6 +1239,7 @@ minions["Metadata/Monsters/Seawitch/SeaWitchSpawnExploding"] = {
 	damage = 1.02,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	damageFixup = 0.11,
 	skillList = {
 		"SeaWitchWave",
@@ -1206,6 +1263,7 @@ minions["Metadata/Monsters/Seawitch/SeaWitchSpawnTemporalChains"] = {
 	damage = 1.02,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	damageFixup = 0.11,
 	skillList = {
 		"SeaWitchWave",
@@ -1230,6 +1288,7 @@ minions["Metadata/Monsters/Seawitch/SeaWitchVulnerabilityCurse"] = {
 	damage = 1.02,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 6,
 	damageFixup = 0.11,
 	skillList = {
 		"SeaWitchWave",
@@ -1252,6 +1311,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowPuncture"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -1272,6 +1332,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowLightning"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -1292,6 +1353,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonMeleeLarge"] = {
 	damage = 1.8,
 	damageSpread = 0.2,
 	attackTime = 2.25,
+	attackRange = 7,
 	weaponType1 = "One Handed Mace",
 	skillList = {
 		"Melee",
@@ -1310,6 +1372,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowLightning3"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -1331,6 +1394,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonCasterColdMultipleProjectiles"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.605,
+	attackRange = 46,
 	skillList = {
 		"SkeletonProjectileCold",
 	},
@@ -1350,6 +1414,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonCasterFireMultipleProjectiles2"] =
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.605,
+	attackRange = 46,
 	skillList = {
 		"SkeletonProjectileFire",
 	},
@@ -1369,6 +1434,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowPoison"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -1389,6 +1455,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowLightning2"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -1409,6 +1476,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowLightning4"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -1430,6 +1498,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonCasterLightningSpark"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.605,
+	attackRange = 46,
 	skillList = {
 		"SkeletonProjectileLightning",
 		"SkeletonSpark",
@@ -1449,6 +1518,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowProjectileWeaknessCurse"] = {
 	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
+	attackRange = 40,
 	weaponType1 = "Bow",
 	skillList = {
 		"Melee",
@@ -1470,6 +1540,7 @@ minions["Metadata/Monsters/Snake/SnakeScorpionMultiShot"] = {
 	damage = 0.75,
 	damageSpread = 0.2,
 	attackTime = 1.65,
+	attackRange = 7,
 	skillList = {
 		"Melee",
 		"SnakeSpineProjectile",
@@ -1490,6 +1561,7 @@ minions["Metadata/Monsters/Spiders/SpiderThornFlickerStrike"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.44,
+	attackRange = 6,
 	skillList = {
 		"Melee",
 		"MonsterFlickerStrike",
@@ -1509,6 +1581,7 @@ minions["Metadata/Monsters/Statue/DaressoStatueLargeMaleSpear"] = {
 	damage = 1.3,
 	damageSpread = 0.2,
 	attackTime = 1.875,
+	attackRange = 14,
 	damageFixup = 0.33,
 	weaponType1 = "One Handed Sword",
 	skillList = {
@@ -1531,6 +1604,7 @@ minions["Metadata/Monsters/Taster/Taster"] = {
 	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	attackRange = 4,
 	weaponType1 = "Dagger",
 	skillList = {
 		"Melee",
@@ -1550,6 +1624,7 @@ minions["Metadata/Monsters/Undying/CityStalkerMaleCasterArmour"] = {
 	damage = 1.2,
 	damageSpread = 0.2,
 	attackTime = 1.245,
+	attackRange = 5,
 	skillList = {
 		"Melee",
 		"DelayedBlast",
@@ -1569,6 +1644,7 @@ minions["Metadata/Monsters/Undying/UndyingOutcastPuncture"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.65,
+	attackRange = 4,
 	skillList = {
 		"Melee",
 		"MonsterPuncture",
@@ -1587,6 +1663,7 @@ minions["Metadata/Monsters/Undying/UndyingOutcastWhirlingBlades"] = {
 	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.65,
+	attackRange = 4,
 	skillList = {
 		"Melee",
 		"UndyingWhirlingBlades",
--- a/Data/Uniques/flask.lua
+++ b/Data/Uniques/flask.lua
@@ -7,6 +7,7 @@ Blood of the Karui
 Sanctified Life Flask
 Variant: Pre 2.6.0
 Variant: Current
+League: Domination, Nemesis
 Requires Level 50
 (5-20)% increased Recovery Speed
 {variant:1}No Life Recovery Applies during Flask effect
@@ -31,6 +32,7 @@ You gain an Endurance Charge on use
 ]],[[
 Lavianga's Spirit
 Sanctified Mana Flask
+League: Domination, Nemesis
 Requires Level 50
 (30-50)% increased Amount Recovered
 100% increased Recovery Speed
@@ -38,6 +40,7 @@ Your Skills have no Mana Cost during Flask effect
 ]],[[
 Zerphi's Last Breath
 Grand Mana Flask
+League: Perandus
 Requires Level 18
 50% increased Charges used
 Skills used during Flask effect grant 800% of Mana Cost as Life
--- a/Export/Export.sln
+++ b/Export/Export.sln
@@ -6,10 +6,14 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ECF13334-6BFE-4F72-A68F-DF00F5C86DE7}"
 	ProjectSection(SolutionItems) = preProject
 		_common.lua = _common.lua
+		_statdesc.lua = _statdesc.lua
+		bases.lua = bases.lua
 		browse.lua = browse.lua
+		export.lua = export.lua
 		gemList.lua = gemList.lua
 		minions.lua = minions.lua
 		miscdata.lua = miscdata.lua
+		mods.lua = mods.lua
 		skills.lua = skills.lua
 	EndProjectSection
 EndProject
--- a/Export/Skills/act_str.txt
+++ b/Export/Skills/act_str.txt
@@ -127,7 +127,7 @@ local skills, mod, flag, skill = ...

 #skill InfernalBlow
 #flags attack melee fire
-#baseMod skill("radius", 24)
+#baseMod skill("radius", 15)
 #mods

 #skill LeapSlam
--- a/Export/Skills/minion.txt
+++ b/Export/Skills/minion.txt
@@ -79,6 +79,7 @@ local skills, mod, flag, skill = ...

 #skill ZombieSlam Slam
 #flags attack melee area
+#baseMod skill("radius", 18)
 #mods

 #skill SpiderMinionLeapSlam Leap Slam
--- a/Export/Skills/statmap.ini
+++ b/Export/Skills/statmap.ini
@@ -738,8 +738,8 @@ mod = mod("PhysicalDamage", "MORE", {val}, ModFlag.Melee, 0, { type = "Condition
 [support_melee_physical_damage_+%_final]
 mod = mod("PhysicalDamage", "MORE", {val}, ModFlag.Melee)
 # Melee Spash
-[melee_splash_area_of_effect_+%_final]
-mod = mod("AreaOfEffect", "MORE", {val}, ModFlag.Melee)
+# [melee_splash_area_of_effect_+%_final]
+# mod = mod("AreaOfEffect", "MORE", {val}, ModFlag.Melee)
 # Minefield
 [support_minefield_mine_damage_+%_final]
 mod = mod("Damage", "MORE", {val})
--- a/Export/browse.lua
+++ b/Export/browse.lua
@@ -68,6 +68,7 @@ function spectre(name)
 		print("damage = "..(mon.DamageMultiplier/100))
 		print("damageSpread = "..(MT[mon.MonsterTypesKey].DamageSpread / 100))
 		print("attackTime = "..mon.AttackSpeed/1000)
+		print("attackRange = "..mon.MaximumAttackDistance)
 		if mon.MainHand_ItemClassesKey then
 			print("weaponType1 = "..IC[mon.MainHand_ItemClassesKey].Name)
 		end
--- a/Export/minions.lua
+++ b/Export/minions.lua
@@ -55,6 +55,7 @@ directiveTable.monster = function(state, args, out)
 	out:write('\tdamage = ', (MonsterVariety.DamageMultiplier/100), ',\n')
 	out:write('\tdamageSpread = ', (MonsterType.DamageSpread / 100), ',\n')
 	out:write('\tattackTime = ', (MonsterVariety.AttackSpeed/1000), ',\n')
+	out:write('\tattackRange = ', MonsterVariety.MaximumAttackDistance, ',\n')
 	for _, key in ipairs(MonsterVariety.ModsKeys) do
 		local Mod = Mods[key]
 		if Mod.Id == "MonsterSpeedAndDamageFixupSmall" then
--- a/Export/mods.lua
+++ b/Export/mods.lua
@@ -11,4 +11,20 @@ end
 corr:write('}')
 corr:close()

+local items = io.open("../Data/ModItem.lua", "w")
+items:write('-- Item data (c) Grinding Gear Games\n\nreturn {\n')
+for _, modKey in ipairs(Mods.Domain(1)) do
+	local mod = Mods[modKey]
+	if mod.GenerationType == 1 or mod.GenerationType == 2 then
+		items:write('\t["', mod.Id, '"] = { type = "', mod.GenerationType == 1 and "Prefix" or "Suffix", '", affix = "', mod.Name, '", ')
+		items:write('"', table.concat(describeMod(mod), '", "'), '", level = ', mod.Level, ', weightKey = { ')
+		for _, tagKey in ipairs(mod.SpawnWeight_TagsKeys) do
+			items:write('"', Tags[tagKey].Id, '", ')
+		end
+		items:write('}, weightVal = { ', table.concat(mod.SpawnWeight_Values, ', '), ', }, },\n')
+	end
+end
+items:write('}')
+items:close()
+
 print("Mods exported.")
--- a/Modules/CalcActiveSkill.lua
+++ b/Modules/CalcActiveSkill.lua
@@ -48,10 +48,7 @@ function calcs.mergeGemMods(modList, gem)
 			modList:AddMod(scaledMod)
 		end
 	end
-	gem.level = m_max(gem.level, 1)
-	if not gem.data.levels[gem.level] then
-		gem.level = m_min(gem.level, #gem.data.levels)
-	end
+	calcLib.validateGemLevel(gem)
 	local levelData = gem.data.levels[gem.level]
 	for col, mod in pairs(gem.data.levelMods) do
 		if levelData[col] then
@@ -400,6 +397,7 @@ function calcs.buildActiveSkillModList(env, actor, activeSkill)
 					CritChance = 5,
 					PhysicalMin = damage * (1 - minion.minionData.damageSpread),
 					PhysicalMax = damage * (1 + minion.minionData.damageSpread),
+					range = minion.minionData.attackRange,
 				}
 			end
 			minion.weaponData2 = { }
--- a/Modules/CalcTools.lua
+++ b/Modules/CalcTools.lua
@@ -37,6 +37,21 @@ function calcLib.armourReduction(armour, raw)
 	return round(armour / (armour + raw * 10) * 100)
 end

+-- Validate the level of the given gem
+function calcLib.validateGemLevel(gem)
+	if not gem.data.levels[gem.level] then
+		-- Try limiting to the level range of the gem
+		gem.level = m_max(1, gem.level)
+		if #gem.data.levels > 0 then
+			gem.level = m_min(#gem.data.levels, gem.level)
+		end
+		if not gem.data.levels[gem.level] then
+			-- That failed, so just grab any level
+			gem.level = next(gem.data.levels)
+		end
+	end	
+end
+
 -- Check if given support gem can support the given skill types
 function calcLib.gemCanSupportTypes(gem, skillTypes)
 	for _, skillType in pairs(gem.data.excludeSkillTypes) do
--- a/PathOfBuilding.sln
+++ b/PathOfBuilding.sln
@@ -105,6 +105,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{F2327651-C
 		Data\Misc.lua = Data\Misc.lua
 		Data\ModCorrupted.lua = Data\ModCorrupted.lua
 		Data\ModFlask.lua = Data\ModFlask.lua
+		Data\ModItem.lua = Data\ModItem.lua
 		Data\ModJewel.lua = Data\ModJewel.lua
 		Data\New.lua = Data\New.lua
 		Data\Rares.lua = Data\Rares.lua
--- a/README.md
+++ b/README.md
@@ -53,6 +53,12 @@ If you'd like to help support the development of Path of Building, I have a [Pat
 ![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png)

 ## Changelog
+### 1.4.17 - 2017/05/29
+ * Added base radius for Zombie's slam
+ * Minions (including Spectres) will now show the correct attack range for their melee skills
+ * Fixed an error that would appear when equipping Blood of Corruption
+ * Corrected the radius for Infernal Blow
+
 ### 1.4.16 - 2017/05/27
 * Items can now be corrupted via the new "Corrupt..." button that appears when viewing the item
 * Explosive Arrow's additional radius per fuse is now factored into the area calculation
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+VERSION[1.4.17][2017/05/29]
+ * Added base radius for Zombie's slam
+ * Minions (including Spectres) will now show the correct attack range for their melee skills
+ * Fixed an error that would appear when equipping Blood of Corruption
+ * Corrected the radius for Infernal Blow
 VERSION[1.4.16][2017/05/27]
 * Items can now be corrupted via the new "Corrupt..." button that appears when viewing the item
 * Explosive Arrow's additional radius per fuse is now factored into the area calculation
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.4.16"/>
+	<Version number="1.4.17"/>
 	<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
 	<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
 	<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
 	<File sha1="2fb719ed2a9648b2dd13a137f650b3c0e48705fa" name="Launch.lua" part="program"/>
 	<File sha1="72b9bea1871e94a643e4471fd84bbedbc7810336" name="UpdateCheck.lua" part="program"/>
 	<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
-	<File sha1="b13e9dfd3b5d071aea0396984ee3e53da99768f5" name="changelog.txt" part="program"/>
+	<File sha1="583d443247700ee128864869dcd6adb973cab4de" name="changelog.txt" part="program"/>
 	<File sha1="3ff73a3c46cb7bd8a53c9d47a893dd2b4c5c60ab" name="Classes/BuildListControl.lua" part="program"/>
 	<File sha1="dc2ffb55b4aae04b86886b25bbf219a301b21340" name="Classes/ButtonControl.lua" part="program"/>
 	<File sha1="9391d403c4ad8e59fd02fba76158acb4159e0562" name="Classes/CalcBreakdownControl.lua" part="program"/>
@@ -40,14 +40,14 @@
 	<File sha1="261dcf54a4542e6160fd7024d8edf4fc095d9c71" name="Classes/SectionControl.lua" part="program"/>
 	<File sha1="8a913c7556ffc0467f6318361525bfd3ddaf01a7" name="Classes/SharedItemListControl.lua" part="program"/>
 	<File sha1="20f92cc3415aaf5797f3cd84290ca609861eef99" name="Classes/SkillListControl.lua" part="program"/>
-	<File sha1="f5c85a0c320dc1c05331c0a12b45bc85e252e39c" name="Classes/SkillsTab.lua" part="program"/>
+	<File sha1="de06d7076130f9dbf8b6f01be40e38dccffe0eb6" name="Classes/SkillsTab.lua" part="program"/>
 	<File sha1="6317bd9ba391832dccafcb62409a5ce2988d1928" name="Classes/SliderControl.lua" part="program"/>
 	<File sha1="ada27b91a3c466689111429105edd4ee28ad0c3f" name="Classes/TextListControl.lua" part="program"/>
 	<File sha1="c5344a84f4a6ffbfe56b66fb95a3e24b53fcca43" name="Classes/TreeTab.lua" part="program"/>
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="9f963d5a60c471c722e405b755c06de3b2f89ee4" name="Modules/Build.lua" part="program"/>
 	<File sha1="e5fba9a6bf560a005e7b756ac5b703e36eb8ba59" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="e305565e1bcff5d59f2f80101e253e0eec934a88" name="Modules/CalcActiveSkill.lua" part="program"/>
+	<File sha1="543b9e61daf948e9236592966905e7092fce81ca" name="Modules/CalcActiveSkill.lua" part="program"/>
 	<File sha1="b2b8d55258d9763d7c7a4a9ca1f99be3973528a8" name="Modules/CalcBreakdown.lua" part="program"/>
 	<File sha1="8647664477fef0e771500b96342496c83ab3fe4f" name="Modules/CalcDefence.lua" part="program"/>
 	<File sha1="6a84c692e7b30164cd2960e39d49e01e3bfba453" name="Modules/CalcOffence.lua" part="program"/>
@@ -55,7 +55,7 @@
 	<File sha1="23c918fa7005af4413a9875571fe56946c76a931" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="ddf0ec249af557c07037b32039017d469f55324e" name="Modules/CalcSections.lua" part="program"/>
 	<File sha1="7fa850d6ef731394282750d07780cc3b26119f49" name="Modules/CalcSetup.lua" part="program"/>
-	<File sha1="435fe15e71f9e13c9a31a8ff1067b918cbdf9055" name="Modules/CalcTools.lua" part="program"/>
+	<File sha1="8966118c2bbaacf0e870d9765d6c3c485ffd88d8" name="Modules/CalcTools.lua" part="program"/>
 	<File sha1="1a3f16372f27e7b94d373e6c61affb4ebe478b13" name="Modules/Common.lua" part="program"/>
 	<File sha1="68e77a84c09dedb98a92cef780201b9616cba377" name="Modules/Data.lua" part="program"/>
 	<File sha1="39034baecbcc74e0f6e7defcc1e587a109e51326" name="Modules/ItemTools.lua" part="program"/>
@@ -69,23 +69,24 @@
 	<File sha1="9a320bfe629b1cf3f14fc77fbbf2508d0a5b2841" name="Assets/small_ring.png" part="program"/>
 	<File sha1="4a2651bfcb3beb6fe8b9acab18a6792072f7e9b4" name="Data/EnchantmentBoots.lua" part="program"/>
 	<File sha1="b305198cafc6800aa5556da07a5eea699c718d3b" name="Data/EnchantmentHelmet.lua" part="program"/>
-	<File sha1="7bc9e8c0e5df8e16fc3defa60c73c38ea24df4b6" name="Data/Minions.lua" part="program"/>
+	<File sha1="5952878d98057f833fbfacdbb6ebe41bfe92e5d4" name="Data/Minions.lua" part="program"/>
 	<File sha1="a725cc402e3b8bbac143ca49695eeabbc1e2ae19" name="Data/Misc.lua" part="program"/>
 	<File sha1="55dec872a50b435f586ea082c7c6964acd8d6bfc" name="Data/ModCorrupted.lua" part="program"/>
 	<File sha1="d06292de8b169e3adedc7fda69edae6ac466442e" name="Data/ModFlask.lua" part="program"/>
+	<File sha1="2e81c535d26a3130b96ba8923d026e0bf2eb3418" name="Data/ModItem.lua" part="program"/>
 	<File sha1="15664631a501d837c5c6796217c663457f115bb1" name="Data/ModJewel.lua" part="program"/>
 	<File sha1="90887a3f98af6c461fe9af7b352400eb25691aac" name="Data/New.lua" part="program"/>
 	<File sha1="36c0fac086a945e035f1e9415f7389022b45a211" name="Data/Rares.lua" part="program"/>
-	<File sha1="6fc6fd86d7ee6e444db1d80b2b31991e68fc780a" name="Data/Spectres.lua" part="program"/>
+	<File sha1="97ddb13b8c555e862de60daa6cb287b10c7c65d1" name="Data/Spectres.lua" part="program"/>
 	<File sha1="d2b8f037d757f2be41e37fa7b32c98a09081e177" name="Data/Skills/act_dex.lua" part="program"/>
 	<File sha1="cded55d5b5743c728a945a9e688b898bad984649" name="Data/Skills/act_int.lua" part="program"/>
-	<File sha1="dd318d8e4f55b5e7de02fee83a4a5936e35d9a3e" name="Data/Skills/act_str.lua" part="program"/>
-	<File sha1="da6560e41a8aa3bea8388b7c8bfc815050545294" name="Data/Skills/minion.lua" part="program"/>
+	<File sha1="494f6daaa0d903b6d293533d04d0ff39277e80ed" name="Data/Skills/act_str.lua" part="program"/>
+	<File sha1="38b1d9d217948942a493c3f0a71aa2edc2094e69" name="Data/Skills/minion.lua" part="program"/>
 	<File sha1="76e85fd0461be6583e03f8c9e7ee8f4676740ef3" name="Data/Skills/other.lua" part="program"/>
 	<File sha1="e9fafe5b6bf2bca7aab2ae3569423008b670ea11" name="Data/Skills/spectre.lua" part="program"/>
 	<File sha1="20739d839fbbc647acf52cfa974a7d322816cfb1" name="Data/Skills/sup_dex.lua" part="program"/>
 	<File sha1="55368373e42507db72c603c5039dbbcc68febd57" name="Data/Skills/sup_int.lua" part="program"/>
-	<File sha1="9ae51b52302d1f2410f85b331f08628911199f68" name="Data/Skills/sup_str.lua" part="program"/>
+	<File sha1="f087dc24aa2c67b6e81b18966a9f08f3da17b195" name="Data/Skills/sup_str.lua" part="program"/>
 	<File sha1="4538254d9b6867e463d0c95022cd574c9a89c783" name="Data/Bases/amulet.lua" part="program"/>
 	<File sha1="dff23301bf45d55192813609fab4ff6b3d25706a" name="Data/Bases/axe.lua" part="program"/>
 	<File sha1="4f9d73ef3f59866a64cbc5836b9bc5210c619224" name="Data/Bases/belt.lua" part="program"/>
@@ -113,7 +114,7 @@
 	<File sha1="c8455d30b03c93ff39fdec6576f146672c7375b2" name="Data/Uniques/bow.lua" part="program"/>
 	<File sha1="b73b16de3df43c7bed47479372c82fbd390248ff" name="Data/Uniques/claw.lua" part="program"/>
 	<File sha1="e2c2fc4d04fcec13c416818629bffd542886e617" name="Data/Uniques/dagger.lua" part="program"/>
-	<File sha1="acfc587edffcb9d4810b2b2d30cd510176d8b780" name="Data/Uniques/flask.lua" part="program"/>
+	<File sha1="1cd66a47e8ef2241b1dbf5cf6bb8093ad67e790c" name="Data/Uniques/flask.lua" part="program"/>
 	<File sha1="3179548d727b1613712b9e4d298158ddafe9c827" name="Data/Uniques/gloves.lua" part="program"/>
 	<File sha1="98f032338a48e467c51e4110ef29478a57116caf" name="Data/Uniques/helmet.lua" part="program"/>
 	<File sha1="e56ba595ebdd3376b0f3e72f8a9d07d7b7c6350b" name="Data/Uniques/jewel.lua" part="program"/>