New formulas

2 files changed, 10 insertions, 16 deletions

diff --git a/server/formulas/Defense.png b/server/formulas/Defense.png
index 8cc1493..e87362f 100644
--- a/server/formulas/Defense.png
+++ b/server/formulas/Defense.png
diff --git a/server/formulas/tmw2.md b/server/formulas/tmw2.md
index 7b0b13f..51d838d 100644
--- a/server/formulas/tmw2.md
+++ b/server/formulas/tmw2.md
@@ -193,17 +193,20 @@ evenly across agility and dexterity, this shouldn't be a problem.
 
 ![Defense Scaling in TMW2](server/formulas/Defense.png)
 
+Blue line is DEFENSE, Red line is MAGIC DEFENSE.
+
 As you can see, defense use a non-linear scale, ultimately capping around 10.0%
 damage received as you near absurd amounts of defense (eg. a million).
 
-Therefore, we used 800 defense (which means 60% damage reduction) as reference for
+Therefore, we used 350 defense (which means 40% damage reduction) as reference for
 level 100 and baked the following formula:
 
 ```
 Def=(Lv**1.255)*2.5
+Def=Def*350/810.0
 ```
 
-You'll notice it won't give exactly 800 defense at level 100 - it gives a bit more.
+You'll notice it won't give exactly 350 defense at level 100 - it gives a bit more.
 That's because rounding.
 
 That is TOTAL LEVEL MAXIMUM DEFENSE. When reaching higher level equipment, consider
@@ -225,11 +228,11 @@ Light Helmet - 10%
 Leggings - 10%
 
 Shields - 25%
-Gloves - 5%
-Boots - 5%
+Boots - 8%
+Gloves - 7%
 ```
 
-This totals to 100% when using heavy armor with shield. Archers, mages, two handed
+This totals to 105% when using heavy armor with shield. Archers, mages, two handed
 weapon users will therefore have significant less defense.
 
 In general, archers and mages cannot/shouldn't use heavy armor or shields, so they have
@@ -242,6 +245,8 @@ If for some reason a melee fighter decide to don't use the heavy armor because
 speed, they'll still have 85% defense from the reference, meaning that not using
 a shield is worse than not using heavy armor.
 
+NOTE: If an armor piece raise magic attack, the defense for said piece is HALVED!
+
 | Lv | Damage Taken | Nominal Defense |
 |--|--------------|----|
 |0 | 100% | 0 |
@@ -256,17 +261,6 @@ a shield is worse than not using heavy armor.
 | 90 | 60.97% | 306 |
 | 100 | 58.03% | 349 |
 
-10 Level 19 Defense (95.83% DMG)
-20 Level 46 Defense (90.65% DMG)
-30 Level 77 Defense (85.45% DMG)
-40 Level 110 Defense (80.49% DMG)
-50 Level 146 Defense (75.88% DMG)
-60 Level 184 Defense (71.63% DMG)
-70 Level 223 Defense (67.75% DMG)
-80 Level 264 Defense (64.20% DMG)
-90 Level 306 Defense (60.97% DMG)
-100 Level 349 Defense (58.03% DMG)
-
 ### Hard Defense Distribution
 
 Hard Defense, also known as Def2 or Vit Defense, is the absolute damage negation.