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

PIERCING

Browse Source
This commit is contained in:
MagicBot
2024-04-01 12:42:49 -04:00
parent ae7fecbf6d
commit f58aa61859
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/Enum.java
+1 -1
View File
@@ -729,7 +729,7 @@ public class Enum {
CRUSHING, CRUSHING,
SLASHING, SLASHING,
SIEGE, SIEGE,
PIERCE, PIERCING,
MAGIC, MAGIC,
BLEEDING, BLEEDING,
POISON, POISON,
src/engine/gameManager/NPCManager.java
+1 -1
View File
@@ -435,7 +435,7 @@ public enum NPCManager {
if (equipped.template.item_type.equals(Enum.ItemType.ARMOR)) { if (equipped.template.item_type.equals(Enum.ItemType.ARMOR)) {
mob.resists.setResist(Enum.DamageType.SLASHING, mob.resists.getResist(Enum.DamageType.SLASHING, 0) + equipped.template.combat_attack_resist.get("SLASHING")); mob.resists.setResist(Enum.DamageType.SLASHING, mob.resists.getResist(Enum.DamageType.SLASHING, 0) + equipped.template.combat_attack_resist.get("SLASHING"));
mob.resists.setResist(Enum.DamageType.CRUSHING, mob.resists.getResist(Enum.DamageType.CRUSHING, 0) + equipped.template.combat_attack_resist.get("CRUSHING")); mob.resists.setResist(Enum.DamageType.CRUSHING, mob.resists.getResist(Enum.DamageType.CRUSHING, 0) + equipped.template.combat_attack_resist.get("CRUSHING"));
mob.resists.setResist(Enum.DamageType.PIERCE, mob.resists.getResist(Enum.DamageType.PIERCE, 0) + equipped.template.combat_attack_resist.get("PIERCING")); mob.resists.setResist(Enum.DamageType.PIERCING, mob.resists.getResist(Enum.DamageType.PIERCING, 0) + equipped.template.combat_attack_resist.get("PIERCING"));
} }
} }
} }
src/engine/objects/Resists.java
+5 -5
View File
@@ -85,7 +85,7 @@ public class Resists {
this.immuneToAll = false; this.immuneToAll = false;
this.resists.put(Enum.DamageType.SLASHING, rs.getFloat("slash")); this.resists.put(Enum.DamageType.SLASHING, rs.getFloat("slash"));
this.resists.put(Enum.DamageType.CRUSHING, rs.getFloat("crush")); this.resists.put(Enum.DamageType.CRUSHING, rs.getFloat("crush"));
this.resists.put(Enum.DamageType.PIERCE, rs.getFloat("pierce")); this.resists.put(Enum.DamageType.PIERCING, rs.getFloat("pierce"));
this.resists.put(Enum.DamageType.MAGIC, rs.getFloat("magic")); this.resists.put(Enum.DamageType.MAGIC, rs.getFloat("magic"));
this.resists.put(Enum.DamageType.BLEEDING, rs.getFloat("bleed")); this.resists.put(Enum.DamageType.BLEEDING, rs.getFloat("bleed"));
this.resists.put(Enum.DamageType.POISON, rs.getFloat("poison")); this.resists.put(Enum.DamageType.POISON, rs.getFloat("poison"));
@@ -198,7 +198,7 @@ public class Resists {
this.resists.put(Enum.DamageType.SLASHING, 85f); this.resists.put(Enum.DamageType.SLASHING, 85f);
this.resists.put(Enum.DamageType.CRUSHING, 85f); this.resists.put(Enum.DamageType.CRUSHING, 85f);
this.resists.put(Enum.DamageType.SIEGE, 0f); this.resists.put(Enum.DamageType.SIEGE, 0f);
this.immuneTo.put(Enum.DamageType.PIERCE, true); this.immuneTo.put(Enum.DamageType.PIERCING, true);
this.immuneTo.put(Enum.DamageType.MAGIC, true); this.immuneTo.put(Enum.DamageType.MAGIC, true);
this.immuneTo.put(Enum.DamageType.BLEEDING, true); this.immuneTo.put(Enum.DamageType.BLEEDING, true);
this.immuneTo.put(Enum.DamageType.POISON, true); this.immuneTo.put(Enum.DamageType.POISON, true);
@@ -218,7 +218,7 @@ public class Resists {
this.immuneToAll = false; this.immuneToAll = false;
this.immuneTo.put(Enum.DamageType.SLASHING, true); this.immuneTo.put(Enum.DamageType.SLASHING, true);
this.immuneTo.put(Enum.DamageType.CRUSHING, true); this.immuneTo.put(Enum.DamageType.CRUSHING, true);
this.immuneTo.put(Enum.DamageType.PIERCE, true); this.immuneTo.put(Enum.DamageType.PIERCING, true);
this.immuneTo.put(Enum.DamageType.MAGIC, true); this.immuneTo.put(Enum.DamageType.MAGIC, true);
this.immuneTo.put(Enum.DamageType.BLEEDING, true); this.immuneTo.put(Enum.DamageType.BLEEDING, true);
this.immuneTo.put(Enum.DamageType.POISON, true); this.immuneTo.put(Enum.DamageType.POISON, true);
@@ -238,7 +238,7 @@ public class Resists {
this.immuneToAll = false; this.immuneToAll = false;
this.resists.put(Enum.DamageType.SLASHING, 0f); this.resists.put(Enum.DamageType.SLASHING, 0f);
this.resists.put(Enum.DamageType.CRUSHING, 0f); this.resists.put(Enum.DamageType.CRUSHING, 0f);
this.resists.put(Enum.DamageType.PIERCE, 0f); this.resists.put(Enum.DamageType.PIERCING, 0f);
this.resists.put(Enum.DamageType.MAGIC, 0f); this.resists.put(Enum.DamageType.MAGIC, 0f);
this.resists.put(Enum.DamageType.BLEEDING, 0f); this.resists.put(Enum.DamageType.BLEEDING, 0f);
this.resists.put(Enum.DamageType.POISON, 0f); this.resists.put(Enum.DamageType.POISON, 0f);
@@ -406,7 +406,7 @@ public class Resists {
this.resists.put(Enum.DamageType.SLASHING, slash); this.resists.put(Enum.DamageType.SLASHING, slash);
this.resists.put(Enum.DamageType.CRUSHING, crush); this.resists.put(Enum.DamageType.CRUSHING, crush);
this.resists.put(Enum.DamageType.PIERCE, pierce); this.resists.put(Enum.DamageType.PIERCING, pierce);
this.resists.put(Enum.DamageType.MAGIC, magic); this.resists.put(Enum.DamageType.MAGIC, magic);
this.resists.put(Enum.DamageType.BLEEDING, bleed); this.resists.put(Enum.DamageType.BLEEDING, bleed);
this.resists.put(Enum.DamageType.POISON, poison); this.resists.put(Enum.DamageType.POISON, poison);