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

Replaced Trait id with ordinal.

Browse Source
This commit is contained in:
MobiusDev
2018-02-19 10:58:11 +00:00
parent ad9e13ad36
commit e73aa43b3d
25 changed files with 419 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -59,8 +59,8 @@ public final class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
charStat.getAttackTraits()[trait.getKey().getId()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().getId()]--;
charStat.getAttackTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]--;
}
}
}
@@ -73,8 +73,8 @@ public final class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
charStat.getAttackTraits()[trait.getKey().getId()] *= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().getId()]++;
charStat.getAttackTraits()[trait.getKey().ordinal()] *= trait.getValue();
charStat.getAttackTraitsCount()[trait.getKey().ordinal()]++;
}
}
}

12
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -78,12 +78,12 @@ public final class DefenceTrait extends AbstractEffect
{
if (trait.getValue() < 2.0f)
{
charStat.getDefenceTraits()[trait.getKey().getId()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().getId()]--;
charStat.getDefenceTraits()[trait.getKey().ordinal()] /= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]--;
}
else
{
charStat.getTraitsInvul()[trait.getKey().getId()]--;
charStat.getTraitsInvul()[trait.getKey().ordinal()]--;
}
}
}
@@ -99,12 +99,12 @@ public final class DefenceTrait extends AbstractEffect
{
if (trait.getValue() < 2.0f)
{
charStat.getDefenceTraits()[trait.getKey().getId()] *= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().getId()]++;
charStat.getDefenceTraits()[trait.getKey().ordinal()] *= trait.getValue();
charStat.getDefenceTraitsCount()[trait.getKey().ordinal()]++;
}
else
{
charStat.getTraitsInvul()[trait.getKey().getId()]++;
charStat.getTraitsInvul()[trait.getKey().ordinal()]++;
}
}
}

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@@ -759,7 +759,7 @@ public class CharStat
public float getAttackTrait(TraitType traitType)
{
return _attackTraits[traitType.getId()];
return _attackTraits[traitType.ordinal()];
}
public float[] getAttackTraits()
@@ -769,7 +769,7 @@ public class CharStat
public boolean hasAttackTrait(TraitType traitType)
{
return _attackTraitsCount[traitType.getId()] > 0;
return _attackTraitsCount[traitType.ordinal()] > 0;
}
public int[] getAttackTraitsCount()
@@ -779,7 +779,7 @@ public class CharStat
public float getDefenceTrait(TraitType traitType)
{
return _defenceTraits[traitType.getId()];
return _defenceTraits[traitType.ordinal()];
}
public float[] getDefenceTraits()
@@ -789,7 +789,7 @@ public class CharStat
public boolean hasDefenceTrait(TraitType traitType)
{
return _defenceTraitsCount[traitType.getId()] > 0;
return _defenceTraitsCount[traitType.ordinal()] > 0;
}
public int[] getDefenceTraitsCount()
@@ -799,7 +799,7 @@ public class CharStat
public boolean isTraitInvul(TraitType traitType)
{
return _traitsInvul[traitType.getId()] > 0;
return _traitsInvul[traitType.ordinal()] > 0;
}
public int[] getTraitsInvul()

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -2107,7 +2107,7 @@ public final class Formulas
public static double calcWeaponTraitBonus(L2Character attacker, L2Character target)
{
final TraitType type = attacker.getAttackType().getTraitType();
final double result = target.getStat().getDefenceTraits()[type.getId()] - 1.0;
final double result = target.getStat().getDefenceTraits()[type.ordinal()] - 1.0;
return 1.0 - result;
}

93
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/TraitType.java
View File

@@ -21,63 +21,56 @@ package com.l2jmobius.gameserver.model.stats;
*/
public enum TraitType
{
NONE(0, 0),
SWORD(1, 1),
BLUNT(2, 1),
DAGGER(3, 1),
POLE(4, 1),
FIST(5, 1),
BOW(6, 1),
ETC(7, 1),
UNK_8(8, 0),
POISON(9, 3),
HOLD(10, 3),
BLEED(11, 3),
SLEEP(12, 3),
SHOCK(13, 3),
DERANGEMENT(14, 3),
BUG_WEAKNESS(15, 2),
ANIMAL_WEAKNESS(16, 2),
PLANT_WEAKNESS(17, 2),
BEAST_WEAKNESS(18, 2),
DRAGON_WEAKNESS(19, 2),
PARALYZE(20, 3),
DUAL(21, 1),
DUALFIST(22, 1),
BOSS(23, 3),
GIANT_WEAKNESS(24, 2),
CONSTRUCT_WEAKNESS(25, 2),
DEATH(26, 3),
VALAKAS(27, 2),
ANESTHESIA(28, 2),
CRITICAL_POISON(29, 3),
ROOT_PHYSICALLY(30, 3),
ROOT_MAGICALLY(31, 3),
RAPIER(32, 1),
CROSSBOW(33, 1),
ANCIENTSWORD(34, 1),
TURN_STONE(35, 3),
GUST(36, 3),
PHYSICAL_BLOCKADE(37, 3),
TARGET(38, 3),
PHYSICAL_WEAKNESS(39, 3),
MAGICAL_WEAKNESS(40, 3),
DUALDAGGER(41, 1);
NONE(0),
SWORD(1),
BLUNT(1),
DAGGER(1),
POLE(1),
FIST(1),
BOW(1),
ETC(1),
UNK_8(0),
POISON(3),
HOLD(3),
BLEED(3),
SLEEP(3),
SHOCK(3),
DERANGEMENT(3),
BUG_WEAKNESS(2),
ANIMAL_WEAKNESS(2),
PLANT_WEAKNESS(2),
BEAST_WEAKNESS(2),
DRAGON_WEAKNESS(2),
PARALYZE(3),
DUAL(1),
DUALFIST(1),
BOSS(3),
GIANT_WEAKNESS(2),
CONSTRUCT_WEAKNESS(2),
DEATH(3),
VALAKAS(2),
ANESTHESIA(2),
CRITICAL_POISON(3),
ROOT_PHYSICALLY(3),
ROOT_MAGICALLY(3),
RAPIER(1),
CROSSBOW(1),
ANCIENTSWORD(1),
TURN_STONE(3),
GUST(3),
PHYSICAL_BLOCKADE(3),
TARGET(3),
PHYSICAL_WEAKNESS(3),
MAGICAL_WEAKNESS(3),
DUALDAGGER(1);
private final int _id;
private final int _type; // 1 = weapon, 2 = weakness, 3 = resistance
TraitType(int id, int type)
TraitType(int type)
{
_id = id;
_type = type;
}
public int getId()
{
return _id;
}
public int getType()
{
return _type;