diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index cd4192c4..1a22cadd 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -1740,14 +1740,25 @@ public class Mob extends AbstractIntelligenceAgent { this.behaviourType = MobBehaviourType.Aggro; } + boolean isDropper = false; for(MobEquipment equipped: this.equip.values()){ if(equipped.getItemBase().isVorg() && this.getMobBaseID() != 14062){ - this.healthMax = 7500; - this.setHealth(this.healthMax); - this.level = 65; + //this.healthMax = 7500; + //this.setHealth(this.healthMax); + //this.level = 65; + isDropper = true; + } + } + for(Item item : this.charItemManager.getInventory()){ + if(item.getItemBase().isDiscRune() && this.level < 75){ + isDropper = true; } } + if(isDropper){ + this.level = 65; + this.resists = new Resists("Dropper"); + } //for(Item loot : this.charItemManager.getInventory()){ // if(loot.getItemBase().isDiscRune() && this.level < 80){ // if(this.firstSpawn) { diff --git a/src/engine/objects/Resists.java b/src/engine/objects/Resists.java index b6ebcc36..81c7b5eb 100644 --- a/src/engine/objects/Resists.java +++ b/src/engine/objects/Resists.java @@ -46,12 +46,32 @@ public class Resists { case "Mine": setMineResists(); break; + case "Dropper": + setDropperResists(); default: setGenericResists(); break; } } + private void setDropperResists() { + this.immuneToAll = false; + this.resists.put(DamageType.Slash, 75f); + this.resists.put(DamageType.Crush, 75f); + this.resists.put(DamageType.Pierce, 75f); + this.resists.put(DamageType.Magic, 75f); + this.resists.put(DamageType.Bleed, 75f); + this.resists.put(DamageType.Poison, 75f); + this.resists.put(DamageType.Mental, 75f); + this.resists.put(DamageType.Holy, 75f); + this.resists.put(DamageType.Unholy, 75f); + this.resists.put(DamageType.Lightning, 75f); + this.resists.put(DamageType.Fire, 75f); + this.resists.put(DamageType.Cold, 75f); + this.resists.put(DamageType.Healing, 75f); + this.immuneTo.put(DamageType.Siege, true); + } + public Resists(Resists r) { for (DamageType dt : r.resists.keySet()) this.resists.put(dt, r.resists.get(dt));