Browse Source

More itembase refactor work

combat-2
MagicBot 8 months ago
parent
commit
b9b04c2b9f
  1. 22
      src/engine/objects/AbstractCharacter.java

22
src/engine/objects/AbstractCharacter.java

@ -982,29 +982,31 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
public final float getRange() { public final float getRange() {
// Treb range does not appear to be set here
// what gives?
if (this.getObjectType() == GameObjectType.Mob) { if (this.getObjectType() == GameObjectType.Mob) {
Mob mob = (Mob) this; Mob mob = (Mob) this;
if (mob.isSiege()) { if (mob.isSiege()) {
return 300; return 300;
} }
float range = 8; float range = 8;
if (((Mob) this).getEquip().get(1) != null) { if (((Mob) this).getEquip().get(1) != null) {
range = ((Mob) this).getEquip().get(1).getItemBase().getRange(); range = ((Mob) this).getEquip().get(1).template.item_weapon_max_range;
} else if (((Mob) this).getEquip().get(2) != null) { } else if (((Mob) this).getEquip().get(2) != null) {
range = ((Mob) this).getEquip().get(2).getItemBase().getRange(); range = ((Mob) this).getEquip().get(2).template.item_weapon_max_range;
} }
if (range > 80) {
// TODO Is this clamp from live?
if (range > 80)
range = 80; range = 80;
}
return range; return range;
} }
if (this.rangeHandOne > this.rangeHandTwo) {
if (this.rangeHandOne > this.rangeHandTwo)
return this.rangeHandOne; return this.rangeHandOne;
}
return this.rangeHandTwo; return this.rangeHandTwo;
} }

Loading…
Cancel
Save