From f58aa6185907f76cfd4102d28ea48092f2a8eac0 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 1 Apr 2024 12:42:49 -0400 Subject: [PATCH] PIERCING --- src/engine/Enum.java | 2 +- src/engine/gameManager/NPCManager.java | 2 +- src/engine/objects/Resists.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/engine/Enum.java b/src/engine/Enum.java index 20f10866..ce1ed466 100644 --- a/src/engine/Enum.java +++ b/src/engine/Enum.java @@ -729,7 +729,7 @@ public class Enum { CRUSHING, SLASHING, SIEGE, - PIERCE, + PIERCING, MAGIC, BLEEDING, POISON, diff --git a/src/engine/gameManager/NPCManager.java b/src/engine/gameManager/NPCManager.java index d15e9c4b..f96c2779 100644 --- a/src/engine/gameManager/NPCManager.java +++ b/src/engine/gameManager/NPCManager.java @@ -435,7 +435,7 @@ public enum NPCManager { 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.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")); } } } diff --git a/src/engine/objects/Resists.java b/src/engine/objects/Resists.java index 57bb331c..316490c1 100644 --- a/src/engine/objects/Resists.java +++ b/src/engine/objects/Resists.java @@ -85,7 +85,7 @@ public class Resists { this.immuneToAll = false; this.resists.put(Enum.DamageType.SLASHING, rs.getFloat("slash")); 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.BLEEDING, rs.getFloat("bleed")); 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.CRUSHING, 85f); 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.BLEEDING, true); this.immuneTo.put(Enum.DamageType.POISON, true); @@ -218,7 +218,7 @@ public class Resists { this.immuneToAll = false; this.immuneTo.put(Enum.DamageType.SLASHING, 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.BLEEDING, true); this.immuneTo.put(Enum.DamageType.POISON, true); @@ -238,7 +238,7 @@ public class Resists { this.immuneToAll = false; this.resists.put(Enum.DamageType.SLASHING, 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.BLEEDING, 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.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.BLEEDING, bleed); this.resists.put(Enum.DamageType.POISON, poison);