MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Revert "DamageType defined as in JSON"

Browse Source 
This reverts commit 1c31070fc8.
This commit is contained in:
MagicBot
2024-04-01 12:04:12 -04:00
parent 1c31070fc8
commit 3649c629b7
4 changed files with 147 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/Enum.java
+40 -36
View File
@@ -752,48 +752,52 @@ public class Enum {
} }
public enum DamageType { public enum DamageType {
NONE, None,
CRUSHING, Crush,
SLASHING, Slash,
SIEGE, Siege,
PIERCING, Pierce,
MAGIC, Magic,
BLEEDING, Bleed,
POISON, Poison,
MENTAL, Mental,
HOLY, Holy,
UNHOLY, Unholy,
LIGHTNING, Lightning,
FIRE, Fire,
COLD, Cold,
HEALING, Healing,
ACID, Acid,
DISEASE, Disease,
UNKNOWN, Unknown,
// these added for immunities // these added for immunities
ATTACK, Attack,
POWERS, Powers,
COMBAT, Combat,
SPIRES, Spires,
SNARE, Snare,
STUN, Stun,
BLIND, Blind,
ROOT, Root,
FEAR, Fear,
CHARM, Charm,
POWERBLOCK, PowerBlock,
DEBUFF, DeBuff,
STEAL, Powerblock,
DRAIN; Steel,
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;
damageType = DamageType.valueOf(modName.replace(",", "").toUpperCase());
try {
damageType = DamageType.valueOf(modName.replace(",", ""));
} catch (Exception e) {
Logger.error(e);
return DamageType.None;
}
return damageType; return damageType;
} }
} }
src/engine/gameManager/CombatManager.java
+2 -2
View File
@@ -781,9 +781,9 @@ public enum CombatManager {
if (wb != null) if (wb != null)
damageType = wb.getDamageType(); damageType = wb.getDamageType();
else if (ac.getObjectType().equals(GameObjectType.Mob) && ((Mob) ac).isSiege()) else if (ac.getObjectType().equals(GameObjectType.Mob) && ((Mob) ac).isSiege())
damageType = DamageType.SIEGE; damageType = DamageType.Siege;
else else
damageType = DamageType.CRUSHING; damageType = DamageType.Crush;
errorTrack = 10; errorTrack = 10;
src/engine/mobileAI/utilities/CombatUtilities.java
+5 -5
View File
@@ -214,10 +214,10 @@ public class CombatUtilities {
else else
speed = agent.getSpeedHandTwo(); speed = agent.getSpeedHandTwo();
DamageType dt = DamageType.CRUSHING; DamageType dt = DamageType.Crush;
if (agent.isSiege()) if (agent.isSiege())
dt = DamageType.SIEGE; dt = DamageType.Siege;
if (wb != null) { if (wb != null) {
anim = CombatManager.getSwingAnimation(wb, null, mainHand); anim = CombatManager.getSwingAnimation(wb, null, mainHand);
dt = wb.getDamageType(); dt = wb.getDamageType();
@@ -347,7 +347,7 @@ public class CombatUtilities {
} }
public static DamageType getDamageType(Mob agent) { public static DamageType getDamageType(Mob agent) {
DamageType dt = DamageType.CRUSHING; DamageType dt = DamageType.Crush;
if (agent.getEquip().get(1) != null) { if (agent.getEquip().get(1) != null) {
return agent.getEquip().get(1).getItemBase().getDamageType(); return agent.getEquip().get(1).getItemBase().getDamageType();
} }
@@ -399,7 +399,7 @@ public class CombatUtilities {
public static int calculateEpicDamage(Mob agent) { public static int calculateEpicDamage(Mob agent) {
//handle r8 mob damage //handle r8 mob damage
DamageType dt = DamageType.CRUSHING; DamageType dt = DamageType.Crush;
AbstractWorldObject target = agent.getCombatTarget(); AbstractWorldObject target = agent.getCombatTarget();
float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None); float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
double min = agent.getMinDamageHandOne(); double min = agent.getMinDamageHandOne();
@@ -442,7 +442,7 @@ public class CombatUtilities {
} else { } else {
minDmg = agent.getMobBase().getDamageMin(); minDmg = agent.getMobBase().getDamageMin();
maxDmg = agent.getMobBase().getDamageMax(); maxDmg = agent.getMobBase().getDamageMax();
dt = DamageType.CRUSHING; dt = DamageType.Crush;
} }
AbstractWorldObject target = agent.getCombatTarget(); AbstractWorldObject target = agent.getCombatTarget();
src/engine/objects/Resists.java
+100 -100
View File
@@ -85,19 +85,19 @@ public class Resists {
*/ */
public Resists(ResultSet rs) throws SQLException { public Resists(ResultSet rs) throws SQLException {
this.immuneToAll = false; this.immuneToAll = false;
this.resists.put(DamageType.SLASHING, rs.getFloat("slash")); this.resists.put(DamageType.Slash, rs.getFloat("slash"));
this.resists.put(DamageType.CRUSHING, rs.getFloat("crush")); this.resists.put(DamageType.Crush, rs.getFloat("crush"));
this.resists.put(DamageType.PIERCING, rs.getFloat("pierce")); this.resists.put(DamageType.Pierce, rs.getFloat("pierce"));
this.resists.put(DamageType.MAGIC, rs.getFloat("magic")); this.resists.put(DamageType.Magic, rs.getFloat("magic"));
this.resists.put(DamageType.BLEEDING, rs.getFloat("bleed")); this.resists.put(DamageType.Bleed, rs.getFloat("bleed"));
this.resists.put(DamageType.POISON, rs.getFloat("poison")); this.resists.put(DamageType.Poison, rs.getFloat("poison"));
this.resists.put(DamageType.MENTAL, rs.getFloat("mental")); this.resists.put(DamageType.Mental, rs.getFloat("mental"));
this.resists.put(DamageType.HOLY, rs.getFloat("holy")); this.resists.put(DamageType.Holy, rs.getFloat("holy"));
this.resists.put(DamageType.UNHOLY, rs.getFloat("unholy")); this.resists.put(DamageType.Unholy, rs.getFloat("unholy"));
this.resists.put(DamageType.LIGHTNING, rs.getFloat("lightning")); this.resists.put(DamageType.Lightning, rs.getFloat("lightning"));
this.resists.put(DamageType.FIRE, rs.getFloat("fire")); this.resists.put(DamageType.Fire, rs.getFloat("fire"));
this.resists.put(DamageType.COLD, rs.getFloat("cold")); this.resists.put(DamageType.Cold, rs.getFloat("cold"));
this.resists.put(DamageType.HEALING, 0f); this.resists.put(DamageType.Healing, 0f);
} }
//Handle Fortitudes //Handle Fortitudes
@@ -108,7 +108,7 @@ public class Resists {
//see if there is a fortitude //see if there is a fortitude
float damageCap = bonus.getFloatPercentAll(ModType.DamageCap, SourceType.None); float damageCap = bonus.getFloatPercentAll(ModType.DamageCap, SourceType.None);
if (damageCap == 0f || type == DamageType.HEALING) if (damageCap == 0f || type == DamageType.Healing)
return damage; return damage;
//is fortitude, Are we under the cap? //is fortitude, Are we under the cap?
@@ -139,7 +139,7 @@ public class Resists {
for (SourceType fort : forts) { for (SourceType fort : forts) {
DamageType dt = DamageType.valueOf(fort.name()); DamageType dt = DamageType.valueOf(fort.name());
if (dt == DamageType.NONE) if (dt == DamageType.None)
continue; continue;
if (dt == damageType) { if (dt == damageType) {
@@ -195,19 +195,19 @@ public class Resists {
*/ */
public final void setBuildingResists() { public final void setBuildingResists() {
this.immuneToAll = false; this.immuneToAll = false;
this.resists.put(DamageType.SLASHING, 85f); this.resists.put(DamageType.Slash, 85f);
this.resists.put(DamageType.CRUSHING, 85f); this.resists.put(DamageType.Crush, 85f);
this.resists.put(DamageType.SIEGE, 0f); this.resists.put(DamageType.Siege, 0f);
this.immuneTo.put(DamageType.PIERCING, true); this.immuneTo.put(DamageType.Pierce, true);
this.immuneTo.put(DamageType.MAGIC, true); this.immuneTo.put(DamageType.Magic, true);
this.immuneTo.put(DamageType.BLEEDING, true); this.immuneTo.put(DamageType.Bleed, true);
this.immuneTo.put(DamageType.POISON, true); this.immuneTo.put(DamageType.Poison, true);
this.immuneTo.put(DamageType.MENTAL, true); this.immuneTo.put(DamageType.Mental, true);
this.immuneTo.put(DamageType.HOLY, true); this.immuneTo.put(DamageType.Holy, true);
this.immuneTo.put(DamageType.UNHOLY, true); this.immuneTo.put(DamageType.Unholy, true);
this.immuneTo.put(DamageType.LIGHTNING, true); this.immuneTo.put(DamageType.Lightning, true);
this.immuneTo.put(DamageType.FIRE, true); this.immuneTo.put(DamageType.Fire, true);
this.immuneTo.put(DamageType.COLD, true); this.immuneTo.put(DamageType.Cold, true);
} }
@@ -216,19 +216,19 @@ public class Resists {
*/ */
public final void setMineResists() { public final void setMineResists() {
this.immuneToAll = false; this.immuneToAll = false;
this.immuneTo.put(DamageType.SLASHING, true); this.immuneTo.put(DamageType.Slash, true);
this.immuneTo.put(DamageType.CRUSHING, true); this.immuneTo.put(DamageType.Crush, true);
this.immuneTo.put(DamageType.PIERCING, true); this.immuneTo.put(DamageType.Pierce, true);
this.immuneTo.put(DamageType.MAGIC, true); this.immuneTo.put(DamageType.Magic, true);
this.immuneTo.put(DamageType.BLEEDING, true); this.immuneTo.put(DamageType.Bleed, true);
this.immuneTo.put(DamageType.POISON, true); this.immuneTo.put(DamageType.Poison, true);
this.immuneTo.put(DamageType.MENTAL, true); this.immuneTo.put(DamageType.Mental, true);
this.immuneTo.put(DamageType.HOLY, true); this.immuneTo.put(DamageType.Holy, true);
this.immuneTo.put(DamageType.UNHOLY, true); this.immuneTo.put(DamageType.Unholy, true);
this.immuneTo.put(DamageType.LIGHTNING, true); this.immuneTo.put(DamageType.Lightning, true);
this.immuneTo.put(DamageType.FIRE, true); this.immuneTo.put(DamageType.Fire, true);
this.immuneTo.put(DamageType.COLD, true); this.immuneTo.put(DamageType.Cold, true);
this.resists.put(DamageType.SIEGE, 0f); this.resists.put(DamageType.Siege, 0f);
} }
/** /**
@@ -236,20 +236,20 @@ public class Resists {
*/ */
public final void setGenericResists() { public final void setGenericResists() {
this.immuneToAll = false; this.immuneToAll = false;
this.resists.put(DamageType.SLASHING, 0f); this.resists.put(DamageType.Slash, 0f);
this.resists.put(DamageType.CRUSHING, 0f); this.resists.put(DamageType.Crush, 0f);
this.resists.put(DamageType.PIERCING, 0f); this.resists.put(DamageType.Pierce, 0f);
this.resists.put(DamageType.MAGIC, 0f); this.resists.put(DamageType.Magic, 0f);
this.resists.put(DamageType.BLEEDING, 0f); this.resists.put(DamageType.Bleed, 0f);
this.resists.put(DamageType.POISON, 0f); this.resists.put(DamageType.Poison, 0f);
this.resists.put(DamageType.MENTAL, 0f); this.resists.put(DamageType.Mental, 0f);
this.resists.put(DamageType.HOLY, 0f); this.resists.put(DamageType.Holy, 0f);
this.resists.put(DamageType.UNHOLY, 0f); this.resists.put(DamageType.Unholy, 0f);
this.resists.put(DamageType.LIGHTNING, 0f); this.resists.put(DamageType.Lightning, 0f);
this.resists.put(DamageType.FIRE, 0f); this.resists.put(DamageType.Fire, 0f);
this.resists.put(DamageType.COLD, 0f); this.resists.put(DamageType.Cold, 0f);
this.resists.put(DamageType.HEALING, 0f); this.resists.put(DamageType.Healing, 0f);
this.immuneTo.put(DamageType.SIEGE, true); this.immuneTo.put(DamageType.Siege, true);
} }
@@ -293,15 +293,15 @@ public class Resists {
} }
public boolean immuneToPowers() { public boolean immuneToPowers() {
return immuneTo(DamageType.POWERS); return immuneTo(DamageType.Powers);
} }
public boolean immuneToAttacks() { public boolean immuneToAttacks() {
return immuneTo(DamageType.ATTACK); return immuneTo(DamageType.Attack);
} }
public boolean immuneToSpires() { public boolean immuneToSpires() {
return immuneTo(DamageType.SPIRES); return immuneTo(DamageType.Spires);
} }
/** /**
@@ -346,24 +346,24 @@ public class Resists {
* set immunities from mobbase * set immunities from mobbase
*/ */
public void setImmuneTo(int immune) { public void setImmuneTo(int immune) {
setImmuneTo(DamageType.STUN, ((immune & 1) != 0)); setImmuneTo(DamageType.Stun, ((immune & 1) != 0));
setImmuneTo(DamageType.POWERBLOCK, ((immune & 2) != 0)); setImmuneTo(DamageType.PowerBlock, ((immune & 2) != 0));
setImmuneTo(DamageType.DRAIN, ((immune & 4) != 0)); setImmuneTo(DamageType.Drain, ((immune & 4) != 0));
setImmuneTo(DamageType.SNARE, ((immune & 8) != 0)); setImmuneTo(DamageType.Snare, ((immune & 8) != 0));
setImmuneTo(DamageType.SIEGE, ((immune & 16) != 0)); setImmuneTo(DamageType.Siege, ((immune & 16) != 0));
setImmuneTo(DamageType.SLASHING, ((immune & 32) != 0)); setImmuneTo(DamageType.Slash, ((immune & 32) != 0));
setImmuneTo(DamageType.CRUSHING, ((immune & 64) != 0)); setImmuneTo(DamageType.Crush, ((immune & 64) != 0));
setImmuneTo(DamageType.PIERCING, ((immune & 128) != 0)); setImmuneTo(DamageType.Pierce, ((immune & 128) != 0));
setImmuneTo(DamageType.MAGIC, ((immune & 256) != 0)); setImmuneTo(DamageType.Magic, ((immune & 256) != 0));
setImmuneTo(DamageType.BLEEDING, ((immune & 512) != 0)); setImmuneTo(DamageType.Bleed, ((immune & 512) != 0));
setImmuneTo(DamageType.POISON, ((immune & 1024) != 0)); setImmuneTo(DamageType.Poison, ((immune & 1024) != 0));
setImmuneTo(DamageType.MENTAL, ((immune & 2048) != 0)); setImmuneTo(DamageType.Mental, ((immune & 2048) != 0));
setImmuneTo(DamageType.HOLY, ((immune & 4096) != 0)); setImmuneTo(DamageType.Holy, ((immune & 4096) != 0));
setImmuneTo(DamageType.UNHOLY, ((immune & 8192) != 0)); setImmuneTo(DamageType.Unholy, ((immune & 8192) != 0));
setImmuneTo(DamageType.LIGHTNING, ((immune & 16384) != 0)); setImmuneTo(DamageType.Lightning, ((immune & 16384) != 0));
setImmuneTo(DamageType.FIRE, ((immune & 32768) != 0)); setImmuneTo(DamageType.Fire, ((immune & 32768) != 0));
setImmuneTo(DamageType.COLD, ((immune & 65536) != 0)); setImmuneTo(DamageType.Cold, ((immune & 65536) != 0));
setImmuneTo(DamageType.STEAL, ((immune & 131072) != 0)); setImmuneTo(DamageType.Steel, ((immune & 131072) != 0));
} }
/** /**
@@ -430,25 +430,25 @@ public class Resists {
if (rb != null) { if (rb != null) {
// Handle immunities // Handle immunities
if (rb.getBool(ModType.ImmuneTo, SourceType.Stun)) if (rb.getBool(ModType.ImmuneTo, SourceType.Stun))
this.immuneTo.put(DamageType.STUN, true); this.immuneTo.put(DamageType.Stun, true);
if (rb.getBool(ModType.ImmuneTo, SourceType.Blind)) if (rb.getBool(ModType.ImmuneTo, SourceType.Blind))
this.immuneTo.put(DamageType.BLIND, true); this.immuneTo.put(DamageType.Blind, true);
if (rb.getBool(ModType.ImmuneToAttack, SourceType.None)) if (rb.getBool(ModType.ImmuneToAttack, SourceType.None))
this.immuneTo.put(DamageType.ATTACK, true); this.immuneTo.put(DamageType.Attack, true);
if (rb.getBool(ModType.ImmuneToPowers, SourceType.None)) if (rb.getBool(ModType.ImmuneToPowers, SourceType.None))
this.immuneTo.put(DamageType.POWERS, true); this.immuneTo.put(DamageType.Powers, true);
if (rb.getBool(ModType.ImmuneTo, SourceType.Powerblock)) if (rb.getBool(ModType.ImmuneTo, SourceType.Powerblock))
this.immuneTo.put(DamageType.POWERBLOCK, true); this.immuneTo.put(DamageType.Powerblock, true);
if (rb.getBool(ModType.ImmuneTo, SourceType.DeBuff)) if (rb.getBool(ModType.ImmuneTo, SourceType.DeBuff))
this.immuneTo.put(DamageType.DEBUFF, true); this.immuneTo.put(DamageType.DeBuff, true);
if (rb.getBool(ModType.ImmuneTo, SourceType.Fear)) if (rb.getBool(ModType.ImmuneTo, SourceType.Fear))
this.immuneTo.put(DamageType.FEAR, true); this.immuneTo.put(DamageType.Fear, true);
if (rb.getBool(ModType.ImmuneTo, SourceType.Charm)) if (rb.getBool(ModType.ImmuneTo, SourceType.Charm))
this.immuneTo.put(DamageType.CHARM, true); this.immuneTo.put(DamageType.Charm, true);
if (rb.getBool(ModType.ImmuneTo, SourceType.Root)) if (rb.getBool(ModType.ImmuneTo, SourceType.Root))
this.immuneTo.put(DamageType.ROOT, true); this.immuneTo.put(DamageType.Root, true);
if (rb.getBool(ModType.ImmuneTo, SourceType.Snare)) if (rb.getBool(ModType.ImmuneTo, SourceType.Snare))
this.immuneTo.put(DamageType.SNARE, true); this.immuneTo.put(DamageType.Snare, true);
// Handle resists // Handle resists
slash += rb.getFloat(ModType.Resistance, SourceType.Slash); slash += rb.getFloat(ModType.Resistance, SourceType.Slash);
@@ -500,21 +500,21 @@ public class Resists {
} }
} }
this.resists.put(DamageType.SLASHING, slash); this.resists.put(DamageType.Slash, slash);
this.resists.put(DamageType.CRUSHING, crush); this.resists.put(DamageType.Crush, crush);
this.resists.put(DamageType.PIERCING, pierce); this.resists.put(DamageType.Pierce, pierce);
this.resists.put(DamageType.MAGIC, magic); this.resists.put(DamageType.Magic, magic);
this.resists.put(DamageType.BLEEDING, bleed); this.resists.put(DamageType.Bleed, bleed);
this.resists.put(DamageType.POISON, poison); this.resists.put(DamageType.Poison, poison);
this.resists.put(DamageType.MENTAL, mental); this.resists.put(DamageType.Mental, mental);
this.resists.put(DamageType.HOLY, holy); this.resists.put(DamageType.Holy, holy);
this.resists.put(DamageType.UNHOLY, unholy); this.resists.put(DamageType.Unholy, unholy);
this.resists.put(DamageType.LIGHTNING, lightning); this.resists.put(DamageType.Lightning, lightning);
this.resists.put(DamageType.FIRE, fire); this.resists.put(DamageType.Fire, fire);
this.resists.put(DamageType.COLD, cold); this.resists.put(DamageType.Cold, cold);
this.resists.put(DamageType.HEALING, healing); this.resists.put(DamageType.Healing, healing);
this.immuneTo.put(DamageType.SIEGE, true); this.immuneTo.put(DamageType.Siege, true);
// debug printing of resists // debug printing of resists
// printResists(pc); // printResists(pc);