Release 1.4.4

- Fixed minion attack base damage calculation - Fixed handling of minion damage fixup modifiers - Improved handling of monster Blade Vortex skills - Added support for Raise Spiders - Added support for Spectral Spirits - Added attack rate cap for clones
2017-04-17 21:10:22 +10:00
parent 5f77cab1c9
commit 82d42a0605
28 changed files with 963 additions and 399 deletions
--- a/Data/Minions.lua
+++ b/Data/Minions.lua
@@ -6,15 +6,16 @@
 local minions, mod = ...

 minions["RaisedZombie"] = {
-	name = "Zombie",
+	name = "Raised Zombie",
 	life = 2.55,
 	fireResist = 40,
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 1.75,
+	damage = 1.5,
 	damageSpread = 0.4,
-	attackTime = 1.17,
+	attackTime = 1.755,
+	damageFixup = 0.33,
 	limit = "ActiveZombieLimit",
 	skillList = {
 		"Melee",
@@ -27,14 +28,15 @@ minions["RaisedZombie"] = {
 minions["SummonedChaosGolem"] = {
 	name = "Chaos Golem",
 	life = 4.8,
+	energyShield = 0.2,
 	fireResist = 40,
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 60,
-	energyShield = 0.2,
-	damage = 3.48,
+	damage = 2.48,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.22,
 	limit = "ActiveGolemLimit",
 	skillList = {
 		"Melee",
@@ -42,8 +44,6 @@ minions["SummonedChaosGolem"] = {
 		"SandstormChaosElementalSummoned",
 	},
 	modList = {
-		mod("Damage", "MORE", -22),
-		mod("Speed", "MORE", 22),
 	},
 }
 minions["SummonedFlameGolem"] = {
@@ -54,9 +54,10 @@ minions["SummonedFlameGolem"] = {
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 2.5,
+	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.22,
 	limit = "ActiveGolemLimit",
 	skillList = {
 		"FireElementalFlameRedSummoned",
@@ -64,8 +65,6 @@ minions["SummonedFlameGolem"] = {
 		"FireElementalConeSummoned",
 	},
 	modList = {
-		mod("Damage", "MORE", -33),
-		mod("Speed", "MORE", 33),
 	},
 }
 minions["SummonedIceGolem"] = {
@@ -76,9 +75,10 @@ minions["SummonedIceGolem"] = {
 	coldResist = 70,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 4.06,
+	damage = 3.06,
 	damageSpread = 0.2,
 	attackTime = 1.275,
+	damageFixup = 0.33,
 	limit = "ActiveGolemLimit",
 	skillList = {
 		"Melee",
@@ -86,8 +86,6 @@ minions["SummonedIceGolem"] = {
 		"IceElementalSpearSummoned",
 	},
 	modList = {
-		mod("Damage", "MORE", -33),
-		mod("Speed", "MORE", 33),
 	},
 }
 minions["SummonedLightningGolem"] = {
@@ -98,9 +96,10 @@ minions["SummonedLightningGolem"] = {
 	coldResist = 40,
 	lightningResist = 70,
 	chaosResist = 20,
-	damage = 2.5,
+	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.755,
+	damageFixup = 0.22,
 	limit = "ActiveGolemLimit",
 	skillList = {
 		"LightningGolemArcSummoned",
@@ -108,8 +107,6 @@ minions["SummonedLightningGolem"] = {
 		"LightningGolemWrath",
 	},
 	modList = {
-		mod("Damage", "MORE", -22),
-		mod("Speed", "MORE", 22),
 	},
 }
 minions["SummonedStoneGolem"] = {
@@ -119,7 +116,7 @@ minions["SummonedStoneGolem"] = {
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 4,
+	damage = 3,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	weaponType1 = "One Handed Sword",
@@ -130,8 +127,6 @@ minions["SummonedStoneGolem"] = {
 		"RockGolemWhirlingBlades",
 	},
 	modList = {
-		mod("Damage", "MORE", -33),
-		mod("Speed", "MORE", 33),
 	},
 }
 minions["SummonedRagingSpirit"] = {
@@ -141,7 +136,7 @@ minions["SummonedRagingSpirit"] = {
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 0.66,
+	damage = 0.77,
 	damageSpread = 0.2,
 	attackTime = 0.855,
 	limit = "ActiveRagingSpiritLimit",
@@ -149,9 +144,27 @@ minions["SummonedRagingSpirit"] = {
 		"PlayerRagingSpiritMeleeAttack",
 	},
 	modList = {
-		mod("PhysicalMin", "BASE", 4),
-		mod("PhysicalMax", "BASE", 5),
 		mod("PhysicalDamageConvertToFire", "BASE", 50),
+		mod("PhysicalMin", "BASE", 4, ModFlag.Attack),
+		mod("PhysicalMax", "BASE", 5, ModFlag.Attack),
+		mod("Speed", "MORE", 40, ModFlag.Attack),
+	},
+}
+minions["SummonedEssenceSpirit"] = {
+	name = "Essence Spirit",
+	life = 1.8,
+	fireResist = 40,
+	coldResist = 40,
+	lightningResist = 40,
+	chaosResist = 20,
+	damage = 0.77,
+	damageSpread = 0.2,
+	attackTime = 0.855,
+	skillList = {
+		"RagingSpiritMeleeAttack",
+		"SpectralSkullShieldCharge",
+	},
+	modList = {
 		mod("Speed", "MORE", 40, ModFlag.Attack),
 	},
 }
@@ -162,9 +175,10 @@ minions["SummonedSpectralWolf"] = {
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 2.5,
+	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	weaponType1 = "Dagger",
 	limit = "ActiveWolfLimit",
 	skillList = {
 		"Melee",
@@ -179,10 +193,12 @@ minions["RaisedSkeleton"] = {
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 1.49,
+	damage = 1.72,
 	damageSpread = 0.4,
-	attackTime = 0.87,
+	attackTime = 1.305,
+	damageFixup = 0.33,
 	weaponType1 = "One Handed Sword",
+	weaponType2 = "Shield",
 	limit = "ActiveSkeletonLimit",
 	skillList = {
 		"Melee",
@@ -197,9 +213,10 @@ minions["RaisedSkeletonCaster"] = {
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.3,
 	attackTime = 1.605,
+	damageFixup = 0.33,
 	limit = "ActiveSkeletonLimit",
 	skillList = {
 		"SkeletonProjectileFire",
@@ -207,8 +224,6 @@ minions["RaisedSkeletonCaster"] = {
 		"SkeletonProjectileLightning",
 	},
 	modList = {
-		mod("Damage", "MORE", -33),
-		mod("Speed", "MORE", 33),
 	},
 }
 minions["RaisedSkeletonArcher"] = {
@@ -218,17 +233,16 @@ minions["RaisedSkeletonArcher"] = {
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.16,
 	attackTime = 1.995,
+	damageFixup = 0.33,
 	weaponType1 = "Bow",
 	limit = "ActiveSkeletonLimit",
 	skillList = {
 		"Melee",
 	},
 	modList = {
-		mod("Damage", "MORE", -33),
-		mod("Speed", "MORE", 33),
 	},
 }
 minions["Clone"] = {
@@ -238,13 +252,33 @@ minions["Clone"] = {
 	coldResist = 40,
 	lightningResist = 40,
 	chaosResist = 20,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0,
-	attackTime = 1.425,
+	attackTime = 1.245,
 	skillList = {
 		"Melee",
 	},
 	modList = {
 		mod("EnergyShield", "BASE", 10),
+		mod("Misc", "LIST", { type = "SkillData", key = "attackRateCap", value = 1.84 }),
+	},
+}
+minions["SpiderMinion"] = {
+	name = "Spider Minion",
+	life = 1.8,
+	fireResist = 40,
+	coldResist = 40,
+	lightningResist = 40,
+	chaosResist = 20,
+	damage = 1.32,
+	damageSpread = 0.2,
+	attackTime = 1.44,
+	weaponType1 = "One Handed Sword",
+	limit = "ActiveSpiderLimit",
+	skillList = {
+		"Melee",
+		"SpiderMinionLeapSlam",
+	},
+	modList = {
 	},
 }
--- a/Data/Skills/minion.lua
+++ b/Data/Skills/minion.lua
@@ -678,6 +678,93 @@ skills["PlayerRagingSpiritMeleeAttack"] = {
 		[30] = { 88, 47, },
 	},
 }
+skills["RagingSpiritMeleeAttack"] = {
+	name = "Melee Attack",
+	hidden = true,
+	color = 4,
+	baseFlags = {
+		attack = true,
+		melee = true,
+	},
+	skillTypes = { [1] = true, [48] = true, [6] = true, [3] = true, [25] = true, [28] = true, [24] = true, },
+	baseMods = {
+		skill("castTime", 1), 
+	},
+	qualityMods = {
+	},
+	levelMods = {
+		[1] = skill("levelRequirement", nil), 
+		[2] = mod("Damage", "MORE", nil, ModFlag.Hit), --"active_skill_damage_+%_final"
+	},
+	levels = {
+		[1] = { 4, 76, },
+		[2] = { 6, 71, },
+		[3] = { 9, 66, },
+		[4] = { 12, 61, },
+		[5] = { 15, 56, },
+		[6] = { 19, 52, },
+		[7] = { 23, 47, },
+		[8] = { 28, 42, },
+		[9] = { 33, 37, },
+		[10] = { 39, 32, },
+		[11] = { 43, 28, },
+		[12] = { 46, 23, },
+		[13] = { 49, 18, },
+		[14] = { 52, 12, },
+		[15] = { 55, 10, },
+		[16] = { 58, 7, },
+		[17] = { 61, 5, },
+		[18] = { 64, 2, },
+		[19] = { 66, 0, },
+		[20] = { 68, -2, },
+		[21] = { 70, -4, },
+		[22] = { 72, -7, },
+		[23] = { 74, -10, },
+		[24] = { 76, -10, },
+		[25] = { 78, -10, },
+		[26] = { 80, -10, },
+		[27] = { 82, -10, },
+		[28] = { 84, -10, },
+		[29] = { 86, -10, },
+		[30] = { 88, -10, },
+	},
+}
+skills["SpectralSkullShieldCharge"] = {
+	name = "Charge",
+	hidden = true,
+	color = 4,
+	baseFlags = {
+		attack = true,
+		melee = true,
+		movement = true,
+	},
+	skillTypes = { [1] = true, [7] = true, [13] = true, [24] = true, [25] = true, [38] = true, },
+	weaponTypes = {
+		["None"] = true,
+		["One Handed Mace"] = true,
+		["Claw"] = true,
+		["One Handed Axe"] = true,
+		["Dagger"] = true,
+		["One Handed Sword"] = true,
+	},
+	baseMods = {
+		skill("castTime", 1), 
+		skill("levelRequirement", 1), 
+		skill("cooldown", 5), 
+		--"shield_charge_stun_duration_+%_maximum" = 200
+		mod("MovementSpeed", "INC", 500, 0, 0, nil), --"base_movement_velocity_+%" = 500
+		--"shield_charge_damage_+%_maximum" = 300
+		mod("Damage", "MORE", -50, ModFlag.Hit), --"active_skill_damage_+%_final" = -50
+		--"ignores_proximity_shield" = ?
+	},
+	qualityMods = {
+	},
+	levelMods = {
+	},
+	levels = {
+		[1] = { },
+	},
+}
 skills["SkeletonProjectileCold"] = {
 	name = "Cold Projectile",
 	hidden = true,
@@ -970,6 +1057,44 @@ skills["ZombieSlam"] = {
 		[1] = { },
 	},
 }
+skills["SpiderMinionLeapSlam"] = {
+	name = "Leap Slam",
+	hidden = true,
+	color = 4,
+	baseFlags = {
+		attack = true,
+		melee = true,
+		area = true,
+		movement = true,
+	},
+	skillTypes = { [1] = true, [6] = true, [7] = true, [11] = true, [24] = true, [38] = true, },
+	weaponTypes = {
+		["Two Handed Sword"] = true,
+		["One Handed Mace"] = true,
+		["Two Handed Axe"] = true,
+		["Two Handed Mace"] = true,
+		["One Handed Axe"] = true,
+		["One Handed Sword"] = true,
+		["Staff"] = true,
+	},
+	baseMods = {
+		skill("castTime", 1.4), 
+		skill("levelRequirement", 1), 
+		mod("Damage", "MORE", 50, ModFlag.Attack), 
+		skill("cooldown", 2), 
+		--"skill_art_variation" = 3
+		--"active_skill_area_of_effect_radius_+%_final" = 0
+		--"is_area_damage" = ?
+		skill("castTimeOverridesAttackTime", true), --"cast_time_overrides_attack_duration" = ?
+	},
+	qualityMods = {
+	},
+	levelMods = {
+	},
+	levels = {
+		[1] = { },
+	},
+}
 skills["MinionInstability"] = {
 	name = "Minion Instability",
 	hidden = true,
--- a/Data/Skills/other.lua
+++ b/Data/Skills/other.lua
@@ -490,6 +490,41 @@ skills["TriggeredMoltenStrike"] = {
 		[16] = { },
 	},
 }
+skills["TriggeredSummonSpider"] = {
+	name = "Raise Spiders",
+	hidden = true,
+	other = true,
+	minionList = {
+		"SpiderMinion",
+	},
+	color = 3,
+	baseFlags = {
+		spell = true,
+		minion = true,
+		duration = true,
+	},
+	skillTypes = { [2] = true, [9] = true, [36] = true, [49] = true, [42] = true, [61] = true, },
+	minionSkillTypes = { [1] = true, [24] = true, [25] = true, [28] = true, },
+	baseMods = {
+		skill("castTime", 1), 
+		skill("levelRequirement", 1), 
+		skill("cooldown", 2), 
+		--"chance_to_cast_on_kill_%_target_self" = 20
+		skill("duration", 8), --"base_skill_effect_duration" = 8000
+		mod("ActiveSpiderLimit", "BASE", 20), --"number_of_spider_minions_allowed" = 20
+		skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
+		--"take_no_actions_while_parent_dead" = ?
+		--"minion_dies_when_parent_dies" = ?
+		skill("minionLevelIsEnemyLevel", true), --"display_skill_minions_level_is_corpse_level" = ?
+	},
+	qualityMods = {
+	},
+	levelMods = {
+	},
+	levels = {
+		[1] = { },
+	},
+}
 skills["TriggeredShockedGround"] = {
 	name = "Shock Ground",
 	hidden = true,
@@ -519,6 +554,67 @@ skills["TriggeredShockedGround"] = {
 		[1] = { },
 	},
 }
+skills["SummonEssenceSpirits"] = {
+	name = "Spectral Spirits",
+	hidden = true,
+	other = true,
+	minionList = {
+		"SummonedEssenceSpirit",
+	},
+	color = 3,
+	baseFlags = {
+		spell = true,
+		minion = true,
+	},
+	skillTypes = { [2] = true, [9] = true, [36] = true, [49] = true, [42] = true, [61] = true, },
+	minionSkillTypes = { [1] = true, [24] = true, [25] = true, [28] = true, },
+	baseMods = {
+		skill("castTime", 1), 
+		skill("minionDamageEffectiveness", -15), --"active_skill_minion_added_damage_+%_final" = -15
+		--"number_of_monsters_to_summon" = 3
+		--"cast_on_gain_skill" = ?
+		skill("triggered", true, { type = "SkillType", skillType = SkillType.TriggerableSpell }), --"spell_uncastable_if_triggerable" = ?
+		--"take_no_actions_while_parent_dead" = ?
+		--"minion_dies_when_parent_dies" = ?
+	},
+	qualityMods = {
+	},
+	levelMods = {
+		[1] = skill("levelRequirement", nil), 
+	},
+	levels = {
+		[1] = { 1, },
+		[2] = { 2, },
+		[3] = { 4, },
+		[4] = { 7, },
+		[5] = { 11, },
+		[6] = { 16, },
+		[7] = { 20, },
+		[8] = { 24, },
+		[9] = { 28, },
+		[10] = { 32, },
+		[11] = { 36, },
+		[12] = { 40, },
+		[13] = { 44, },
+		[14] = { 48, },
+		[15] = { 52, },
+		[16] = { 56, },
+		[17] = { 60, },
+		[18] = { 64, },
+		[19] = { 67, },
+		[20] = { 70, },
+		[21] = { 72, },
+		[22] = { 74, },
+		[23] = { 76, },
+		[24] = { 78, },
+		[25] = { 80, },
+		[26] = { 82, },
+		[27] = { 84, },
+		[28] = { 86, },
+		[29] = { 88, },
+		[30] = { 90, },
+	},
+}
 skills["SummonRigwaldsPack"] = {
 	name = "Summon Spectral Wolf",
 	hidden = true,
--- a/Data/Skills/spectre.lua
+++ b/Data/Skills/spectre.lua
@@ -377,6 +377,7 @@ skills["DemonModularBladeVortexSpectre"] = {
 		--"skill_repeat_count" = 2
 		--"is_area_damage" = ?
 		--"skill_can_add_multiple_charges_per_action" = ?
+		skill("hitTimeOverride", 1), 
 	},
 	qualityMods = {
 	},
@@ -632,6 +633,7 @@ skills["GhostPirateBladeVortexSpectre"] = {
 		--"skill_repeat_count" = 2
 		--"is_area_damage" = ?
 		--"skill_can_add_multiple_charges_per_action" = ?
+		skill("hitTimeOverride", 1), 
 	},
 	qualityMods = {
 	},
--- a/Data/Spectres.lua
+++ b/Data/Spectres.lua
@@ -14,7 +14,7 @@ minions["Metadata/Monsters/Axis/AxisCaster"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.305,
 	weaponType1 = "Wand",
@@ -38,7 +38,7 @@ minions["Metadata/Monsters/Axis/AxisCasterArc"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.305,
 	weaponType1 = "Wand",
@@ -62,7 +62,7 @@ minions["Metadata/Monsters/Axis/AxisExperimenter"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 75,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Wand",
@@ -84,7 +84,7 @@ minions["Metadata/Monsters/Axis/AxisExperimenter2"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 75,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Wand",
@@ -108,7 +108,7 @@ minions["Metadata/Monsters/Axis/AxisExperimenterRaiseZombie"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 75,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Wand",
@@ -130,7 +130,7 @@ minions["Metadata/Monsters/Bandits/BanditBowExplosiveArrow"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -149,7 +149,7 @@ minions["Metadata/Monsters/Bandits/BanditBowPoisonArrow"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -168,7 +168,7 @@ minions["Metadata/Monsters/Bandits/BanditMeleeWarlordsMarkMaul"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.35,
 	weaponType1 = "Two Handed Mace",
@@ -188,16 +188,16 @@ minions["Metadata/Monsters/Beasts/BeastCaveDegenAura"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.5,
+	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.605,
+	damageFixup = 0.33,
 	skillList = {
 		"Melee",
 		"ChaosDegenAura",
 	},
 	modList = {
-		mod("Damage", "MORE", -33), -- MonsterSpeedAndDamageFixupComplete
-		mod("Speed", "MORE", 33), -- MonsterSpeedAndDamageFixupComplete
+		-- MonsterSpeedAndDamageFixupComplete
 	},
 }
 minions["Metadata/Monsters/Beasts/BeastCleaveEnduringCry"] = {
@@ -207,17 +207,17 @@ minions["Metadata/Monsters/Beasts/BeastCleaveEnduringCry"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.5,
+	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.605,
+	damageFixup = 0.33,
 	skillList = {
 		"Melee",
 		"MonsterEnduringCry",
 		"BeastCleave",
 	},
 	modList = {
-		mod("Damage", "MORE", -33), -- MonsterSpeedAndDamageFixupComplete
-		mod("Speed", "MORE", 33), -- MonsterSpeedAndDamageFixupComplete
+		-- MonsterSpeedAndDamageFixupComplete
 		-- MonsterUsesEnduringCryText
 		-- MonsterCleavesText
 	},
@@ -230,9 +230,10 @@ minions["Metadata/Monsters/BloodChieftain/MonkeyChiefBloodEnrage"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.5,
+	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.395,
+	damageFixup = 0.22,
 	weaponType1 = "One Handed Mace",
 	skillList = {
 		"Melee",
@@ -240,8 +241,7 @@ minions["Metadata/Monsters/BloodChieftain/MonkeyChiefBloodEnrage"] = {
 		"MassFrenzy",
 	},
 	modList = {
-		mod("Damage", "MORE", -22), -- MonsterSpeedAndDamageFixupLarge
-		mod("Speed", "MORE", 22), -- MonsterSpeedAndDamageFixupLarge
+		-- MonsterSpeedAndDamageFixupLarge
 		-- MonsterSummonsMonkeysText
 		-- MonsterCastsMassFrenzyText
 	},
@@ -254,7 +254,7 @@ minions["Metadata/Monsters/Bull/Bull"] = {
 	coldResist = 40,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.28,
+	damage = 1.28,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	weaponType1 = "One Handed Mace",
@@ -273,7 +273,7 @@ minions["Metadata/Monsters/Cannibal/CannibalMaleChampion"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.2,
+	damage = 1.2,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "One Handed Mace",
@@ -293,7 +293,7 @@ minions["Metadata/Monsters/Goatman/GoatmanLeapSlam"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.455,
 	skillList = {
@@ -313,7 +313,7 @@ minions["Metadata/Monsters/Goatman/GoatmanLightningLeapSlamMaps"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 1.8,
+	damage = 0.8,
 	damageSpread = 0.2,
 	attackTime = 1.455,
 	skillList = {
@@ -335,17 +335,17 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanFireball"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	weaponType1 = "Staff",
 	skillList = {
 		"MonsterFireball",
 		"GoatmanMoltenShell",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 		mod("Speed", "INC", -50, ModFlag.Cast), -- MonsterGoatmanShamanCastSpeed
 		-- MonsterCastsFireballText
 		-- MonsterCastsMoltenShellText
@@ -359,9 +359,10 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanFireChampion"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	weaponType1 = "Staff",
 	skillList = {
 		"MonsterFireball",
@@ -369,8 +370,7 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanFireChampion"] = {
 		"GoatmanFireMagmaOrb",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 		mod("Speed", "INC", -50, ModFlag.Cast), -- MonsterGoatmanShamanCastSpeed
 	},
 }
@@ -382,9 +382,10 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanLightning"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	weaponType1 = "Staff",
 	skillList = {
 		"Melee",
@@ -392,8 +393,7 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanLightning"] = {
 		"MonsterSpark",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 		mod("Speed", "INC", -50, ModFlag.Cast), -- MonsterGoatmanShamanCastSpeed
 		-- MonsterCastsShockNovaText
 		-- MonsterCastsSparkText
@@ -407,7 +407,7 @@ minions["Metadata/Monsters/DemonFemale/DemonFemale"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.88,
+	damage = 0.88,
 	damageSpread = 0.2,
 	attackTime = 2.445,
 	skillList = {
@@ -424,7 +424,7 @@ minions["Metadata/Monsters/DemonModular/DemonFemaleRanged"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 1.84,
+	damage = 0.84,
 	damageSpread = 0.2,
 	attackTime = 3,
 	skillList = {
@@ -441,7 +441,7 @@ minions["Metadata/Monsters/DemonModular/DemonModularBladeVortex"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -459,7 +459,7 @@ minions["Metadata/Monsters/DemonModular/DemonModularFire"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -479,7 +479,7 @@ minions["Metadata/Monsters/Frog/Frog"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.455,
 	skillList = {
@@ -497,7 +497,7 @@ minions["Metadata/Monsters/Frog/Frog2"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.455,
 	skillList = {
@@ -517,7 +517,7 @@ minions["Metadata/Monsters/GemMonster/Iguana"] = {
 	coldResist = 52,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.12,
+	damage = 1.12,
 	damageSpread = 0.2,
 	attackTime = 1.005,
 	skillList = {
@@ -538,7 +538,7 @@ minions["Metadata/Monsters/GhostPirates/GhostPirateBlackBowMaps"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.48,
+	damage = 0.48,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -559,7 +559,7 @@ minions["Metadata/Monsters/GhostPirates/GhostPirateBlackFlickerStrikeMaps"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.8,
+	damage = 0.8,
 	damageSpread = 0.2,
 	attackTime = 1.65,
 	weaponType1 = "One Handed Sword",
@@ -581,7 +581,7 @@ minions["Metadata/Monsters/GhostPirates/GhostPirateGreenBladeVortex"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.65,
 	weaponType1 = "One Handed Sword",
@@ -603,7 +603,7 @@ minions["Metadata/Monsters/Grappler/Grappler"] = {
 	coldResist = 20,
 	lightningResist = 20,
 	chaosResist = 20,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.245,
 	skillList = {
@@ -624,7 +624,7 @@ minions["Metadata/Monsters/Grappler/GrapplerLabyrinth"] = {
 	coldResist = 20,
 	lightningResist = 20,
 	chaosResist = 20,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.245,
 	skillList = {
@@ -647,7 +647,7 @@ minions["Metadata/Monsters/Guardians/GuardianFire"] = {
 	coldResist = 75,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.2,
+	damage = 1.2,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -670,7 +670,7 @@ minions["Metadata/Monsters/Guardians/GuardianLightning"] = {
 	coldResist = 85,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.2,
+	damage = 1.2,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -688,7 +688,7 @@ minions["Metadata/Monsters/HalfSkeleton/HalfSkeleton"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.1,
+	damage = 1.1,
 	damageSpread = 0.3,
 	attackTime = 1.5,
 	weaponType1 = "Dagger",
@@ -709,7 +709,7 @@ minions["Metadata/Monsters/incaminion/Fragment"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 40,
-	damage = 1.84,
+	damage = 0.84,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	skillList = {
@@ -726,7 +726,7 @@ minions["Metadata/Monsters/InsectSpawner/InsectSpawner"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 1.91,
+	damage = 0.91,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -745,7 +745,7 @@ minions["Metadata/Monsters/KaomWarrior/KaomWarrior2"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.16,
+	damage = 1.16,
 	damageSpread = 0.2,
 	attackTime = 1.755,
 	skillList = {
@@ -762,7 +762,7 @@ minions["Metadata/Monsters/KaomWarrior/KaomWarrior3"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.16,
+	damage = 1.16,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -781,17 +781,17 @@ minions["Metadata/Monsters/Kiweth/Kiweth"] = {
 	coldResist = 40,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.68,
+	damage = 1.68,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	skillList = {
 		"Melee",
 		"BirdmanConsumeCorpse",
 		"BirdmanBloodProjectile",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 		-- MonsterLesserFarShot
 	},
 }
@@ -803,17 +803,17 @@ minions["Metadata/Monsters/Kiweth/KiwethSeagull"] = {
 	coldResist = 40,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.56,
+	damage = 1.56,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	skillList = {
 		"Melee",
 		"BirdmanConsumeCorpse",
 		"BirdmanBloodProjectile",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 		-- MonsterLesserFarShot
 	},
 }
@@ -825,7 +825,7 @@ minions["Metadata/Monsters/Lion/LionDesertSkinPuncture"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -844,7 +844,7 @@ minions["Metadata/Monsters/MassSkeleton/MassSkeleton"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -863,7 +863,7 @@ minions["Metadata/Monsters/Miner/MinerLantern"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.21,
+	damage = 1.21,
 	damageSpread = 0.2,
 	attackTime = 1.395,
 	skillList = {
@@ -881,7 +881,7 @@ minions["Metadata/Monsters/Miner/MinerLanternCrystalVeins"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.21,
+	damage = 1.21,
 	damageSpread = 0.2,
 	attackTime = 1.395,
 	skillList = {
@@ -900,7 +900,7 @@ minions["Metadata/Monsters/Monkeys/FlameBearer"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.1,
+	damage = 1.1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -918,16 +918,16 @@ minions["Metadata/Monsters/MossMonster/FireMonster"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.5,
+	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.695,
+	damageFixup = 0.33,
 	skillList = {
 		"Melee",
 		"FireMonsterWhirlingBlades",
 	},
 	modList = {
-		mod("Damage", "MORE", -33), -- MonsterSpeedAndDamageFixupComplete
-		mod("Speed", "MORE", 33), -- MonsterSpeedAndDamageFixupComplete
+		-- MonsterSpeedAndDamageFixupComplete
 		-- MonsterRollsOverEnemiesText
 		-- ImmuneToLavaDamage
 	},
@@ -941,7 +941,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerConductivity"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -963,7 +963,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerEnfeebleCurse"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -985,7 +985,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerFlamability"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -1008,7 +1008,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerFrostbite"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -1030,7 +1030,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerElementalWeakness"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -1052,7 +1052,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerProjectileWeakness"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -1074,7 +1074,7 @@ minions["Metadata/Monsters/Necromancer/NecromancerVulnerability"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 1.98,
+	damage = 0.98,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -1096,7 +1096,7 @@ minions["Metadata/Monsters/Pyromaniac/PyromaniacFire"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -1117,7 +1117,7 @@ minions["Metadata/Monsters/Pyromaniac/PyromaniacPoison"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -1137,7 +1137,7 @@ minions["Metadata/Monsters/Revenant/Revenant"] = {
 	coldResist = 0,
 	lightningResist = 75,
 	chaosResist = 0,
-	damage = 2.4,
+	damage = 1.4,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	skillList = {
@@ -1158,17 +1158,17 @@ minions["Metadata/Monsters/Seawitch/SeaWitchScreech"] = {
 	coldResist = 75,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.02,
+	damage = 1.02,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	skillList = {
 		"SeaWitchWave",
 		"Melee",
 		"SeaWitchScreech",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 	},
 }
 minions["Metadata/Monsters/Seawitch/SeaWitchSpawnExploding"] = {
@@ -1179,9 +1179,10 @@ minions["Metadata/Monsters/Seawitch/SeaWitchSpawnExploding"] = {
 	coldResist = 75,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.02,
+	damage = 1.02,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	skillList = {
 		"SeaWitchWave",
 		"Melee",
@@ -1189,8 +1190,7 @@ minions["Metadata/Monsters/Seawitch/SeaWitchSpawnExploding"] = {
 		"SeaWitchScreech",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 		-- MonsterSummonsExplodingSpawnText
 	},
 }
@@ -1202,9 +1202,10 @@ minions["Metadata/Monsters/Seawitch/SeaWitchSpawnTemporalChains"] = {
 	coldResist = 75,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.02,
+	damage = 1.02,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	skillList = {
 		"SeaWitchWave",
 		"Melee",
@@ -1212,8 +1213,7 @@ minions["Metadata/Monsters/Seawitch/SeaWitchSpawnTemporalChains"] = {
 		"SummonSpawn",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 		-- MonsterSummonsSpawnText
 		-- MonsterCastsTemporalChainsText
 	},
@@ -1226,17 +1226,17 @@ minions["Metadata/Monsters/Seawitch/SeaWitchVulnerabilityCurse"] = {
 	coldResist = 75,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.02,
+	damage = 1.02,
 	damageSpread = 0.2,
 	attackTime = 1.5,
+	damageFixup = 0.11,
 	skillList = {
 		"SeaWitchWave",
 		"Melee",
 		"SkeletonVulnerability",
 	},
 	modList = {
-		mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall
-		mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall
+		-- MonsterSpeedAndDamageFixupSmall
 		-- MonsterCastsVulnerabilityCurseText
 	},
 }
@@ -1248,7 +1248,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowPuncture"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -1268,7 +1268,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowLightning"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -1288,7 +1288,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonMeleeLarge"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 2.8,
+	damage = 1.8,
 	damageSpread = 0.2,
 	attackTime = 2.25,
 	weaponType1 = "One Handed Mace",
@@ -1306,7 +1306,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowLightning3"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -1327,7 +1327,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonCasterColdMultipleProjectiles"] = {
 	coldResist = 40,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.605,
 	skillList = {
@@ -1346,7 +1346,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonCasterFireMultipleProjectiles2"] =
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.605,
 	skillList = {
@@ -1365,7 +1365,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowPoison"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -1385,7 +1385,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowLightning2"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -1405,7 +1405,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowLightning4"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -1426,7 +1426,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonCasterLightningSpark"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.605,
 	skillList = {
@@ -1445,7 +1445,7 @@ minions["Metadata/Monsters/Skeletons/SkeletonBowProjectileWeaknessCurse"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 1.6,
+	damage = 0.6,
 	damageSpread = 0.2,
 	attackTime = 1.995,
 	weaponType1 = "Bow",
@@ -1466,7 +1466,7 @@ minions["Metadata/Monsters/Snake/SnakeScorpionMultiShot"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 30,
-	damage = 1.75,
+	damage = 0.75,
 	damageSpread = 0.2,
 	attackTime = 1.65,
 	skillList = {
@@ -1486,7 +1486,7 @@ minions["Metadata/Monsters/Spiders/SpiderThornFlickerStrike"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.44,
 	skillList = {
@@ -1505,17 +1505,17 @@ minions["Metadata/Monsters/Statue/DaressoStatueLargeMaleSpear"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.3,
+	damage = 1.3,
 	damageSpread = 0.2,
 	attackTime = 1.875,
+	damageFixup = 0.33,
 	weaponType1 = "One Handed Sword",
 	skillList = {
 		"Melee",
 		"MonsterPuncture",
 	},
 	modList = {
-		mod("Damage", "MORE", -33), -- MonsterSpeedAndDamageFixupComplete
-		mod("Speed", "MORE", 33), -- MonsterSpeedAndDamageFixupComplete
+		-- MonsterSpeedAndDamageFixupComplete
 		-- MonsterCastsPunctureText
 	},
 }
@@ -1527,7 +1527,7 @@ minions["Metadata/Monsters/Taster/Taster"] = {
 	coldResist = 0,
 	lightningResist = 0,
 	chaosResist = 0,
-	damage = 2.5,
+	damage = 1.5,
 	damageSpread = 0.2,
 	attackTime = 1.5,
 	weaponType1 = "Dagger",
@@ -1546,7 +1546,7 @@ minions["Metadata/Monsters/Undying/CityStalkerMaleCasterArmour"] = {
 	coldResist = 37,
 	lightningResist = 37,
 	chaosResist = 0,
-	damage = 2.2,
+	damage = 1.2,
 	damageSpread = 0.2,
 	attackTime = 1.245,
 	skillList = {
@@ -1565,7 +1565,7 @@ minions["Metadata/Monsters/Undying/UndyingOutcastPuncture"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.65,
 	skillList = {
@@ -1583,7 +1583,7 @@ minions["Metadata/Monsters/Undying/UndyingOutcastWhirlingBlades"] = {
 	coldResist = 0,
 	lightningResist = 40,
 	chaosResist = 0,
-	damage = 2,
+	damage = 1,
 	damageSpread = 0.2,
 	attackTime = 1.65,
 	skillList = {