Fixed accuracy calculations.

This commit is contained in:
ceikry
2021-07-23 14:36:17 -05:00
parent 1ddf01c098
commit aafe92d544
17 changed files with 72 additions and 87 deletions
@@ -159,8 +159,8 @@ public final class GWDGraardorSwingHandler extends CombatSwingHandler {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return getType().getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return getType().getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -192,8 +192,8 @@ public final class GWDKreeArraSwingHandler extends CombatSwingHandler {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return getType().getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return getType().getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -143,8 +143,8 @@ public final class GWDTsutsarothSwingHandler extends CombatSwingHandler {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return getType().getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return getType().getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -121,8 +121,8 @@ public class GWDZilyanaSwingHandler extends CombatSwingHandler {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return getType().getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return getType().getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -332,8 +332,8 @@ public final class TzhaarFightCaveNPC extends AbstractNPC {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return style.getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return style.getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -216,8 +216,8 @@ public final class ElvargNPC extends AbstractNPC {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return style.getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return style.getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -169,8 +169,8 @@ public final class MeldarMadNPC extends AbstractNPC {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return style.getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return style.getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -208,8 +208,8 @@ public class DragonfireSwingHandler extends CombatSwingHandler {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return CombatStyle.MAGIC.getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return CombatStyle.MAGIC.getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -296,8 +296,8 @@ public final class KalphiteQueenNPC extends AbstractNPC {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return style.getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return style.getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -315,8 +315,8 @@ public class TormentedDemonNPC extends AbstractNPC {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
return style.getSwingHandler().calculateDefence(entity, attacker);
public int calculateDefence(Entity victim, Entity attacker) {
return style.getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -143,11 +143,11 @@ public final class KingBlackDragonNPC extends AbstractNPC {
}
@Override
public int calculateDefence(Entity entity, Entity attacker) {
public int calculateDefence(Entity victim, Entity attacker) {
if (style == CombatStyle.MELEE) {
return style.getSwingHandler().calculateDefence(entity, attacker);
return style.getSwingHandler().calculateDefence(victim, attacker);
}
return CombatStyle.MAGIC.getSwingHandler().calculateDefence(entity, attacker);
return CombatStyle.MAGIC.getSwingHandler().calculateDefence(victim, attacker);
}
@Override
@@ -1,5 +1,6 @@
package core.game.node.entity.player;
import api.ContentAPI;
import core.game.component.Component;
import core.game.container.Container;
import core.game.container.impl.BankContainer;
@@ -70,6 +71,7 @@ import core.tools.RandomFunction;
import core.tools.StringUtils;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.rs09.consts.Items;
import rs09.ServerConstants;
import rs09.game.VarpManager;
import rs09.game.content.ame.RandomEventManager;
@@ -755,6 +757,14 @@ public class Player extends Entity {
Arrays.fill(renderInfo.getAppearanceStamps(),0);
}
/**
* Checks if the player is wearing void.
*/
public boolean isWearingVoid(boolean melee){
int helm = melee ? Items.VOID_MELEE_HELM_11665 : Items.VOID_RANGER_HELM_11664;
return ContentAPI.inEquipment(this, helm, 1) && ContentAPI.inEquipment(this, Items.VOID_KNIGHT_ROBE_8840, 1) && ContentAPI.inEquipment(this, Items.VOID_KNIGHT_TOP_8839, 1);
}
/**
* Updates the player's scene graph.
* @param login If the player is logging in.