The rest of the rebalance

Jofairden · Sep 20, 2018 · fd88223 · fd88223
1 parent bc4c1c6
commit fd88223
Show file tree

Hide file tree

Showing 34 changed files with 67 additions and 41 deletions.
diff --git a/Core/ModifierProperties.cs b/Core/ModifierProperties.cs
@@ -78,7 +78,7 @@ public ModifierProperties RollMagnitudeAndPower(float magnitudePower = 1f, float
 
 		private float RollMagnitude(float magnitudePower, float lukStat)
 		{
-			float useMin = MinMagnitude * (1f + 0.01f * lukStat);
+			float useMin = MinMagnitude * (1f + magnitudePower / 10f);
 			float useMax = MaxMagnitude * magnitudePower;
 			float randomMag = (useMin + Main.rand.NextFloat() * (useMax - useMin));
 			return randomMag * MagnitudeStrength;

diff --git a/Modifiers/EquipModifiers/Defensive/DodgeChance.cs b/Modifiers/EquipModifiers/Defensive/DodgeChance.cs
@@ -39,7 +39,7 @@ public class DodgeChance : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 5f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f, rollChance: 0.333f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Defensive/HealthPlus.cs b/Modifiers/EquipModifiers/Defensive/HealthPlus.cs
@@ -13,7 +13,7 @@ public class HealthPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 20f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f, rollChance: 0.333f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Defensive/ImmunityTimePlus.cs b/Modifiers/EquipModifiers/Defensive/ImmunityTimePlus.cs
@@ -38,7 +38,7 @@ public class ImmunityTimePlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 20f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 3f, rollChance: 0.222f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Defensive/LifeRegen.cs b/Modifiers/EquipModifiers/Defensive/LifeRegen.cs
@@ -32,7 +32,7 @@ public class LifeRegen : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 45f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 15f, rollChance: 0.5f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Defensive/ManaPlus.cs b/Modifiers/EquipModifiers/Defensive/ManaPlus.cs
@@ -13,7 +13,7 @@ public class ManaPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 20f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f, rollChance: 0.333f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Defensive/ManaShield.cs b/Modifiers/EquipModifiers/Defensive/ManaShield.cs
@@ -52,7 +52,7 @@ public class ManaShield : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 6f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f, rollChance: 0.75f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Defensive/PercentDefenseBonus.cs b/Modifiers/EquipModifiers/Defensive/PercentDefenseBonus.cs
@@ -33,7 +33,7 @@ public class PercentDefenseBonus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Defensive/SurvivalChance.cs b/Modifiers/EquipModifiers/Defensive/SurvivalChance.cs
@@ -47,7 +47,7 @@ public class SurvivalChance : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 15f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f, rollChance: 0.333f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Defensive/Thorns.cs b/Modifiers/EquipModifiers/Defensive/Thorns.cs
@@ -13,7 +13,7 @@ public class Thorns : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 50f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/CritDamagePlus.cs b/Modifiers/EquipModifiers/Offensive/CritDamagePlus.cs
@@ -58,7 +58,7 @@ public class CritDamagePlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 15f);
+			return base.GetModifierProperties(item).Set(minMagnitude: 5f, maxMagnitude: 15f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/HealthyFoesBonus.cs b/Modifiers/EquipModifiers/Offensive/HealthyFoesBonus.cs
@@ -58,7 +58,7 @@ public class HealthyFoesBonus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 20f);
+			return base.GetModifierProperties(item).Set(minMagnitude: 5f, maxMagnitude: 15f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/MagicCritPlus.cs b/Modifiers/EquipModifiers/Offensive/MagicCritPlus.cs
@@ -13,7 +13,7 @@ public class MagicCritPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/MagicDamagePlus.cs b/Modifiers/EquipModifiers/Offensive/MagicDamagePlus.cs
@@ -13,7 +13,7 @@ public class MagicDamagePlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/MeleeCritPlus.cs b/Modifiers/EquipModifiers/Offensive/MeleeCritPlus.cs
@@ -13,7 +13,7 @@ public class MeleeCritPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/MeleeDamagePlus.cs b/Modifiers/EquipModifiers/Offensive/MeleeDamagePlus.cs
@@ -13,7 +13,7 @@ public class MeleeDamagePlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/MinionDamagePlus.cs b/Modifiers/EquipModifiers/Offensive/MinionDamagePlus.cs
@@ -13,7 +13,7 @@ public class MinionDamagePlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/RangedCritPlus.cs b/Modifiers/EquipModifiers/Offensive/RangedCritPlus.cs
@@ -13,7 +13,7 @@ public class RangedCritPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/RangedDamagePlus.cs b/Modifiers/EquipModifiers/Offensive/RangedDamagePlus.cs
@@ -13,7 +13,7 @@ public class RangedDamagePlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/ThrownCritPlus.cs b/Modifiers/EquipModifiers/Offensive/ThrownCritPlus.cs
@@ -13,7 +13,7 @@ public class ThrownCritPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 5f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Offensive/ThrownDamagePlus.cs b/Modifiers/EquipModifiers/Offensive/ThrownDamagePlus.cs
@@ -13,7 +13,7 @@ public class ThrownDamagePlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Utility/FishingPlus.cs b/Modifiers/EquipModifiers/Utility/FishingPlus.cs
@@ -13,7 +13,7 @@ public class FishingPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 8f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 2f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Utility/LightPlus.cs b/Modifiers/EquipModifiers/Utility/LightPlus.cs
@@ -63,7 +63,7 @@ public class LightPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 5f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 2f);
 		}
 
 		// todo Just pass ModifierPlayer here?

