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

Use EnumSet instead or Arrays for traits.

Browse Source 
Adapted from: L2jUnity free files.
This commit is contained in:
MobiusDevelopment
2019-06-11 03:16:24 +00:00
parent 582f0cc188
commit 9b37677bd4
60 changed files with 1086 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,9 +22,7 @@ import java.util.Map.Entry;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.stat.CreatureStat;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.TraitType;
@@ -51,35 +49,11 @@ public final class AttackTrait extends AbstractEffect
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
public void pump(Creature effected, Skill skill)
{
final CreatureStat charStat = effected.getStat();
synchronized (charStat.getAttackTraits())
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
if (charStat.getAttackTraitsCount()[trait.getKey().ordinal()] == 0)
{
continue;
}
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
}
}
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
final CreatureStat charStat = effected.getStat();
synchronized (charStat.getAttackTraits())
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
charStat.getAttackTraits()[trait.getKey().ordinal()] *= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]++;
}
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue());
}
}
}

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

@@ -22,9 +22,7 @@ import java.util.Map.Entry;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.stat.CreatureStat;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.TraitType;
@@ -46,75 +44,22 @@ public final class DefenceTrait extends AbstractEffect
for (Entry<String, Object> param : params.getSet().entrySet())
{
try
{
final TraitType traitType = TraitType.valueOf(param.getKey());
final float value = Float.parseFloat((String) param.getValue());
if (value == 0)
{
continue;
}
_defenceTraits.put(traitType, (value + 100) / 100);
}
catch (NumberFormatException e)
{
LOGGER.warning(getClass().getSimpleName() + ": value of " + param.getKey() + " must be float value " + param.getValue() + " found.");
}
catch (Exception e)
{
LOGGER.warning(getClass().getSimpleName() + ": value of TraitType enum required but found: " + param.getKey());
}
_defenceTraits.put(TraitType.valueOf(param.getKey()), (Float.parseFloat((String) param.getValue()) + 100) / 100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
public void pump(Creature effected, Skill skill)
{
final CreatureStat charStat = effected.getStat();
synchronized (charStat.getDefenceTraits())
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
if (trait.getValue() < 2.0f)
{
if (trait.getValue() < 2.0f)
{
if (charStat.getDefenceTraitsCount()[trait.getKey().ordinal()] == 0)
{
continue;
}
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
}
else
{
if (charStat.getTraitsInvul()[trait.getKey().ordinal()] == 0)
{
continue;
}
charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
}
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
}
}
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
final CreatureStat charStat = effected.getStat();
synchronized (charStat.getDefenceTraits())
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
else
{
if (trait.getValue() < 2.0f)
{
charStat.getDefenceTraits()[trait.getKey().ordinal()] *= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]++;
}
else
{
charStat.getTraitsInvul()[trait.getKey().ordinal()]++;
}
effected.getStat().mergeInvulnerableTrait(trait.getKey());
}
}
}