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

Add trait bonus instead of multiplying.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-06-13 20:11:48 +00:00
parent badd7c95b2
commit 38b7674feb
36 changed files with 96 additions and 96 deletions
Show Stats 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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -648,7 +648,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -662,7 +662,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -648,7 +648,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -662,7 +662,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -648,7 +648,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -662,7 +662,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -648,7 +648,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -662,7 +662,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -648,7 +648,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -662,7 +662,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -648,7 +648,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -662,7 +662,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -648,7 +648,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -662,7 +662,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -638,7 +638,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -652,7 +652,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -638,7 +638,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -652,7 +652,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

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

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -638,7 +638,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -652,7 +652,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -638,7 +638,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -652,7 +652,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);

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) / 100); _attackTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@ -45,7 +45,7 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet()) for (Entry<String, Object> param : params.getSet().entrySet())
{ {
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100); _defenceTraits.put(TraitType.valueOf(param.getKey()), Float.parseFloat((String) param.getValue()) / 100);
} }
} }
@ -54,7 +54,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
} }
@ -70,7 +70,7 @@ public final class DefenceTrait extends AbstractEffect
{ {
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet()) for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{ {
if (trait.getValue() < 2.0f) if (trait.getValue() < 1.0f)
{ {
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue()); effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
} }

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

@ -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);
@ -638,7 +638,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] *= value; _defenceTraitValues[traitType.ordinal()] += value;
_defenceTraits.add(traitType); _defenceTraits.add(traitType);
} }
finally finally
@ -652,7 +652,7 @@ public class CreatureStat
_lock.readLock().lock(); _lock.readLock().lock();
try try
{ {
_defenceTraitValues[traitType.ordinal()] /= value; _defenceTraitValues[traitType.ordinal()] -= value;
if (_defenceTraitValues[traitType.ordinal()] == 1) if (_defenceTraitValues[traitType.ordinal()] == 1)
{ {
_defenceTraits.remove(traitType); _defenceTraits.remove(traitType);