diff --git a/Modifiers/EquipModifiers/Utility/LuckPlus.cs b/Modifiers/EquipModifiers/Utility/LuckPlus.cs
@@ -27,7 +27,7 @@ public class LuckPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 2f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Utility/MiningSpeedPlus.cs b/Modifiers/EquipModifiers/Utility/MiningSpeedPlus.cs
@@ -13,7 +13,7 @@ public class MiningSpeedPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
+			return base.GetModifierProperties(item).Set(maxMagnitude: 7.5f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Utility/MoveSpeedPlus.cs b/Modifiers/EquipModifiers/Utility/MoveSpeedPlus.cs
@@ -13,7 +13,7 @@ public class MoveSpeedPlus : EquipModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 10f);
+			return base.GetModifierProperties(item).Set(basePower: 1/5f, maxMagnitude: 50f);
 		}
 
 		public override void UpdateEquip(Item item, Player player)

diff --git a/Modifiers/EquipModifiers/Utility/WingTimePlus.cs b/Modifiers/EquipModifiers/Utility/WingTimePlus.cs
@@ -9,7 +9,7 @@ public class WingTimePlus : EquipModifier
 	{
 		public override ModifierTooltipLine[] TooltipLines => new[]
 		{
-			new ModifierTooltipLine { Text = $"+{Math.Round(Properties.RoundedPower/60, 2)}s flight time", Color =  Color.LimeGreen},
+			new ModifierTooltipLine { Text = $"+{Math.Round(Properties.RoundedPower/60f, 2)}s flight time", Color =  Color.LimeGreen},
 		};
 
 		public override ModifierProperties GetModifierProperties(Item item)

diff --git a/Modifiers/WeaponDebuffModifier.cs b/Modifiers/WeaponDebuffModifier.cs
@@ -51,12 +51,17 @@ public abstract class WeaponDebuffModifier : WeaponModifier
 	{
 		public override ModifierTooltipLine[] TooltipLines => new[]
 		{
-			new ModifierTooltipLine {Text = $"+{Properties.RoundedPower}% chance to inflict {GetBuffName()} for {BuffTime / 60f}s", Color = Color.Lime}
+			new ModifierTooltipLine {Text = $"+{Properties.RoundedPower}% chance to inflict {GetBuffName()} for {RoundedBuffTime()}s", Color = Color.Lime}
 		};
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(minMagnitude: 5f, maxMagnitude: 12.5f, roundPrecision: 1);
+			return base.GetModifierProperties(item).Set(minMagnitude: 5f, maxMagnitude: 10f, roundPrecision: 1);
+		}
+
+		private float RoundedBuffTime()
+		{
+			return (float)Math.Round((double)BuffTime / 60f, Properties.RoundPrecision);
 		}
 
 		public abstract int BuffType { get; }

diff --git a/Modifiers/WeaponModifiers/DamagePlusDaytime.cs b/Modifiers/WeaponModifiers/DamagePlusDaytime.cs
@@ -17,7 +17,7 @@ public class DamagePlusDaytime : WeaponModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(basePower: 1/5f, minMagnitude: 10f, maxMagnitude: 50f, rollChance: 50f);
+			return base.GetModifierProperties(item).Set(minMagnitude: 5f, maxMagnitude: 15f, rollChance: 2f);
 		}
 
 		private bool _duringDay;

