diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index 1924d61b..5fe7789f 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -18,6 +18,7 @@ import engine.net.client.msg.PowerProjectileMsg; import engine.net.client.msg.TargetedActionMsg; import engine.net.client.msg.UpdateStateMsg; import engine.objects.*; +import engine.parsers.objects.RuneTemplate; import engine.powers.DamageShield; import engine.powers.effectmodifiers.AbstractEffectModifier; import engine.powers.effectmodifiers.WeaponProcEffectModifier; @@ -713,7 +714,7 @@ public enum CombatManager { // Mobs use their mobbase rune, players use their race rune. int runeID; - ItemTemplate rune; + RuneTemplate rune; int hand = slot.equals(mbEnums.EquipSlotType.LHELD) ? 2 : 1; switch (attacker.getObjectType()) { @@ -727,18 +728,18 @@ public enum CombatManager { return null; } - rune = ItemTemplate.templates.get(runeID); + rune = RuneTemplate._runes.get(runeID); - if (rune == null || rune.rune_natural_attacks.isEmpty()) + if (rune == null || rune.rune_naturalattacks.isEmpty()) return null; - for (float[] attack : rune.rune_natural_attacks) + for (float[] attack : rune.rune_naturalattacks) if (attack.length > 3 && (int) attack[3] == hand) return attack; // No entry for this hand, fall back to the first natural attack - return rune.rune_natural_attacks.get(0); + return rune.rune_naturalattacks.get(0); } public static int calculatePetDamage(AbstractCharacter agent) { diff --git a/src/engine/objects/AbstractCharacter.java b/src/engine/objects/AbstractCharacter.java index e6c83c23..368cb8c2 100644 --- a/src/engine/objects/AbstractCharacter.java +++ b/src/engine/objects/AbstractCharacter.java @@ -29,6 +29,7 @@ import engine.net.Dispatch; import engine.net.client.ClientConnection; import engine.net.client.msg.ApplyRuneMsg; import engine.net.client.msg.UpdateStateMsg; +import engine.parsers.objects.RuneTemplate; import engine.powers.EffectsBase; import engine.powers.PowersBase; import engine.powers.effectmodifiers.AbstractEffectModifier; @@ -656,7 +657,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject { AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.LHELD), false, equipped.get(EquipSlotType.LHELD)); if (abstractCharacter.getObjectType().equals(GameObjectType.Mob)) { Mob mob = (Mob) abstractCharacter; - ItemTemplate rune = ItemTemplate.templates.get(mob.loadID); + RuneTemplate rune = RuneTemplate._runes.get(mob.loadID); float minDamage = mob.mobBase.getDamageMin(); float maxDamage = mob.mobBase.getDamageMax(); int attackRating = mob.mobBase.getAttackRating();