BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Renamed class to not conflict with the java.lang version.

Browse Source
This commit is contained in:
MagicBot
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/powers/ActionsBase.java
+3 -3
View File
@@ -9,11 +9,11 @@
package engine.powers;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.Enum.StackType;
import engine.gameManager.DbManager;
import engine.gameManager.PowersManager;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.mbEnums.StackType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.objects.PlayerBonuses;
src/engine/powers/DamageShield.java
+4 -4
View File
@@ -9,22 +9,22 @@
package engine.powers;
import engine.Enum;
import engine.mbEnums;
public class DamageShield {
private final Enum.DamageType damageType;
private final mbEnums.DamageType damageType;
private final float amount;
private final boolean usePercent;
public DamageShield(Enum.DamageType damageType, float amount, boolean usePercent) {
public DamageShield(mbEnums.DamageType damageType, float amount, boolean usePercent) {
super();
this.damageType = damageType;
this.amount = amount;
this.usePercent = usePercent;
}
public Enum.DamageType getDamageType() {
public mbEnums.DamageType getDamageType() {
return this.damageType;
}
src/engine/powers/EffectsBase.java
+16 -16
View File
@@ -9,10 +9,10 @@
package engine.powers;
import engine.Enum;
import engine.Enum.EffectSourceType;
import engine.Enum.GameObjectType;
import engine.Enum.PowerFailCondition;
import engine.mbEnums;
import engine.mbEnums.EffectSourceType;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.PowerFailCondition;
import engine.gameManager.DbManager;
import engine.gameManager.PowersManager;
import engine.job.JobContainer;
@@ -46,7 +46,7 @@ public class EffectsBase {
public static HashMap<String, HashMap<String, ArrayList<String>>> NewEffectsMap = new HashMap<>();
public static HashMap<String, HashMap<String, ArrayList<String>>> ChangedEffectsMap = new HashMap<>();
public static HashMap<String, HashSet<PowerFailCondition>> EffectFailConditions = new HashMap<>();
public static HashMap<Integer, HashSet<Enum.DamageType>> EffectDamageTypes = new HashMap<>();
public static HashMap<Integer, HashSet<mbEnums.DamageType>> EffectDamageTypes = new HashMap<>();
public static HashSet<AbstractEffectModifier> DefaultModifiers = new HashSet<>();
private static ConcurrentHashMap<String, String> itemEffectsByName = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
private static int NewID = 3000;
@@ -78,7 +78,7 @@ public class EffectsBase {
private boolean isSuffix = false; //used by items
private String name = "";
private float value = 0;
private ConcurrentHashMap<Enum.ResourceType, Integer> resourceCosts = new ConcurrentHashMap<>();
private ConcurrentHashMap<mbEnums.ResourceType, Integer> resourceCosts = new ConcurrentHashMap<>();
private ConcurrentHashMap<String, Boolean> sourceTypes = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
/**
@@ -224,14 +224,14 @@ public class EffectsBase {
if (!EffectsBase.EffectDamageTypes.containsKey(eb.getToken()))
EffectsBase.EffectDamageTypes.put(eb.getToken(), new HashSet<>());
Enum.DamageType dt = Enum.DamageType.getDamageType(damageType1);
mbEnums.DamageType dt = mbEnums.DamageType.getDamageType(damageType1);
if (dt != null)
EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
dt = Enum.DamageType.getDamageType(damageType2);
dt = mbEnums.DamageType.getDamageType(damageType2);
if (dt != null)
EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
dt = Enum.DamageType.getDamageType(damageType3);
dt = mbEnums.DamageType.getDamageType(damageType3);
if (dt != null)
EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
break;
@@ -304,7 +304,7 @@ public class EffectsBase {
}
public boolean containsDamageType(Enum.DamageType dt) {
public boolean containsDamageType(mbEnums.DamageType dt) {
if (!EffectsBase.EffectDamageTypes.containsKey(this.token))
return false;
return EffectsBase.EffectDamageTypes.get(this.token).contains(dt);
@@ -525,7 +525,7 @@ public class EffectsBase {
if (source.getObjectType() == GameObjectType.PlayerCharacter) {
Dispatch dispatch = Dispatch.borrow((PlayerCharacter) source, pum);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
}
}
@@ -579,7 +579,7 @@ public class EffectsBase {
pum.setPowerUsedName(pb.getName());
Dispatch dispatch = Dispatch.borrow(conn.getPlayerCharacter(), pum);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
}
@@ -631,7 +631,7 @@ public class EffectsBase {
pum.setPowerUsedName(this.name);
Dispatch dispatch = Dispatch.borrow(conn.getPlayerCharacter(), pum);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
}
@@ -695,7 +695,7 @@ public class EffectsBase {
String text = "";
if (!EffectsBase.EffectDamageTypes.containsKey(this.token))
return text;
for (Enum.DamageType type : EffectsBase.EffectDamageTypes.get(this.token)) {
for (mbEnums.DamageType type : EffectsBase.EffectDamageTypes.get(this.token)) {
text += type.name() + ' ';
}
return text;
@@ -718,11 +718,11 @@ public class EffectsBase {
this.value = Value;
}
public ConcurrentHashMap<Enum.ResourceType, Integer> getResourcesForEffect() {
public ConcurrentHashMap<mbEnums.ResourceType, Integer> getResourcesForEffect() {
if (this.resourceCosts.isEmpty()) {
ArrayList<EffectsResourceCosts> effectsCostList = DbManager.EffectsResourceCostsQueries.GET_ALL_EFFECT_RESOURCES(this.IDString);
for (EffectsResourceCosts erc : effectsCostList) {
this.resourceCosts.put(Enum.ResourceType.resourceLookup.get(erc.getResourceID()), erc.getAmount());
this.resourceCosts.put(mbEnums.ResourceType.resourceLookup.get(erc.getResourceID()), erc.getAmount());
}
}
return this.resourceCosts;
src/engine/powers/PowersBase.java
+2 -2
View File
@@ -9,8 +9,8 @@
package engine.powers;
import engine.Enum.PowerCategoryType;
import engine.Enum.PowerTargetType;
import engine.mbEnums.PowerCategoryType;
import engine.mbEnums.PowerTargetType;
import org.pmw.tinylog.Logger;
import java.sql.ResultSet;
src/engine/powers/RangeBasedAwo.java
+4 -4
View File
@@ -9,9 +9,9 @@
package engine.powers;
import engine.Enum;
import engine.Enum.GameObjectType;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.objects.PlayerCharacter;
@@ -52,12 +52,12 @@ public class RangeBasedAwo implements Comparable<RangeBasedAwo> {
return awolist;
AbstractWorldObject awo = rba.awo;
if (awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (awo.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
if (playerCnt < maxPlayers) {
awolist.add(awo);
playerCnt++;
}
} else if (awo.getObjectType().equals(Enum.GameObjectType.Mob)) {
} else if (awo.getObjectType().equals(mbEnums.GameObjectType.Mob)) {
if (mobCnt < maxMobs) {
awolist.add(awo);
mobCnt++;
src/engine/powers/effectmodifiers/AbstractEffectModifier.java
+2 -2
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.objects.Building;
src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java
+2 -2
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.objects.*;
import java.sql.ResultSet;
src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java
+2 -2
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.objects.*;
import org.pmw.tinylog.Logger;
src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.powers.effectmodifiers;
import engine.Enum.ModType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.ModType;
import engine.objects.*;
import java.sql.ResultSet;
src/engine/powers/effectmodifiers/CannotCastEffectModifier.java
+2 -2
View File
@@ -9,8 +9,8 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums;
import engine.objects.*;
import java.sql.ResultSet;
@@ -31,7 +31,7 @@ public class CannotCastEffectModifier extends AbstractEffectModifier {
@Override
public void applyBonus(AbstractCharacter ac, int trains) {
if (ac.getObjectType().equals(Enum.GameObjectType.Mob)) {
if (ac.getObjectType().equals(mbEnums.GameObjectType.Mob)) {
Mob mob = (Mob) ac;
}
src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java
+2 -2
View File
@@ -9,8 +9,8 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums;
import engine.objects.*;
import engine.powers.DamageShield;
@@ -49,7 +49,7 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
amount *= (1 + mod);
}
Enum.DamageType dt = Enum.DamageType.getDamageType(this.type);
mbEnums.DamageType dt = mbEnums.DamageType.getDamageType(this.type);
if (dt != null) {
src/engine/powers/effectmodifiers/HealthEffectModifier.java
+6 -6
View File
@@ -9,12 +9,12 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.Enum.GameObjectType;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.AbstractNetMsg;
import engine.net.DispatchMessage;
import engine.net.client.msg.ModifyHealthKillMsg;
@@ -28,13 +28,13 @@ import java.util.concurrent.ThreadLocalRandom;
public class HealthEffectModifier extends AbstractEffectModifier {
private Enum.DamageType damageType;
private mbEnums.DamageType damageType;
public HealthEffectModifier(ResultSet rs) throws SQLException {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = Enum.DamageType.getDamageType(damageTypeDB);
this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB);
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
src/engine/powers/effectmodifiers/InvisibleEffectModifier.java
+3 -3
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.gameManager.SessionManager;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums;
import engine.net.client.ClientConnection;
import engine.objects.*;
import engine.powers.ActionsBase;
@@ -30,7 +30,7 @@ public class InvisibleEffectModifier extends AbstractEffectModifier {
@Override
protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
if (awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (awo.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter pc = (PlayerCharacter) awo;
if (effect == null)
@@ -70,7 +70,7 @@ public class InvisibleEffectModifier extends AbstractEffectModifier {
bonus.updateIfHigher(this, (float) trains);
//remove pets
if (ac.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
if (ac.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter))
((PlayerCharacter) ac).dismissPet();
}
src/engine/powers/effectmodifiers/ManaEffectModifier.java
+7 -7
View File
@@ -9,11 +9,11 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.DispatchMessage;
import engine.net.client.msg.ModifyHealthMsg;
import engine.objects.*;
@@ -30,13 +30,13 @@ import java.util.concurrent.ThreadLocalRandom;
public class ManaEffectModifier extends AbstractEffectModifier {
private Enum.DamageType damageType;
private mbEnums.DamageType damageType;
public ManaEffectModifier(ResultSet rs) throws SQLException {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = Enum.DamageType.getDamageType(damageTypeDB);
this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB);
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
@@ -89,7 +89,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
max *= (1 + mod);
}
}
if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter pc = (PlayerCharacter) source;
float focus;
@@ -176,7 +176,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
if (AbstractWorldObject.IsAbstractCharacter(awo)) {
AbstractCharacter ac = (AbstractCharacter) awo;
resists = ac.getResists();
} else if (awo.getObjectType().equals(Enum.GameObjectType.Building))
} else if (awo.getObjectType().equals(mbEnums.GameObjectType.Building))
resists = ((Building) awo).getResists();
// calculate resists in if any
src/engine/powers/effectmodifiers/NoModEffectModifier.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.powers.effectmodifiers;
import engine.Enum.GameObjectType;
import engine.jobs.AbstractEffectJob;
import engine.mbEnums.GameObjectType;
import engine.objects.*;
import java.sql.ResultSet;
src/engine/powers/effectmodifiers/StaminaEffectModifier.java
+7 -7
View File
@@ -9,9 +9,9 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.net.DispatchMessage;
@@ -30,13 +30,13 @@ import java.util.concurrent.ThreadLocalRandom;
public class StaminaEffectModifier extends AbstractEffectModifier {
private Enum.DamageType damageType;
private mbEnums.DamageType damageType;
public StaminaEffectModifier(ResultSet rs) throws SQLException {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = Enum.DamageType.getDamageType(damageTypeDB);
this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB);
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
@@ -87,7 +87,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
max *= (1 + mod);
}
}
if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter pc = (PlayerCharacter) source;
float focus;
@@ -176,7 +176,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
if (AbstractWorldObject.IsAbstractCharacter(awo)) {
AbstractCharacter ac = (AbstractCharacter) awo;
resists = ac.getResists();
} else if (awo.getObjectType().equals(Enum.GameObjectType.Building))
} else if (awo.getObjectType().equals(mbEnums.GameObjectType.Building))
resists = ((Building) awo).getResists();
// calculate resists in if any
src/engine/powers/effectmodifiers/StunnedEffectModifier.java
+1 -1
View File
@@ -9,7 +9,7 @@
package engine.powers.effectmodifiers;
import engine.Enum.GameObjectType;
import engine.mbEnums.GameObjectType;
import engine.jobs.AbstractEffectJob;
import engine.objects.*;
src/engine/powers/poweractions/ApplyEffectPowerAction.java
+3 -3
View File
@@ -9,15 +9,15 @@
package engine.powers.poweractions;
import engine.Enum.GameObjectType;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.ChatManager;
import engine.jobs.ChantJob;
import engine.jobs.DeferredPowerJob;
import engine.jobs.FinishEffectTimeJob;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.DispatchMessage;
import engine.net.client.msg.chat.ChatSystemMsg;
import engine.objects.*;
src/engine/powers/poweractions/CharmPowerAction.java
+3 -3
View File
@@ -9,8 +9,8 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.net.client.ClientConnection;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
@@ -37,7 +37,7 @@ public class CharmPowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source == null || awo == null || !(awo.getObjectType().equals(Enum.GameObjectType.Mob)) || !(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
if (source == null || awo == null || !(awo.getObjectType().equals(mbEnums.GameObjectType.Mob)) || !(source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)))
return;
PlayerCharacter owner = (PlayerCharacter) source;
@@ -48,7 +48,7 @@ public class CharmPowerAction extends AbstractPowerAction {
//verify is mob, not pet or guard
Mob mob = (Mob) awo;
if (!(mob.agentType.equals(Enum.AIAgentType.MOBILE)))
if (!(mob.agentType.equals(mbEnums.AIAgentType.MOBILE)))
return;
//make sure mob isn't too high level
src/engine/powers/poweractions/ClaimMinePowerAction.java
+3 -3
View File
@@ -9,9 +9,9 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.gameManager.ChatManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.objects.*;
import engine.powers.ActionsBase;
import engine.powers.PowersBase;
@@ -32,12 +32,12 @@ public class ClaimMinePowerAction extends AbstractPowerAction {
if (source == null || worldObject == null)
return;
if (!(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
if (!(source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)))
return;
PlayerCharacter playerCharacter = (PlayerCharacter) source;
if (!(worldObject.getObjectType().equals(Enum.GameObjectType.Building)))
if (!(worldObject.getObjectType().equals(mbEnums.GameObjectType.Building)))
return;
Building mineBuilding = (Building) worldObject;
src/engine/powers/poweractions/ClearAggroPowerAction.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.powers.poweractions;
import engine.Enum.GameObjectType;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.objects.Mob;
src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.powers.poweractions;
import engine.Enum.GameObjectType;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.powers.ActionsBase;
src/engine/powers/poweractions/CreateMobPowerAction.java
+5 -5
View File
@@ -9,12 +9,12 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.DbManager;
import engine.gameManager.NPCManager;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -51,7 +51,7 @@ public class CreateMobPowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source == null || !(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
if (source == null || !(source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)))
return;
PlayerCharacter owner = (PlayerCharacter) source;
@@ -93,7 +93,7 @@ public class CreateMobPowerAction extends AbstractPowerAction {
}
} else if (currentPet != null && currentPet.isSiege()) {
currentPet.agentType = Enum.AIAgentType.MOBILE;
currentPet.agentType = mbEnums.AIAgentType.MOBILE;
currentPet.guardCaptain = null;
currentPet.setCombatTarget(null);
@@ -120,7 +120,7 @@ public class CreateMobPowerAction extends AbstractPowerAction {
//currentPet.disableIntelligence();
} else {
if (currentPet.isSiege()) {
currentPet.agentType = Enum.AIAgentType.MOBILE;
currentPet.agentType = mbEnums.AIAgentType.MOBILE;
currentPet.guardCaptain = null;
currentPet.setCombatTarget(null);
@@ -142,7 +142,7 @@ public class CreateMobPowerAction extends AbstractPowerAction {
pet.setHealth(pet.healthMax);
PetMsg pm = new PetMsg(5, pet);
Dispatch dispatch = Dispatch.borrow(owner, pm);
DispatchMessage.dispatchMsgDispatch(dispatch, engine.Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
@Override
src/engine/powers/poweractions/FearPowerAction.java
+3 -3
View File
@@ -9,7 +9,7 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.mbEnums;
import engine.job.JobScheduler;
import engine.jobs.EndFearJob;
import engine.math.Vector3fImmutable;
@@ -37,7 +37,7 @@ public class FearPowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source == null || awo == null || !(awo.getObjectType().equals(Enum.GameObjectType.Mob)) || !(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
if (source == null || awo == null || !(awo.getObjectType().equals(mbEnums.GameObjectType.Mob)) || !(source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)))
return;
PlayerCharacter owner = (PlayerCharacter) source;
@@ -47,7 +47,7 @@ public class FearPowerAction extends AbstractPowerAction {
//verify is mob, not pet or guard
Mob mob = (Mob) awo;
if (!(mob.agentType.equals(Enum.AIAgentType.MOBILE)))
if (!(mob.agentType.equals(mbEnums.AIAgentType.MOBILE)))
return;
//make sure mob isn't too high level
src/engine/powers/poweractions/MobRecallPowerAction.java
+1 -1
View File
@@ -9,9 +9,9 @@
package engine.powers.poweractions;
import engine.Enum.GameObjectType;
import engine.gameManager.MovementManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.objects.Mob;
src/engine/powers/poweractions/OpenGatePowerAction.java
+5 -5
View File
@@ -9,11 +9,11 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.Enum.BuildingGroup;
import engine.Enum.GameObjectType;
import engine.Enum.PortalType;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.BuildingGroup;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.PortalType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.objects.Building;
@@ -50,7 +50,7 @@ public class OpenGatePowerAction extends AbstractPowerAction {
// Sanity check.
if (source == null || awo == null || !(awo.getObjectType().equals(Enum.GameObjectType.Building)) || pb == null)
if (source == null || awo == null || !(awo.getObjectType().equals(mbEnums.GameObjectType.Building)) || pb == null)
return;
// Make sure building has a blueprint
src/engine/powers/poweractions/PeekPowerAction.java
+6 -6
View File
@@ -9,9 +9,9 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.gameManager.ChatManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.LootWindowResponseMsg;
@@ -77,11 +77,11 @@ public class PeekPowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source == null || awo == null || !(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
if (source == null || awo == null || !(source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)))
return;
PlayerCharacter pc = null;
if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
if (source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter))
pc = (PlayerCharacter) source;
AbstractCharacter target = null;
@@ -99,7 +99,7 @@ public class PeekPowerAction extends AbstractPowerAction {
LootWindowResponseMsg lwrm = null;
if (awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (awo.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter tar = (PlayerCharacter) awo;
@@ -107,7 +107,7 @@ public class PeekPowerAction extends AbstractPowerAction {
return;
lwrm = new LootWindowResponseMsg(tar.getObjectType().ordinal(), tar.getObjectUUID(), tar.getInventory(true));
} else if (awo.getObjectType().equals(Enum.GameObjectType.Mob)) {
} else if (awo.getObjectType().equals(mbEnums.GameObjectType.Mob)) {
Mob tar = (Mob) awo;
@@ -120,7 +120,7 @@ public class PeekPowerAction extends AbstractPowerAction {
return;
Dispatch dispatch = Dispatch.borrow(pc, lwrm);
DispatchMessage.dispatchMsgDispatch(dispatch, engine.Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
@Override
src/engine/powers/poweractions/RecallPowerAction.java
+3 -2
View File
@@ -9,10 +9,11 @@
package engine.powers.poweractions;
import engine.Enum.GameObjectType;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.MovementManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -55,7 +56,7 @@ public class RecallPowerAction extends AbstractPowerAction {
pc.setTimeStamp("LastRecallType", 1); //recall to bind
PromptRecallMsg promptRecallMsgmsg = new PromptRecallMsg();
Dispatch dispatch = Dispatch.borrow(pc, promptRecallMsgmsg);
DispatchMessage.dispatchMsgDispatch(dispatch, engine.Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
} else {
MovementManager.translocate(awoac, awoac.getBindLoc());
src/engine/powers/poweractions/RemoveEffectPowerAction.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.powers.poweractions;
import engine.Enum.EffectSourceType;
import engine.math.Vector3fImmutable;
import engine.mbEnums.EffectSourceType;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.powers.ActionsBase;
src/engine/powers/poweractions/RunegateTeleportPowerAction.java
+3 -3
View File
@@ -9,7 +9,7 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.mbEnums;
import engine.math.Vector3fImmutable;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -36,7 +36,7 @@ public class RunegateTeleportPowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source == null || awo == null || !(awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
if (source == null || awo == null || !(awo.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)))
return;
PlayerCharacter pc = (PlayerCharacter) awo;
@@ -63,7 +63,7 @@ public class RunegateTeleportPowerAction extends AbstractPowerAction {
if (rg != null) {
PromptRecallMsg promptRecallMsgmsg = new PromptRecallMsg();
Dispatch dispatch = Dispatch.borrow(pc, promptRecallMsgmsg);
DispatchMessage.dispatchMsgDispatch(dispatch, engine.Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
} else {
src/engine/powers/poweractions/SetItemFlagPowerAction.java
+5 -5
View File
@@ -9,7 +9,7 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.math.Vector3fImmutable;
import engine.objects.AbstractCharacter;
@@ -32,21 +32,21 @@ public class SetItemFlagPowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source == null || awo == null || !(awo.getObjectType().equals(Enum.GameObjectType.Item)))
if (source == null || awo == null || !(awo.getObjectType().equals(mbEnums.GameObjectType.Item)))
return;
Item item = (Item) awo;
if (item.containerType != Enum.ItemContainerType.INVENTORY)
if (item.containerType != mbEnums.ItemContainerType.INVENTORY)
return; //Send an error here?
//until this is shown to do something else, just use it as item identify spell.
item.flags.add(Enum.ItemFlags.Identified);
item.flags.add(mbEnums.ItemFlags.Identified);
;
if (!DbManager.ItemQueries.UPDATE_FLAGS(item))
item.flags.remove(Enum.ItemFlags.Identified);
item.flags.remove(mbEnums.ItemFlags.Identified);
; //update failed, reset
//update inventory
src/engine/powers/poweractions/SpireDisablePowerAction.java
+2 -2
View File
@@ -9,8 +9,8 @@
package engine.powers.poweractions;
import engine.Enum.BuildingGroup;
import engine.Enum.GameObjectType;
import engine.mbEnums.BuildingGroup;
import engine.mbEnums.GameObjectType;
import engine.gameManager.ChatManager;
import engine.math.Vector3fImmutable;
import engine.objects.AbstractCharacter;
src/engine/powers/poweractions/StealPowerAction.java
+6 -6
View File
@@ -9,8 +9,8 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.Enum.ItemType;
import engine.mbEnums;
import engine.mbEnums.ItemType;
import engine.gameManager.ChatManager;
import engine.gameManager.CombatManager;
import engine.math.Vector3fImmutable;
@@ -81,7 +81,7 @@ public class StealPowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source == null || awo == null || !(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) || !(awo.getObjectType().equals(Enum.GameObjectType.Item)))
if (source == null || awo == null || !(source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) || !(awo.getObjectType().equals(mbEnums.GameObjectType.Item)))
return;
PlayerCharacter sourcePlayer = (PlayerCharacter) source;
@@ -113,7 +113,7 @@ public class StealPowerAction extends AbstractPowerAction {
//only steal from players or mobs
if (owner.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (owner.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter ownerPC = (PlayerCharacter) owner;
@@ -172,14 +172,14 @@ public class StealPowerAction extends AbstractPowerAction {
//send loot message to person stealing.
LootMsg lm = new LootMsg(source.getObjectType().ordinal(), source.getObjectUUID(), owner.getObjectType().ordinal(), owner.getObjectUUID(), tar);
Dispatch dispatch = Dispatch.borrow(sourcePlayer, lm);
DispatchMessage.dispatchMsgDispatch(dispatch, engine.Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
//update thief's inventory
if (sourcePlayer.charItemManager != null)
sourcePlayer.charItemManager.updateInventory();
//update victims inventory
if (owner.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (owner.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter ownerPC = (PlayerCharacter) owner;
if (ownerPC.charItemManager != null)
src/engine/powers/poweractions/SummonPowerAction.java
+3 -3
View File
@@ -9,7 +9,7 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.mbEnums;
import engine.gameManager.SessionManager;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
@@ -40,7 +40,7 @@ public class SummonPowerAction extends AbstractPowerAction {
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab,
PowersBase pb) {
if (source == null || awo == null || !(awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) || !(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
if (source == null || awo == null || !(awo.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) || !(source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)))
return;
PlayerCharacter target = (PlayerCharacter) awo;
@@ -61,7 +61,7 @@ public class SummonPowerAction extends AbstractPowerAction {
location, false);
Dispatch dispatch = Dispatch.borrow(target, rsrm);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
src/engine/powers/poweractions/TeleportPowerAction.java
+4 -4
View File
@@ -9,9 +9,9 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.gameManager.MovementManager;
import engine.gameManager.PowersManager;
import engine.gameManager.ZoneManager;
@@ -39,7 +39,7 @@ public class TeleportPowerAction extends AbstractPowerAction {
private static void failTeleport(PowersBase pb, AbstractCharacter awo) {
if (pb == null || awo == null || (!(awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))))
if (pb == null || awo == null || (!(awo.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter))))
return;
//teleport failed. Reset teleport power
src/engine/powers/poweractions/TransferStatPowerAction.java
+6 -6
View File
@@ -9,9 +9,9 @@
package engine.powers.poweractions;
import engine.Enum;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.math.Vector3fImmutable;
import engine.net.AbstractNetMsg;
import engine.net.DispatchMessage;
@@ -44,7 +44,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
protected float transferEfficiencyRamp;
protected boolean transferEfficiencyRampAdd;
protected boolean targetToCaster;
protected Enum.DamageType damageType;
protected mbEnums.DamageType damageType;
protected EffectsBase effect;
public TransferStatPowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
@@ -78,7 +78,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
// Damage type can sometimes be null in the DB.
if (damageString.isEmpty() == false)
this.damageType = Enum.DamageType.getDamageType(damageString);
this.damageType = mbEnums.DamageType.getDamageType(damageString);
} catch (Exception e) {
this.damageType = null;
}
@@ -177,7 +177,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
float max = min;
float damage = 0f;
if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (source.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
PlayerCharacter pc = (PlayerCharacter) source;
float focus;
CharacterSkill skill = pc.getSkills().get(pb.getSkillName());