diff --git a/Modifiers/WeaponModifiers/DamageWithManaCost.cs b/Modifiers/WeaponModifiers/DamageWithManaCost.cs
@@ -15,7 +15,7 @@ public class DamageWithManaCost : WeaponModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(minMagnitude: 5f, maxMagnitude: 12f);
+			return base.GetModifierProperties(item).Set(minMagnitude: 5f, maxMagnitude: 15f);
 		}
 
 		public override bool CanRoll(ModifierContext ctx)

diff --git a/Modifiers/WeaponModifiers/MissingHealthDamage.cs b/Modifiers/WeaponModifiers/MissingHealthDamage.cs
@@ -13,7 +13,7 @@ public class MissingHealthDamage : WeaponModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(minMagnitude: 2f, maxMagnitude: 10f);
+			return base.GetModifierProperties(item).Set(minMagnitude: 5f, maxMagnitude: 15f);
 		}
 
 		public override void GetWeaponDamage(Item item, Player player, ref int damage)

diff --git a/Modifiers/WeaponModifiers/RandomDebuff.cs b/Modifiers/WeaponModifiers/RandomDebuff.cs
@@ -1,3 +1,4 @@
+using System;
 using Loot.Core;
 using System.Collections.Generic;
 using System.IO;
@@ -15,12 +16,12 @@ public sealed class RandomDebuff : WeaponDebuffModifier
 	{
 		internal static DebuffTrigger[] BuffPairs =
 		{
-			new DebuffTrigger {BuffType = BuffID.Confused, BuffTime = 120, InflictionChance = 1f},
-			new DebuffTrigger {BuffType = BuffID.CursedInferno, BuffTime = 180, InflictionChance = 1f},
-			new DebuffTrigger {BuffType = BuffID.Frostburn, BuffTime = 240, InflictionChance = 1f},
-			new DebuffTrigger {BuffType = BuffID.OnFire, BuffTime = 300, InflictionChance = 1f},
-			new DebuffTrigger {BuffType = BuffID.Poisoned, BuffTime = 480, InflictionChance = 1f},
-			new DebuffTrigger {BuffType = BuffID.Ichor, BuffTime = 180, InflictionChance = 1f}
+			new DebuffTrigger {BuffType = BuffID.Confused, BuffTime = 100, InflictionChance = 1f},
+			new DebuffTrigger {BuffType = BuffID.CursedInferno, BuffTime = 100, InflictionChance = 1f},
+			new DebuffTrigger {BuffType = BuffID.Frostburn, BuffTime = 100, InflictionChance = 1f},
+			new DebuffTrigger {BuffType = BuffID.OnFire, BuffTime = 100, InflictionChance = 1f},
+			new DebuffTrigger {BuffType = BuffID.Poisoned, BuffTime = 100, InflictionChance = 1f},
+			new DebuffTrigger {BuffType = BuffID.Ichor, BuffTime = 100, InflictionChance = 1f}
 		};
 
 		private readonly int _len = BuffPairs.GetLength(0);
@@ -32,24 +33,42 @@ public override void NetReceive(Item item, BinaryReader reader)
 		{
 			base.NetReceive(item, reader);
 			_index = reader.ReadInt32();
+			_timeScaleFactor = reader.ReadSingle();
 		}
 
 		public override void NetSend(Item item, BinaryWriter writer)
 		{
 			base.NetSend(item, writer);
 			writer.Write(_index);
+			writer.Write(_timeScaleFactor);
 		}
 
 		public override void Save(Item item, TagCompound tag)
 		{
 			base.Save(item, tag);
 			tag.Add("_index", _index);
+			tag.Add("_timeScaleFactor", _timeScaleFactor);
 		}
 
 		public override void Load(Item item, TagCompound tag)
 		{
 			base.Load(item, tag);
 			_index = tag.GetAsInt("_index");
+			// Showcase rolling a stat properly that previously wasn't present
+			if (tag.ContainsKey("_timeScaleFactor"))
+			{
+				_timeScaleFactor = tag.GetAsShort("timeScaleFactor");
+				if (_timeScaleFactor <= 0f) RollTimeScaleFactor();
+			}
+			else
+			{
+				RollTimeScaleFactor();
+			}
+		}
+
+		private void RollTimeScaleFactor()
+		{
+			_timeScaleFactor = (0.5f + Main.rand.NextFloat() * (0.25f)) + Properties.Power / 100f;
 		}
 
 		public override void Roll(ModifierContext ctx, IEnumerable<Modifier> rolledModifiers)
@@ -62,6 +81,7 @@ public override void Roll(ModifierContext ctx, IEnumerable<Modifier> rolledModif
 			var rollableBuffTypes = BuffPairs.Select(x => x.BuffType).Except(similarModsBuffTypes);
 			int randBuffIndex = Main.rand.Next(rollableBuffTypes.Count());
 			_index = BuffPairs.ToList().FindIndex(x => x.BuffType == rollableBuffTypes.ElementAt(randBuffIndex));
+			RollTimeScaleFactor();
 		}
 
 		public override bool PostRoll(ModifierContext ctx, IEnumerable<Modifier> rolledModifiers)
@@ -74,8 +94,9 @@ public override bool PostRoll(ModifierContext ctx, IEnumerable<Modifier> rolledM
 					   .All(x => x?.GetRolledIndex() != _index);
 		}
 
+		private float _timeScaleFactor = 1f;
 		public override int BuffType => BuffPairs[_index].BuffType;
-		public override int BuffTime => BuffPairs[_index].BuffTime;
+		public override int BuffTime => (int)(BuffPairs[_index].BuffTime * _timeScaleFactor);
 		public override float BuffInflictionChance => BuffPairs[_index].InflictionChance;
 	}
 }
diff --git a/Modifiers/WeaponModifiers/SpeedPlus.cs b/Modifiers/WeaponModifiers/SpeedPlus.cs
@@ -13,7 +13,7 @@ public class SpeedPlus : WeaponModifier
 
 		public override ModifierProperties GetModifierProperties(Item item)
 		{
-			return base.GetModifierProperties(item).Set(maxMagnitude: 5f);
+			return base.GetModifierProperties(item).Set(basePower: 1/5f, maxMagnitude: 25f);
 		}
 
 		public override void Apply(Item item)

diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 author = Jofairden
-version = 0.1.1.2
+version = 0.1.2.0
 displayName = Even More Modifiers
 homepage = https://forums.terraria.org/index.php?threads/even-more-modifiers-relaunch-beta.68438/
 hideCode = false