Browse Source

File reformat

combat-2
MagicBot 9 months ago
parent
commit
39de8439ba
  1. 10
      src/engine/Enum.java

10
src/engine/Enum.java

@ -156,12 +156,11 @@ public class Enum {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static final HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>(); private static final HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
int runeID;
private final MonsterType monsterType; private final MonsterType monsterType;
private final CharacterSex characterSex; private final CharacterSex characterSex;
private final RunSpeed runSpeed; private final RunSpeed runSpeed;
private final float scaleHeight; private final float scaleHeight;
int runeID;
RaceType(int runeID, MonsterType aggroType, RunSpeed runspeed, CharacterSex characterSex, float scaleHeight) { RaceType(int runeID, MonsterType aggroType, RunSpeed runspeed, CharacterSex characterSex, float scaleHeight) {
this.runeID = runeID; this.runeID = runeID;
@ -615,8 +614,7 @@ public class Enum {
BEDROLL(26), BEDROLL(26),
FARMABLE(27), FARMABLE(27),
WATERBUCKET(30), WATERBUCKET(30),
GIFT(31), GIFT(31);
;
private final static HashMap<Integer, ItemType> _typeLookup = new HashMap<>(); private final static HashMap<Integer, ItemType> _typeLookup = new HashMap<>();
private final int _value; private final int _value;
@ -1456,9 +1454,9 @@ public class Enum {
Necromancy((1L << 62), -556571154, 10), Necromancy((1L << 62), -556571154, 10),
SunDancing((1L << 63), 22329752, 20); SunDancing((1L << 63), 22329752, 20);
private final int reqLvl;
private long flag; private long flag;
private int token; private int token;
private final int reqLvl;
CharacterSkills(long flag, int token, int reqLvl) { CharacterSkills(long flag, int token, int reqLvl) {
this.flag = flag; this.flag = flag;
@ -2793,7 +2791,7 @@ public class Enum {
return leadershipTypes[i]; return leadershipTypes[i];
} }
public boolean canJoin(AbstractCharacter character){ public boolean canJoin(AbstractCharacter character) {
return this.requiredRaces.contains(character.absRace) && this.requiredClasses.contains(character.absPromotionClass) && this.sexRequired.contains(character.absGender); return this.requiredRaces.contains(character.absRace) && this.requiredClasses.contains(character.absPromotionClass) && this.sexRequired.contains(character.absGender);
} }
} }

Loading…
Cancel
Save