From 967476c7b399dd6d5be8ec7140dd2d1d521ccbf7 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 14 Jul 2019 22:14:43 +0000
Subject: [PATCH] Proceeding with DefenceTrait adjustments.

---
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 .../data/scripts/handlers/effecthandlers/AttackTrait.java | 2 +-
 .../gameserver/model/actor/stat/CreatureStat.java         | 8 ++++----
 .../org/l2jmobius/gameserver/model/stats/Formulas.java    | 2 +-
 36 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 1d6215483d..50670aa63d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -591,7 +591,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -605,7 +605,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 417c327c6f..8058af11cf 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 1d6215483d..50670aa63d 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -591,7 +591,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -605,7 +605,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 417c327c6f..8058af11cf 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 1d6215483d..50670aa63d 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -591,7 +591,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -605,7 +605,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 417c327c6f..8058af11cf 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 1d6215483d..50670aa63d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -591,7 +591,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -605,7 +605,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f1de2767b9..0c2beb1999 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 1d6215483d..50670aa63d 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -591,7 +591,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -605,7 +605,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f1de2767b9..0c2beb1999 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 1d6215483d..50670aa63d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -591,7 +591,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -605,7 +605,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f1de2767b9..0c2beb1999 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 1d6215483d..50670aa63d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -591,7 +591,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -605,7 +605,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index f1de2767b9..0c2beb1999 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 2b90a8ab15..714409cc15 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -581,7 +581,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -595,7 +595,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 97cc9142b4..3d75ea852e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 2b90a8ab15..714409cc15 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -581,7 +581,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -595,7 +595,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 97cc9142b4..3d75ea852e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 2b90a8ab15..714409cc15 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -581,7 +581,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -595,7 +595,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 97cc9142b4..3d75ea852e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 2b90a8ab15..714409cc15 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -581,7 +581,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -595,7 +595,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 97cc9142b4..3d75ea852e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
index 71d0c10627..4968e1a52f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java
@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
 		
 		for (Entry<String, Object> param : params.getSet().entrySet())
 		{
-			_attackTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) / 100) + 1);
+			_attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index 2b90a8ab15..714409cc15 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -90,7 +90,7 @@ public class CreatureStat
 		for (int i = 0; i < TraitType.values().length; i++)
 		{
 			_attackTraitValues[i] = 1;
-			_defenceTraitValues[i] = 1;
+			_defenceTraitValues[i] = 0;
 		}
 	}
 	
@@ -581,7 +581,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] *= value;
+			_attackTraitValues[traitType.ordinal()] += value;
 			_attackTraits.add(traitType);
 		}
 		finally
@@ -595,7 +595,7 @@ public class CreatureStat
 		_lock.readLock().lock();
 		try
 		{
-			_attackTraitValues[traitType.ordinal()] /= value;
+			_attackTraitValues[traitType.ordinal()] -= value;
 			if (_attackTraitValues[traitType.ordinal()] == 1)
 			{
 				_attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
 		try
 		{
 			_defenceTraitValues[traitType.ordinal()] -= value;
-			if (_defenceTraitValues[traitType.ordinal()] == 1)
+			if (_defenceTraitValues[traitType.ordinal()] == 0)
 			{
 				_defenceTraits.remove(traitType);
 			}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 97cc9142b4..3d75ea852e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1331,7 +1331,7 @@ public final class Formulas
 	
 	public static double calcWeaponTraitBonus(Creature attacker, Creature target)
 	{
-		return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
+		return Math.max(0, 1.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()));
 	}
 	
 	public static double calcAttackTraitBonus(Creature attacker, Creature target)