From c5f2464d55da7f7ea6d8e920e14f7922dfdd6d47 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sat, 11 May 2024 20:21:10 -0500 Subject: [PATCH] mob resist issue --- src/engine/objects/Mob.java | 72 ++++++++++++++++----------------- src/engine/objects/Resists.java | 16 ++++++++ 2 files changed, 52 insertions(+), 36 deletions(-) diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index 7299a9f7..85daf759 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -196,7 +196,7 @@ public class Mob extends AbstractIntelligenceAgent { case "Thollok Marsh": case "The Black Bog": case "Sevaath Mere": - mob.resists = Resists.getResists(10); + mob.resists = Resists.getResists(8); break; //Oblivion Generics case "Plain of Ashes": @@ -216,109 +216,109 @@ public class Mob extends AbstractIntelligenceAgent { } switch(mob.mobBase.raceType){ case "Aelfborn": - + mob.resists.addResists(Resists.getResists(0)); break; case "All": - + mob.resists.addResists(Resists.getResists(0)); break; case "Animal": - + mob.resists.addResists(Resists.getResists(0)); break; case "Aracoix": - + mob.resists.addResists(Resists.getResists(22)); break; case "Celestial": - + mob.resists.addResists(Resists.getResists(0)); break; case "Centaur": - + mob.resists.addResists(Resists.getResists(24)); break; case "Construct": - + mob.resists.addResists(Resists.getResists(0)); break; case "CSR": - + mob.resists.addResists(Resists.getResists(0)); break; case "Dragon": - + mob.resists.addResists(Resists.getResists(10)); break; case "Dwarf": - + mob.resists.addResists(Resists.getResists(25)); break; case "Elf": - + mob.resists.addResists(Resists.getResists(5)); break; case "Giant": - + mob.resists.addResists(Resists.getResists(34)); break; case "Goblin": - + mob.resists.addResists(Resists.getResists(0)); break; case "Grave": - + mob.resists.addResists(Resists.getResists(0)); break; case "HalfGiant": - + mob.resists.addResists(Resists.getResists(6)); break; case "Human": - + mob.resists.addResists(Resists.getResists(0)); break; case "Infernal": - + mob.resists.addResists(Resists.getResists(18)); break; case "Insect": - + mob.resists.addResists(Resists.getResists(19)); break; case "Irekei": - + mob.resists.addResists(Resists.getResists(12)); break; case "Minotaur": - + mob.resists.addResists(Resists.getResists(13)); break; case "Monster": - + mob.resists.addResists(Resists.getResists(35)); break; case "NecroPet": - + mob.resists.addResists(Resists.getResists(23)); break; case "NPC": - + mob.resists.addResists(Resists.getResists(0)); break; case "Pet": - + mob.resists.addResists(Resists.getResists(19)); break; case "Plant": - + mob.resists.addResists(Resists.getResists(36)); break; case "Rat": - + mob.resists.addResists(Resists.getResists(0)); break; case "Reptile": - + mob.resists.addResists(Resists.getResists(0)); break; case "Shade": - + mob.resists.addResists(Resists.getResists(26)); break; case "Siege": - + mob.resists.addResists(Resists.getResists(38)); break; case "Summoned": - + mob.resists.addResists(Resists.getResists(19)); break; case "Troll": - + mob.resists.addResists(Resists.getResists(33)); break; case "Undead": - + mob.resists.addResists(Resists.getResists(27)); break; case "Nephilim": - + mob.resists.addResists(Resists.getResists(7)); break; case "Vampire": - + mob.resists.addResists(Resists.getResists(11)); break; case "SiegeEngineer": - + mob.resists.addResists(Resists.getResists(0)); break; } } diff --git a/src/engine/objects/Resists.java b/src/engine/objects/Resists.java index c2970d6b..9ba01ca1 100644 --- a/src/engine/objects/Resists.java +++ b/src/engine/objects/Resists.java @@ -618,4 +618,20 @@ public class Resists { return out; } + + public void addResists(Resists resists){ + this.resists.put(DamageType.Slash, this.resists.get(DamageType.Slash) + resists.resists.get(DamageType.Slash)); + this.resists.put(DamageType.Crush, this.resists.get(DamageType.Crush) + resists.resists.get(DamageType.Crush)); + this.resists.put(DamageType.Pierce, this.resists.get(DamageType.Pierce) + resists.resists.get(DamageType.Pierce)); + this.resists.put(DamageType.Magic, this.resists.get(DamageType.Magic) + resists.resists.get(DamageType.Magic)); + this.resists.put(DamageType.Bleed, this.resists.get(DamageType.Bleed) + resists.resists.get(DamageType.Bleed)); + this.resists.put(DamageType.Poison, this.resists.get(DamageType.Poison) + resists.resists.get(DamageType.Poison)); + this.resists.put(DamageType.Mental, this.resists.get(DamageType.Mental) + resists.resists.get(DamageType.Mental)); + this.resists.put(DamageType.Holy, this.resists.get(DamageType.Holy) + resists.resists.get(DamageType.Holy)); + this.resists.put(DamageType.Unholy, this.resists.get(DamageType.Unholy) + resists.resists.get(DamageType.Unholy)); + this.resists.put(DamageType.Lightning, this.resists.get(DamageType.Lightning) + resists.resists.get(DamageType.Lightning)); + this.resists.put(DamageType.Fire, this.resists.get(DamageType.Fire) + resists.resists.get(DamageType.Fire)); + this.resists.put(DamageType.Cold, this.resists.get(DamageType.Cold) + resists.resists.get(DamageType.Cold)); + this.resists.put(DamageType.Healing, this.resists.get(DamageType.Healing) + resists.resists.get(DamageType.Healing)); + } }