lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proceeding with DefenceTrait adjustments.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-07-14 22:14:43 +00:00
parent c248b6ff85
commit 967476c7b3
36 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -591,7 +591,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -605,7 +605,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -591,7 +591,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -605,7 +605,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -591,7 +591,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -605,7 +605,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -591,7 +591,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -605,7 +605,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -591,7 +591,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -605,7 +605,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -591,7 +591,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -605,7 +605,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -591,7 +591,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -605,7 +605,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -663,7 +663,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -581,7 +581,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -595,7 +595,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -581,7 +581,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -595,7 +595,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -581,7 +581,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -595,7 +595,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -581,7 +581,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -595,7 +595,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -45,7 +45,7 @@ public final class AttackTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) 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);
} }
} }

8
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
View File

@@ -90,7 +90,7 @@ public class CreatureStat
for (int i = 0; i < TraitType.values().length; i++) for (int i = 0; i < TraitType.values().length; i++)
{ {
_attackTraitValues[i] = 1; _attackTraitValues[i] = 1;
_defenceTraitValues[i] = 1; _defenceTraitValues[i] = 0;
} }
} }
@@ -581,7 +581,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] *= value; _attackTraitValues[traitType.ordinal()] += value;
_attackTraits.add(traitType); _attackTraits.add(traitType);
} }
finally finally
@@ -595,7 +595,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_attackTraitValues[traitType.ordinal()] /= value; _attackTraitValues[traitType.ordinal()] -= value;
if (_attackTraitValues[traitType.ordinal()] == 1) if (_attackTraitValues[traitType.ordinal()] == 1)
{ {
_attackTraits.remove(traitType); _attackTraits.remove(traitType);
@@ -653,7 +653,7 @@ public class CreatureStat
try try
{ {
_defenceTraitValues[traitType.ordinal()] -= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 0)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);
} }

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1331,7 +1331,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(Creature attacker, Creature target) 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) public static double calcAttackTraitBonus(Creature attacker, Creature target)