simplify experience code

pandinocoder · pandinocoder · commit c0a2a4123095 · 2025-01-23T16:09:57.000-05:00
diff --git a/Intersect.Server.Core/Entities/Player.cs b/Intersect.Server.Core/Entities/Player.cs
@@ -1151,16 +1151,10 @@ public override void Die(bool dropItems = true, Entity killer = null)
         {
             if (Options.Instance.Player.ExpLossOnDeathPercent > 0)
             {
-                if (Options.Instance.Player.ExpLossFromCurrentExp)
-                {
-                    var ExpLoss = (this.Exp * (Options.Instance.Player.ExpLossOnDeathPercent / 100.0));
-                    TakeExperience((long)ExpLoss);
-                }
-                else
-                {
-                    var ExpLoss = (GetExperienceToNextLevel(this.Level) * (Options.Instance.Player.ExpLossOnDeathPercent / 100.0));
-                    TakeExperience((long)ExpLoss);
-                }
+                var baseExp = Options.Instance.Player.ExpLossFromCurrentExp ? Exp : GetExperienceToNextLevel(Level);
+                var expRatioLost = Options.Instance.Player.ExpLossOnDeathPercent / 100.0;
+                var expLost = (long)(baseExp * expRatioLost);
+                TakeExperience(expLost);
             }
         }
         PacketSender.SendEntityDie(this);

Original file line number	Diff line number	Diff line change
`@@ -1151,16 +1151,10 @@ public override void Die(bool dropItems = true, Entity killer = null)`
`1151`	`1151`	`{`
`1152`	`1152`	`if (Options.Instance.Player.ExpLossOnDeathPercent > 0)`
`1153`	`1153`	`{`
`1154`		`- if (Options.Instance.Player.ExpLossFromCurrentExp)`
`1155`		`- {`
`1156`		`- var ExpLoss = (this.Exp * (Options.Instance.Player.ExpLossOnDeathPercent / 100.0));`
`1157`		`- TakeExperience((long)ExpLoss);`
`1158`		`- }`
`1159`		`- else`
`1160`		`- {`
`1161`		`- var ExpLoss = (GetExperienceToNextLevel(this.Level) * (Options.Instance.Player.ExpLossOnDeathPercent / 100.0));`
`1162`		`- TakeExperience((long)ExpLoss);`
`1163`		`- }`
	`1154`	`+ var baseExp = Options.Instance.Player.ExpLossFromCurrentExp ? Exp : GetExperienceToNextLevel(Level);`
	`1155`	`+ var expRatioLost = Options.Instance.Player.ExpLossOnDeathPercent / 100.0;`
	`1156`	`+ var expLost = (long)(baseExp * expRatioLost);`
	`1157`	`+ TakeExperience(expLost);`
`1164`	`1158`	`}`
`1165`	`1159`	`}`
`1166`	`1160`	`PacketSender.SendEntityDie(this);`