FatBoy
/
lakebane
forked from MagicBane/Server
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'magicbox1.5' of http://repo.magicbane.com/MagicBane/Server into magicbox1.5

master
FatBoy-DOTC 1 year ago
parent
9f162e9ed0 46d50d315a
commit
9a68509847
5 changed files with 529 additions and 525 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 464
      src/engine/Enum.java
  2. 11
      src/engine/ai/MobileFSMManager.java
  3. 9
      src/engine/gameManager/ConfigManager.java
  4. 5
      src/engine/gameManager/ZoneManager.java
  5. 3
      src/engine/objects/PlayerCharacter.java

464
src/engine/Enum.java
Unescape View File

@ -9,6 +9,7 @@
package engine; package engine;
import ch.claude_martin.enumbitset.EnumBitSetHelper; import ch.claude_martin.enumbitset.EnumBitSetHelper;
import engine.gameManager.ConfigManager;
import engine.gameManager.PowersManager; import engine.gameManager.PowersManager;
import engine.gameManager.ZoneManager; import engine.gameManager.ZoneManager;
import engine.math.Vector2f; import engine.math.Vector2f;
@ -99,32 +100,32 @@ public class Enum {
// RaceRuneID / AggroType, isFemale // RaceRuneID / AggroType, isFemale
AELFMALE(2000, MonsterType.Aelfborn, RunSpeed.STANDARD, CharacterSex.MALE,1.05f), AELFMALE(2000, MonsterType.Aelfborn, RunSpeed.STANDARD, CharacterSex.MALE, 1.05f),
AELFFEMALE(2001, MonsterType.Aelfborn, RunSpeed.STANDARD, CharacterSex.FEMALE,1.05f), AELFFEMALE(2001, MonsterType.Aelfborn, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.05f),
ARACOIXMALE(2002, MonsterType.Aracoix, RunSpeed.STANDARD, CharacterSex.MALE,1), ARACOIXMALE(2002, MonsterType.Aracoix, RunSpeed.STANDARD, CharacterSex.MALE, 1),
ARACOIXFEMALE(2003, MonsterType.Aracoix, RunSpeed.STANDARD, CharacterSex.FEMALE,1), ARACOIXFEMALE(2003, MonsterType.Aracoix, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
CENTAURMALE(2004, MonsterType.Centaur, RunSpeed.CENTAUR, CharacterSex.MALE,1.2f), CENTAURMALE(2004, MonsterType.Centaur, RunSpeed.CENTAUR, CharacterSex.MALE, 1.2f),
CENTAURFEMALE(2005, MonsterType.Centaur, RunSpeed.CENTAUR, CharacterSex.FEMALE, 1.2f), CENTAURFEMALE(2005, MonsterType.Centaur, RunSpeed.CENTAUR, CharacterSex.FEMALE, 1.2f),
DWARFMALE(2006, MonsterType.Dwarf, RunSpeed.STANDARD, CharacterSex.MALE,0.80000001f), DWARFMALE(2006, MonsterType.Dwarf, RunSpeed.STANDARD, CharacterSex.MALE, 0.80000001f),
ELFMALE(2008, MonsterType.Elf, RunSpeed.STANDARD, CharacterSex.MALE, 1.4f), ELFMALE(2008, MonsterType.Elf, RunSpeed.STANDARD, CharacterSex.MALE, 1.4f),
ELFFEMALE(2009, MonsterType.Elf, RunSpeed.STANDARD, CharacterSex.FEMALE,1.1f), ELFFEMALE(2009, MonsterType.Elf, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
HALFGIANTMALE(2010, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.MALE, 1.15f), HALFGIANTMALE(2010, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.MALE, 1.15f),
HUMANMALE(2011, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.MALE,1), HUMANMALE(2011, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.MALE, 1),
HUMANFEMALE(2012, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.FEMALE,1), HUMANFEMALE(2012, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
IREKEIMALE(2013, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.MALE,1.1f), IREKEIMALE(2013, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.MALE, 1.1f),
IREKEIFEMALE(2014, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.FEMALE,1.1f), IREKEIFEMALE(2014, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
SHADEMALE(2015, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.MALE,1), SHADEMALE(2015, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.MALE, 1),
SHADEFEMALE(2016, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.FEMALE,1), SHADEFEMALE(2016, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
MINOMALE(2017, MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE,1.3f), MINOMALE(2017, MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE, 1.3f),
ARCHONMALE(2018, MonsterType.Celestial, RunSpeed.STANDARD, CharacterSex.MALE,1), ARCHONMALE(2018, MonsterType.Celestial, RunSpeed.STANDARD, CharacterSex.MALE, 1),
HALEGIANTOLDMALE(2019, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.MALE,1.15f), HALEGIANTOLDMALE(2019, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.MALE, 1.15f),
CSRFEMALE(2020, MonsterType.CSR, RunSpeed.STANDARD, CharacterSex.FEMALE,0.66000003f), CSRFEMALE(2020, MonsterType.CSR, RunSpeed.STANDARD, CharacterSex.FEMALE, 0.66000003f),
CSRMALE(2021, MonsterType.CSR, RunSpeed.STANDARD, CharacterSex.MALE,1), CSRMALE(2021, MonsterType.CSR, RunSpeed.STANDARD, CharacterSex.MALE, 1),
NEPHMALE(2025, MonsterType.Nephilim, RunSpeed.STANDARD, CharacterSex.MALE,1.1f), NEPHMALE(2025, MonsterType.Nephilim, RunSpeed.STANDARD, CharacterSex.MALE, 1.1f),
NEPHFEMALE(2026, MonsterType.Nephilim, RunSpeed.STANDARD, CharacterSex.FEMALE,1.1f), NEPHFEMALE(2026, MonsterType.Nephilim, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
HALFGIANTFEMALE(2027, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.FEMALE,1.15f), HALFGIANTFEMALE(2027, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.15f),
VAMPMALE(2028, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.MALE, 1), VAMPMALE(2028, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.MALE, 1),
VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE,1); VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>(); private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
@ -143,18 +144,10 @@ public class Enum {
this.scaleHeight = scaleHeight; this.scaleHeight = scaleHeight;
} }
public int getRuneID() {
return this.runeID;
}
public static RaceType getRaceTypebyRuneID(int runeID) { public static RaceType getRaceTypebyRuneID(int runeID) {
return _raceTypeByID.get(runeID); return _raceTypeByID.get(runeID);
} }
public float getScaleHeight(){
return this.scaleHeight;
}
public static void initRaceTypeTables() { public static void initRaceTypeTables() {
for (RaceType raceType : RaceType.values()) { for (RaceType raceType : RaceType.values()) {
@ -162,6 +155,14 @@ public class Enum {
} }
} }
public int getRuneID() {
return this.runeID;
}
public float getScaleHeight() {
return this.scaleHeight;
}
public MonsterType getMonsterType() { public MonsterType getMonsterType() {
return monsterType; return monsterType;
} }
@ -217,11 +218,6 @@ public class Enum {
return runCombat; return runCombat;
} }
public float getSwim() {
return swim;
}
public float getFlyRun() { public float getFlyRun() {
return flyRun; return flyRun;
} }
@ -256,10 +252,6 @@ public class Enum {
this.listType = listType; this.listType = listType;
} }
public int getListType() {
return this.listType;
}
public static FriendListType getListTypeByID(int listType) { public static FriendListType getListTypeByID(int listType) {
FriendListType outType = null; FriendListType outType = null;
@ -270,6 +262,7 @@ public class Enum {
} }
return outType; return outType;
} }
} }
public enum DispatchChannel { public enum DispatchChannel {
@ -334,10 +327,6 @@ public class Enum {
this.meshID = meshID; this.meshID = meshID;
} }
public int getMeshID() {
return meshID;
}
public static CharterType getCharterTypeByID(int charterID) { public static CharterType getCharterTypeByID(int charterID) {
CharterType outType = null; CharterType outType = null;
@ -347,6 +336,10 @@ public class Enum {
} }
return outType; return outType;
} }
public int getMeshID() {
return meshID;
}
} }
@ -424,8 +417,14 @@ public class Enum {
this.zoneUUID = uuid; this.zoneUUID = uuid;
} }
public int getZoneUUID() { public static Ruins getRandomRuin() {
return this.zoneUUID;
Ruins ruins;
ruins = Ruins.values()[ThreadLocalRandom.current()
.nextInt(Ruins.values().length)];
return ruins;
} }
public Vector3fImmutable getLocation() { public Vector3fImmutable getLocation() {
@ -433,20 +432,25 @@ public class Enum {
Zone ruinZone; Zone ruinZone;
Vector3fImmutable spawnLocation; Vector3fImmutable spawnLocation;
// Send to SDR if so configured
if (ConfigManager.MB_USE_RUINS.getValue().equalsIgnoreCase("true")) {
ruinZone = ZoneManager.getZoneByUUID(this.zoneUUID); ruinZone = ZoneManager.getZoneByUUID(this.zoneUUID);
spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30); spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
} else {
ruinZone = ZoneManager.getZoneByName("sea dog's rest");
return spawnLocation; // 14001 does not have a banestone to bind at
}
public static Ruins getRandomRuin() { if (ruinZone.getLoadNum() == 14001)
spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
else
spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
.add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
}
Ruins ruins;
ruins = Ruins.values()[ThreadLocalRandom.current() return spawnLocation;
.nextInt(Ruins.values().length)];
return ruins;
} }
} }
@ -562,8 +566,8 @@ public class Enum {
RESOURCE(34), RESOURCE(34),
REALMCHARTER(35); REALMCHARTER(35);
private final int _value;
private final static HashMap<Integer, ItemType> _typeLookup = new HashMap<>(); private final static HashMap<Integer, ItemType> _typeLookup = new HashMap<>();
private final int _value;
ItemType(int value) { ItemType(int value) {
this._value = value; this._value = value;
@ -630,22 +634,6 @@ public class Enum {
this.token = token; this.token = token;
} }
public int getBlueprintUUID() {
return blueprintUUID;
}
public int getEffectFlag() {
return effectFlag;
}
public int getToken() {
return token;
}
public EffectsBase getEffectBase() {
return PowersManager.getEffectByToken(token);
}
public static SpireType getByBlueprintUUID(int uuid) { public static SpireType getByBlueprintUUID(int uuid) {
SpireType outType = SpireType.GROUNDING; SpireType outType = SpireType.GROUNDING;
@ -662,6 +650,22 @@ public class Enum {
return outType; return outType;
} }
public int getBlueprintUUID() {
return blueprintUUID;
}
public int getEffectFlag() {
return effectFlag;
}
public int getToken() {
return token;
}
public EffectsBase getEffectBase() {
return PowersManager.getEffectByToken(token);
}
} }
public enum TransactionType { public enum TransactionType {
@ -755,14 +759,15 @@ public class Enum {
Powerblock, Powerblock,
Steel, Steel,
Drain; Drain;
public static DamageType GetDamageType(String modName){
public static DamageType GetDamageType(String modName) {
DamageType damageType; DamageType damageType;
if (modName.isEmpty()) if (modName.isEmpty())
return DamageType.None; return DamageType.None;
try{ try {
damageType = DamageType.valueOf(modName.replace(",", "")); damageType = DamageType.valueOf(modName.replace(",", ""));
}catch(Exception e){ } catch (Exception e) {
Logger.error(e); Logger.error(e);
return DamageType.None; return DamageType.None;
} }
@ -923,14 +928,15 @@ public class Enum {
VAMPDRAIN, VAMPDRAIN,
WEAPON, WEAPON,
Wizardry; Wizardry;
public static SourceType GetSourceType(String modName){
public static SourceType GetSourceType(String modName) {
SourceType returnMod; SourceType returnMod;
if(modName.isEmpty()) if (modName.isEmpty())
return SourceType.None; return SourceType.None;
try{ try {
returnMod = SourceType.valueOf(modName.replace(",", "")); returnMod = SourceType.valueOf(modName.replace(",", ""));
}catch(Exception e){ } catch (Exception e) {
Logger.error(modName); Logger.error(modName);
Logger.error(e); Logger.error(e);
return SourceType.None; return SourceType.None;
@ -939,7 +945,7 @@ public class Enum {
} }
} }
public enum EffectSourceType{ public enum EffectSourceType {
None, None,
AttackSpeedBuff, AttackSpeedBuff,
Bleeding, Bleeding,
@ -998,14 +1004,14 @@ public class Enum {
WereformSPRecBuff, WereformSPRecBuff,
WereformStrBuff; WereformStrBuff;
public static EffectSourceType GetEffectSourceType(String modName){ public static EffectSourceType GetEffectSourceType(String modName) {
EffectSourceType returnMod; EffectSourceType returnMod;
if(modName.isEmpty()) if (modName.isEmpty())
return EffectSourceType.None; return EffectSourceType.None;
try{ try {
returnMod = EffectSourceType.valueOf(modName.replace(",", "")); returnMod = EffectSourceType.valueOf(modName.replace(",", ""));
}catch(Exception e){ } catch (Exception e) {
Logger.error(e); Logger.error(e);
return EffectSourceType.None; return EffectSourceType.None;
} }
@ -1120,14 +1126,15 @@ public class Enum {
Track, Track,
Transform, Transform,
WeaponMove; WeaponMove;
public static StackType GetStackType(String modName){
public static StackType GetStackType(String modName) {
StackType stackType; StackType stackType;
if (modName.isEmpty()) if (modName.isEmpty())
return StackType.None; return StackType.None;
try{ try {
stackType = StackType.valueOf(modName.replace(",", "")); stackType = StackType.valueOf(modName.replace(",", ""));
}catch(Exception e){ } catch (Exception e) {
Logger.error(modName); Logger.error(modName);
Logger.error(e); Logger.error(e);
return StackType.None; return StackType.None;
@ -1206,20 +1213,21 @@ public class Enum {
WeaponRange, WeaponRange,
WeaponSpeed; WeaponSpeed;
public static ModType GetModType(String modName){ public static ModType GetModType(String modName) {
ModType modType; ModType modType;
if (modName.isEmpty()) if (modName.isEmpty())
return ModType.None; return ModType.None;
try{ try {
modType = ModType.valueOf(modName.replace(",", "")); modType = ModType.valueOf(modName.replace(",", ""));
}catch(Exception e){ } catch (Exception e) {
Logger.error(e); Logger.error(e);
return ModType.None; return ModType.None;
} }
return modType; return modType;
} }
} }
public enum MovementState { public enum MovementState {
IDLE, IDLE,
@ -1355,18 +1363,28 @@ public class Enum {
this.reqLvl = reqLvl; this.reqLvl = reqLvl;
} }
public long getFlag() { public static CharacterSkills GetCharacterSkillByToken(int token) {
return flag; for (CharacterSkills skill : CharacterSkills.values()) {
if (skill.token == token)
return skill;
} }
public int getReqLvl() { Logger.info("Returned No Skill for token " + token + ". Defaulting to Axe");
return this.reqLvl; return CharacterSkills.Axe;
}
public long getFlag() {
return flag;
} }
public void setFlag(long flag) { public void setFlag(long flag) {
this.flag = flag; this.flag = flag;
} }
public int getReqLvl() {
return this.reqLvl;
}
public int getToken() { public int getToken() {
return token; return token;
} }
@ -1374,16 +1392,6 @@ public class Enum {
public void setToken(int token) { public void setToken(int token) {
this.token = token; this.token = token;
} }
public static CharacterSkills GetCharacterSkillByToken(int token) {
for (CharacterSkills skill : CharacterSkills.values()) {
if (skill.token == token)
return skill;
}
Logger.info("Returned No Skill for token " + token + ". Defaulting to Axe");
return CharacterSkills.Axe;
}
} }
; ;
@ -1440,7 +1448,8 @@ public class Enum {
Warrior(SexType.NONE), Warrior(SexType.NONE),
Wizard(SexType.NONE), Wizard(SexType.NONE),
Nightstalker(SexType.NONE), Nightstalker(SexType.NONE),
Necromancer(SexType.NONE),; Necromancer(SexType.NONE),
;
private SexType sexRestriction; private SexType sexRestriction;
@ -1566,7 +1575,7 @@ public class Enum {
// building slot mechanics. // building slot mechanics.
public enum BuildingGroup implements EnumBitSetHelper<BuildingGroup> { public enum BuildingGroup implements EnumBitSetHelper<BuildingGroup> {
NONE(0,0), NONE(0, 0),
TOL(64f, 64f), TOL(64f, 64f),
BARRACK(32f, 64f), BARRACK(32f, 64f),
CHURCH(64f, 64f), CHURCH(64f, 64f),
@ -1604,7 +1613,7 @@ public class Enum {
FORTRESS(64f, 64f), FORTRESS(64f, 64f),
CITADEL(64f, 64f), CITADEL(64f, 64f),
WALLSTRAIGHTTOWER(16f, 64), WALLSTRAIGHTTOWER(16f, 64),
WALLSTAIRS(64,64); WALLSTAIRS(64, 64);
private final Vector2f extents; private final Vector2f extents;
@ -1618,7 +1627,7 @@ public class Enum {
} }
public enum UpdateType{ public enum UpdateType {
ALL, ALL,
MOVEMENT, MOVEMENT,
REGEN, REGEN,
@ -1627,7 +1636,7 @@ public class Enum {
MOVEMENTSTATE; MOVEMENTSTATE;
} }
public enum ServerType{ public enum ServerType {
WORLDSERVER, WORLDSERVER,
LOGINSERVER, LOGINSERVER,
NONE; NONE;
@ -2133,7 +2142,7 @@ public class Enum {
} }
} }
public enum PowerFailCondition{ public enum PowerFailCondition {
Attack, Attack,
AttackSwing, AttackSwing,
@ -2149,7 +2158,7 @@ public class Enum {
UnEquip; UnEquip;
} }
public enum PowerSubType{ public enum PowerSubType {
Amount, Amount,
Ramp, Ramp,
UseAddFormula, UseAddFormula,
@ -2281,9 +2290,9 @@ public class Enum {
} }
public enum GuildType { public enum GuildType {
NONE("None", new String[][] {{"None"}}, new String[] {"Thearchy", "Common Rule", "Theocracy", "Republic Rule"}), NONE("None", new String[][]{{"None"}}, new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"}),
CATHEDRAL("Church of the All-Father", new String[][]{ CATHEDRAL("Church of the All-Father", new String[][]{
{"Acolyte","Acolyte"}, {"Acolyte", "Acolyte"},
{"Catechist"}, {"Catechist"},
{"Deacon", "Deaconess"}, {"Deacon", "Deaconess"},
{"Priest", "Priestess"}, {"Priest", "Priestess"},
@ -2291,8 +2300,8 @@ public class Enum {
{"Bishop", "Bishop"}, {"Bishop", "Bishop"},
{"Lord Cardinal", "Lady Cardinal"}, {"Lord Cardinal", "Lady Cardinal"},
{"Patriarch", "Matriarch"}}, {"Patriarch", "Matriarch"}},
new String[] {"Thearchy", "Common Rule", "Theocracy", "Republic Rule"}), new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"}),
MILITARY("Military", new String[][] { MILITARY("Military", new String[][]{
{"Recruit"}, {"Recruit"},
{"Footman"}, {"Footman"},
{"Corporal"}, {"Corporal"},
@ -2300,7 +2309,7 @@ public class Enum {
{"Lieutenant"}, {"Lieutenant"},
{"Captain"}, {"Captain"},
{"General"}, {"General"},
{"Lord Marshall","Lady Marshall"}}, {"Lord Marshall", "Lady Marshall"}},
new String[]{"Autocracy", "Common Rule", "Council Rule", "Militocracy"}), new String[]{"Autocracy", "Common Rule", "Council Rule", "Militocracy"}),
TEMPLE("Temple of the Cleansing Flame", new String[][]{ TEMPLE("Temple of the Cleansing Flame", new String[][]{
{"Aspirant"}, {"Aspirant"},
@ -2311,9 +2320,9 @@ public class Enum {
{"Tribune"}, {"Tribune"},
{"Lictor"}, {"Lictor"},
{"Justiciar"}, {"Justiciar"},
{"Pontifex","Pontifectrix"}}, {"Pontifex", "Pontifectrix"}},
new String[] {"Despot Rule", "Common Rule", "Protectorship", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Protectorship", "Republic Rule"}),
BARBARIAN("Barbarian Clan", new String[][] { BARBARIAN("Barbarian Clan", new String[][]{
{"Barbarian"}, {"Barbarian"},
{"Skald"}, {"Skald"},
{"Raider"}, {"Raider"},
@ -2322,24 +2331,24 @@ public class Enum {
{"Chieftain"}, {"Chieftain"},
{"Thane"}}, {"Thane"}},
new String[]{"Chiefdom", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Chiefdom", "Common Rule", "Council Rule", "Republic Rule"}),
RANGER("Ranger's Brotherhood", new String[][] { RANGER("Ranger's Brotherhood", new String[][]{
{"Yeoman"}, {"Yeoman"},
{"Pathfinder"}, {"Pathfinder"},
{"Tracker"}, {"Tracker"},
{"Seeker"}, {"Seeker"},
{"Protector"}, {"Protector"},
{"Guardian"}, {"Guardian"},
{"Lord Protector","Lady Protector"}}, {"Lord Protector", "Lady Protector"}},
new String[]{"Despot Rule", "Collectivism","Council Rule","Republic Rule"}), new String[]{"Despot Rule", "Collectivism", "Council Rule", "Republic Rule"}),
AMAZON("Amazon Temple", new String[][] { AMAZON("Amazon Temple", new String[][]{
{"Amazon Thrall", "Amazon"}, {"Amazon Thrall", "Amazon"},
{"Amazon Slave", "Amazon Warrior"}, {"Amazon Slave", "Amazon Warrior"},
{"Amazon Servant", "Amazon Chieftess"}, {"Amazon Servant", "Amazon Chieftess"},
{"Amazon Consort", "Amazon Princess"}, {"Amazon Consort", "Amazon Princess"},
{"Amazon Seneschal", "Majestrix"}, {"Amazon Seneschal", "Majestrix"},
{"Amazon Regent", "Imperatrix"}}, {"Amazon Regent", "Imperatrix"}},
new String[] {"Despot Rule", "Common Rule", "Gynarchy", "Gynocracy"}), new String[]{"Despot Rule", "Common Rule", "Gynarchy", "Gynocracy"}),
NOBLE("Noble House", new String[][] { NOBLE("Noble House", new String[][]{
{"Serf"}, {"Serf"},
{"Vassal"}, {"Vassal"},
{"Exultant"}, {"Exultant"},
@ -2349,8 +2358,8 @@ public class Enum {
{"Duke", "Duchess"}, {"Duke", "Duchess"},
{"King", "Queen"}, {"King", "Queen"},
{"Emperor", "Empress"}}, {"Emperor", "Empress"}},
new String[] {"Monarchy", "Common Rule", "Feodality", "Republic"}), new String[]{"Monarchy", "Common Rule", "Feodality", "Republic"}),
WIZARD("Wizard's Conclave", new String[][] { WIZARD("Wizard's Conclave", new String[][]{
{"Apprentice"}, {"Apprentice"},
{"Neophyte"}, {"Neophyte"},
{"Adeptus Minor"}, {"Adeptus Minor"},
@ -2358,8 +2367,8 @@ public class Enum {
{"Magus"}, {"Magus"},
{"High Magus"}, {"High Magus"},
{"Archmagus"}}, {"Archmagus"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Magocracy"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Magocracy"}),
MERCENARY("Mercenary Company", new String[][] { MERCENARY("Mercenary Company", new String[][]{
{"Soldier"}, {"Soldier"},
{"Man-at-Arms"}, {"Man-at-Arms"},
{"Veteran"}, {"Veteran"},
@ -2368,8 +2377,8 @@ public class Enum {
{"Commander"}, {"Commander"},
{"High Commander"}, {"High Commander"},
{"Warlord"}}, {"Warlord"}},
new String[] {"Magistrature", "Mob Law", "Council Rule", "Republic Rule"}), new String[]{"Magistrature", "Mob Law", "Council Rule", "Republic Rule"}),
THIEVES("Thieve's Den", new String[][] { THIEVES("Thieve's Den", new String[][]{
{"Urchin"}, {"Urchin"},
{"Footpad"}, {"Footpad"},
{"Grifter"}, {"Grifter"},
@ -2379,16 +2388,16 @@ public class Enum {
{"Treasurer"}, {"Treasurer"},
{"Grandmaster Thief"}, {"Grandmaster Thief"},
{"Grandfather"}}, {"Grandfather"}},
new String[] {"Despot Rule", "Common Rule", "Oligarchy", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Oligarchy", "Republic Rule"}),
DWARF("Dwarf Hold", new String[][] { DWARF("Dwarf Hold", new String[][]{
{"Citizen"}, {"Citizen"},
{"Master"}, {"Master"},
{"Councilor"}, {"Councilor"},
{"Thane"}, {"Thane"},
{"Great Thane"}, {"Great Thane"},
{"High Thane"}}, {"High Thane"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
HIGHCOURT("High Court", new String[][] { HIGHCOURT("High Court", new String[][]{
{"Eccekebe"}, {"Eccekebe"},
{"Saedulor"}, {"Saedulor"},
{"Hodrimarth"}, {"Hodrimarth"},
@ -2398,8 +2407,8 @@ public class Enum {
{"Dar Thaelostor", "Dar Thaelostril"}, {"Dar Thaelostor", "Dar Thaelostril"},
{"Aglaeron"}, {"Aglaeron"},
{"Ellestor", "Elestril"}}, {"Ellestor", "Elestril"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
VIRAKT("Virakt", new String[][] { VIRAKT("Virakt", new String[][]{
{"Jov'uus"}, {"Jov'uus"},
{"Urikhan"}, {"Urikhan"},
{"Irkhan"}, {"Irkhan"},
@ -2408,8 +2417,8 @@ public class Enum {
{"Khal'uvho"}, {"Khal'uvho"},
{"Khar'uus"}, {"Khar'uus"},
{"Kryqh'khalin"}}, {"Kryqh'khalin"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
BRIALIA("Coven of Brialia", new String[][] { // Unknown Rank names BRIALIA("Coven of Brialia", new String[][]{ // Unknown Rank names
{"Devotee"}, {"Devotee"},
{"Initiated"}, {"Initiated"},
{"Witch of the First"}, {"Witch of the First"},
@ -2418,8 +2427,8 @@ public class Enum {
{"Elder"}, {"Elder"},
{"Hierophant"}, {"Hierophant"},
{"Witch King", "Witch Queen"}}, {"Witch King", "Witch Queen"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
UNHOLY("Unholy Legion", new String[][] { // Unknown Rank names UNHOLY("Unholy Legion", new String[][]{ // Unknown Rank names
{"Footman"}, {"Footman"},
{"Fell Legionaire"}, {"Fell Legionaire"},
{"Fell Centurion"}, {"Fell Centurion"},
@ -2428,23 +2437,23 @@ public class Enum {
{"Dark Master", "Dark Mistress"}, {"Dark Master", "Dark Mistress"},
{"Dread Master", "Dread Mistress"}, {"Dread Master", "Dread Mistress"},
{"Dread Lord", "Dread Lady"}}, {"Dread Lord", "Dread Lady"}},
new String[] {"Despot Rule", "Despot Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Despot Rule", "Council Rule", "Republic Rule"}),
SCOURGE("Cult of the Scourge", new String[][] { SCOURGE("Cult of the Scourge", new String[][]{
{"Thrall"}, {"Thrall"},
{"Mudir"}, {"Mudir"},
{"Dark Brother", "Dark Sister"}, {"Dark Brother", "Dark Sister"},
{"Hand of the Dark"}, {"Hand of the Dark"},
{"Dark Father", "Dark Mother"}}, {"Dark Father", "Dark Mother"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
PIRATE("Pirate Crew", new String[][] { PIRATE("Pirate Crew", new String[][]{
{"Midshipman", "Midshipwoman"}, {"Midshipman", "Midshipwoman"},
{"Sailor"}, {"Sailor"},
{"Third Mat"}, {"Third Mat"},
{"Second Mat"}, {"Second Mat"},
{"First Mate"}, {"First Mate"},
{"Captain"}}, {"Captain"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
HERALD("Academy of Heralds", new String[][] { HERALD("Academy of Heralds", new String[][]{
{"Pupil"}, {"Pupil"},
{"Scribe"}, {"Scribe"},
{"Recorder"}, {"Recorder"},
@ -2454,7 +2463,7 @@ public class Enum {
{"Archivist"}, {"Archivist"},
{"Loremaster"}}, {"Loremaster"}},
new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
CENTAUR("Centaur Cohort", new String[][] { CENTAUR("Centaur Cohort", new String[][]{
{"Hoplite"}, {"Hoplite"},
{"Peltast"}, {"Peltast"},
{"Myrmidon"}, {"Myrmidon"},
@ -2463,8 +2472,8 @@ public class Enum {
{"Septenrion"}, {"Septenrion"},
{"Praetorian"}, {"Praetorian"},
{"Paragon"}}, {"Paragon"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}), new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
KHREE("Aracoix Kh'ree", new String[][] { KHREE("Aracoix Kh'ree", new String[][]{
{"Duriacor"}, {"Duriacor"},
{"Exarch"}, {"Exarch"},
{"Tetrarch"}, {"Tetrarch"},
@ -2476,39 +2485,16 @@ public class Enum {
{"Araceos"}, {"Araceos"},
{"Hierarch"}}, {"Hierarch"}},
new String[] {"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}); new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"});
GuildType(String name, String[][] ranks, String[] leadershipTypes) {
this.name = name;
this.ranks = ranks;
this.leadershipTypes = leadershipTypes;
}
private final String name; private final String name;
private final String[][] ranks; //Stored Rank#->Gender(M,F) private final String[][] ranks; //Stored Rank#->Gender(M,F)
private final String[] leadershipTypes; private final String[] leadershipTypes;
public String getCharterName() { GuildType(String name, String[][] ranks, String[] leadershipTypes) {
return this.name; this.name = name;
} this.ranks = ranks;
this.leadershipTypes = leadershipTypes;
public int getNumberOfRanks() {
return ranks.length;
}
public String getRankForGender(int rank, boolean male) {
if(ranks.length < rank) {
return "";
}
if(ranks[rank].length != 1 && !male) {
return ranks[rank][1];
}
return ranks[rank][0];
}
public String getLeadershipType(int i) {
return leadershipTypes[i];
} }
public static GuildType getGuildTypeFromCharter(ItemBase itemBase) { public static GuildType getGuildTypeFromCharter(ItemBase itemBase) {
@ -2517,7 +2503,7 @@ public class Enum {
// Must be a valid charter object // Must be a valid charter object
if(itemBase.getType().equals(ItemType.GUILDCHARTER) == false) if (itemBase.getType().equals(ItemType.GUILDCHARTER) == false)
return GuildType.NONE; //No guild Type return GuildType.NONE; //No guild Type
// No switches on long in java. Cast to int // No switches on long in java. Cast to int
@ -2595,6 +2581,29 @@ public class Enum {
return GuildType.values()[i]; return GuildType.values()[i];
} }
public String getCharterName() {
return this.name;
}
public int getNumberOfRanks() {
return ranks.length;
}
public String getRankForGender(int rank, boolean male) {
if (ranks.length < rank) {
return "";
}
if (ranks[rank].length != 1 && !male) {
return ranks[rank][1];
}
return ranks[rank][0];
}
public String getLeadershipType(int i) {
return leadershipTypes[i];
}
} }
public enum MinionClass { public enum MinionClass {
@ -2604,49 +2613,48 @@ public class Enum {
} }
public enum MinionType { public enum MinionType {
AELFBORNGUARD(951,1637, MinionClass.MELEE, "Guard","Aelfborn"), AELFBORNGUARD(951, 1637, MinionClass.MELEE, "Guard", "Aelfborn"),
AELFBORNMAGE(952, 1635, MinionClass.MAGE,"Adept","Aelfborn"), AELFBORNMAGE(952, 1635, MinionClass.MAGE, "Adept", "Aelfborn"),
AMAZONGUARD(1500,1670, MinionClass.MELEE,"Guard","Amazon"), AMAZONGUARD(1500, 1670, MinionClass.MELEE, "Guard", "Amazon"),
AMAZONMAGE(1502, 1638, MinionClass.MAGE,"Fury","Amazon"), AMAZONMAGE(1502, 1638, MinionClass.MAGE, "Fury", "Amazon"),
ARACOIXGUARD(1600,1672,MinionClass.MELEE, "Guard","Aracoix"), //used guard captain equipset. ARACOIXGUARD(1600, 1672, MinionClass.MELEE, "Guard", "Aracoix"), //used guard captain equipset.
ARACOIXMAGE(1602,885,MinionClass.MAGE,"Adept","Aracoix"), ARACOIXMAGE(1602, 885, MinionClass.MAGE, "Adept", "Aracoix"),
CENTAURGUARD(1650,1642, MinionClass.MELEE,"Guard","Centaur"), CENTAURGUARD(1650, 1642, MinionClass.MELEE, "Guard", "Centaur"),
CENTAURMAGE(1652, 1640, MinionClass.MAGE,"Druid","Centaur"), CENTAURMAGE(1652, 1640, MinionClass.MAGE, "Druid", "Centaur"),
DWARVENARCHER(845,1644, MinionClass.ARCHER, "Marksman","Dwarven"), DWARVENARCHER(845, 1644, MinionClass.ARCHER, "Marksman", "Dwarven"),
DWARVENGUARD(1050,1666, MinionClass.MELEE,"Guard","Dwarven"), DWARVENGUARD(1050, 1666, MinionClass.MELEE, "Guard", "Dwarven"),
DWARVENMAGE(1052, 1643, MinionClass.MAGE,"War Priest","Dwarven"), DWARVENMAGE(1052, 1643, MinionClass.MAGE, "War Priest", "Dwarven"),
ELFGUARD(1180,1671, MinionClass.MELEE,"Guard","Elven"), //old 1645 ELFGUARD(1180, 1671, MinionClass.MELEE, "Guard", "Elven"), //old 1645
ELFMAGE(1182, 1667, MinionClass.MAGE,"Adept","Elven"), ELFMAGE(1182, 1667, MinionClass.MAGE, "Adept", "Elven"),
FORESTGUARD(1550,1668, MinionClass.MELEE,"Guard","Forest"), //captain changed to guard equipset FORESTGUARD(1550, 1668, MinionClass.MELEE, "Guard", "Forest"), //captain changed to guard equipset
FORESTMAGE(1552, 436, MinionClass.MAGE,"Adept","Forest"), FORESTMAGE(1552, 436, MinionClass.MAGE, "Adept", "Forest"),
HOLYGUARD(1525,1658, MinionClass.MELEE,"Guard","Holy Church"), HOLYGUARD(1525, 1658, MinionClass.MELEE, "Guard", "Holy Church"),
HOLYMAGE(1527, 1646, MinionClass.MAGE,"Prelate","Holy Church"), HOLYMAGE(1527, 1646, MinionClass.MAGE, "Prelate", "Holy Church"),
HUMANARCHER(846,1654,MinionClass.ARCHER, "Archer","Human"), HUMANARCHER(846, 1654, MinionClass.ARCHER, "Archer", "Human"),
HUMANGUARD(840,1665, MinionClass.MELEE, "Guard","Human"), HUMANGUARD(840, 1665, MinionClass.MELEE, "Guard", "Human"),
HUMANMAGE(848, 1655, MinionClass.MAGE,"Adept","Human"), HUMANMAGE(848, 1655, MinionClass.MAGE, "Adept", "Human"),
IREKEIGUARD(1350,1659, MinionClass.MELEE,"Guard","Irekei"), IREKEIGUARD(1350, 1659, MinionClass.MELEE, "Guard", "Irekei"),
IREKEIMAGE(1352, 1660, MinionClass.MAGE,"Adept","Irekei"), IREKEIMAGE(1352, 1660, MinionClass.MAGE, "Adept", "Irekei"),
MINOTAURARCHER(1701,0,MinionClass.ARCHER,"Archer","Minotaur"), MINOTAURARCHER(1701, 0, MinionClass.ARCHER, "Archer", "Minotaur"),
MINOTAURGUARD(1700,1673,MinionClass.MELEE,"Guard","Minotaur"), MINOTAURGUARD(1700, 1673, MinionClass.MELEE, "Guard", "Minotaur"),
NORTHMANGUARD(1250,1669, MinionClass.MELEE,"Guard","Northman"), NORTHMANGUARD(1250, 1669, MinionClass.MELEE, "Guard", "Northman"),
NORTHMANMAGE(1252, 1650, MinionClass.MAGE,"Runecaster","Northman"), NORTHMANMAGE(1252, 1650, MinionClass.MAGE, "Runecaster", "Northman"),
SHADEGUARD(1450,1662, MinionClass.MELEE,"Guard","Shade"), SHADEGUARD(1450, 1662, MinionClass.MELEE, "Guard", "Shade"),
SHADEMAGE(1452, 1664, MinionClass.MAGE,"Adept","Shade"), SHADEMAGE(1452, 1664, MinionClass.MAGE, "Adept", "Shade"),
TEMPLARGUARD(841,1564,MinionClass.MELEE,"Marksman","Templar"), TEMPLARGUARD(841, 1564, MinionClass.MELEE, "Marksman", "Templar"),
TEMPLEGUARD(1575,1652, MinionClass.MELEE,"Guard","Temple"), TEMPLEGUARD(1575, 1652, MinionClass.MELEE, "Guard", "Temple"),
TEMPLEMAGE(1577, 1656, MinionClass.MAGE,"Confessor","Temple"), TEMPLEMAGE(1577, 1656, MinionClass.MAGE, "Confessor", "Temple"),
UNDEADGUARD(980100,1674,MinionClass.MELEE,"Guard","Undead"), UNDEADGUARD(980100, 1674, MinionClass.MELEE, "Guard", "Undead"),
UNDEADMAGE(980102,1675,MinionClass.MAGE,"Adept","Undead"), UNDEADMAGE(980102, 1675, MinionClass.MAGE, "Adept", "Undead"),
WEREWOLFGUARD(980104,0,MinionClass.MELEE,"Guard","Werewolf"), WEREWOLFGUARD(980104, 0, MinionClass.MELEE, "Guard", "Werewolf"),
WEREBEARGUARD(980103,0,MinionClass.MELEE,"Guard","Werebear"); WEREBEARGUARD(980103, 0, MinionClass.MELEE, "Guard", "Werebear");
public static HashMap<Integer, MinionType> ContractToMinionMap = new HashMap<>();
private final int captainContractID; private final int captainContractID;
private final int equipSetID; private final int equipSetID;
private final MinionClass minionClass; private final MinionClass minionClass;
private final String name; private final String name;
private final String race; private final String race;
public static HashMap<Integer,MinionType> ContractToMinionMap = new HashMap<>();
MinionType(int captainContractID, int equipSetID, MinionClass minionClass, String name, String race) { MinionType(int captainContractID, int equipSetID, MinionClass minionClass, String name, String race) {
this.captainContractID = captainContractID; this.captainContractID = captainContractID;
@ -2657,24 +2665,12 @@ public class Enum {
} }
public static void InitializeMinions(){ public static void InitializeMinions() {
for (MinionType minionType :MinionType.values()) for (MinionType minionType : MinionType.values())
ContractToMinionMap.put(minionType.captainContractID, minionType); ContractToMinionMap.put(minionType.captainContractID, minionType);
} }
public int getCaptainContractID() {
return captainContractID;
}
public int getEquipSetID() {
return equipSetID;
}
public MinionClass getMinionClass() {
return minionClass;
}
public String getName() { public String getName() {
return name; return name;
} }
@ -2685,7 +2681,7 @@ public class Enum {
} }
public enum GridObjectType{ public enum GridObjectType {
STATIC, STATIC,
DYNAMIC; DYNAMIC;
} }
@ -2699,17 +2695,17 @@ public class Enum {
ACCEPTTAX(7), ACCEPTTAX(7),
CONFIRMPROTECT(8); CONFIRMPROTECT(8);
private final int type;
public static HashMap<Integer, SupportMsgType> typeLookup = new HashMap<>(); public static HashMap<Integer, SupportMsgType> typeLookup = new HashMap<>();
private final int type;
SupportMsgType(int messageType) { SupportMsgType(int messageType) {
this.type = messageType; this.type = messageType;
} }
public static void InitializeSupportMsgType(){ public static void InitializeSupportMsgType() {
for (SupportMsgType supportMsgType :SupportMsgType.values()) for (SupportMsgType supportMsgType : SupportMsgType.values())
typeLookup.put(supportMsgType.type, supportMsgType); typeLookup.put(supportMsgType.type, supportMsgType);
} }
} }
@ -2747,9 +2743,9 @@ public class Enum {
this.itemID = itemID; this.itemID = itemID;
} }
public static void InitializeResourceTypes(){ public static void InitializeResourceTypes() {
for (ResourceType resourceType :ResourceType.values()) for (ResourceType resourceType : ResourceType.values())
resourceLookup.put(resourceType.itemID, resourceType); resourceLookup.put(resourceType.itemID, resourceType);
} }
} }

11
src/engine/ai/MobileFSMManager.java
Unescape View File

@ -47,10 +47,15 @@ public class MobileFSMManager {
}; };
alive = true; alive = true;
//assign the AI varibales base don difficulty scaling from config file: //assign the AI varibales base don difficulty scaling from config file:
float difficulty = Float.parseFloat(ConfigManager.MB_MOB_DIFFICULTY.getValue());
AI_BASE_AGGRO_RANGE = (int)(100 * difficulty); // range at which aggressive mobs will attack you float difficulty = Float.parseFloat(ConfigManager.MB_AI_AGGRO_RANGE.getValue());
AI_POWER_DIVISOR = (int)(20 * (1.5f-difficulty)); //duration between mob casts AI_BASE_AGGRO_RANGE = (int) (100 * difficulty); // range at which aggressive mobs will attack you
difficulty = Float.parseFloat(ConfigManager.MB_AI_CAST_FREQUENCY.getValue());
AI_POWER_DIVISOR = (int) (20 * (1.5f - difficulty)); //duration between mob casts
Thread t = new Thread(worker, "MobileFSMManager"); Thread t = new Thread(worker, "MobileFSMManager");
t.start(); t.start();
} }

9
src/engine/gameManager/ConfigManager.java
Unescape View File

@ -61,6 +61,11 @@ public enum ConfigManager {
MB_WORLD_MAINTENANCE, MB_WORLD_MAINTENANCE,
MB_WORLD_GREETING, MB_WORLD_GREETING,
MB_WORLD_KEYCLONE_MAX, MB_WORLD_KEYCLONE_MAX,
MB_USE_RUINS,
// Mobile AI modifiers
MB_AI_CAST_FREQUENCY,
MB_AI_AGGRO_RANGE,
//drop rates //drop rates
MB_NORMAL_EXP_RATE, MB_NORMAL_EXP_RATE,
@ -86,9 +91,7 @@ public enum ConfigManager {
MB_MAGICBOT_FORTOFIX, MB_MAGICBOT_FORTOFIX,
MB_MAGICBOT_RECRUIT, MB_MAGICBOT_RECRUIT,
MB_MAGICBOT_MAGICBOX, MB_MAGICBOT_MAGICBOX,
MB_MAGICBOT_ADMINLOG, MB_MAGICBOT_ADMINLOG;
MB_MOB_DIFFICULTY;//0.1(easy) - 1.0(hard)
// Map to hold our config pulled in from the environment // Map to hold our config pulled in from the environment
// We also use the config to point to the current message pump // We also use the config to point to the current message pump

5
src/engine/gameManager/ZoneManager.java
Unescape View File

@ -103,7 +103,6 @@ public enum ZoneManager {
ZoneManager.zonesByID.put(zoneID, zone); ZoneManager.zonesByID.put(zoneID, zone);
if (zone != null)
ZoneManager.zonesByUUID.put(zone.getObjectUUID(), zone); ZoneManager.zonesByUUID.put(zone.getObjectUUID(), zone);
ZoneManager.zonesByName.put(zone.getName().toLowerCase(), zone); ZoneManager.zonesByName.put(zone.getName().toLowerCase(), zone);
@ -144,6 +143,10 @@ public enum ZoneManager {
return ZoneManager.zonesByID.get(zoneID); return ZoneManager.zonesByID.get(zoneID);
} }
public static Zone getZoneByName(final String zoneName) {
return ZoneManager.zonesByName.get(zoneName);
}
public static final Collection<Zone> getAllZones() { public static final Collection<Zone> getAllZones() {
return ZoneManager.zonesByUUID.values(); return ZoneManager.zonesByUUID.values();
} }

3
src/engine/objects/PlayerCharacter.java
Unescape View File

@ -879,14 +879,11 @@ public class PlayerCharacter extends AbstractCharacter {
//handle rented room binds. //handle rented room binds.
if (bindBuilding == null){ if (bindBuilding == null){
bindLocation = Enum.Ruins.getRandomRuin().getLocation(); bindLocation = Enum.Ruins.getRandomRuin().getLocation();
return bindLocation; return bindLocation;
} }
bindLocation = BuildingManager.GetBindLocationForBuilding(bindBuilding); bindLocation = BuildingManager.GetBindLocationForBuilding(bindBuilding);
if (bindLocation == null) if (bindLocation == null)

Write Preview
Loading…
Cancel
Save