Preston
/
prestonbane
forked from MagicBane/Server
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
Browse Source

mob resist issue

lakebane-master
FatBoy-DOTC 8 months ago
parent
e0beab2dc5
commit
c5f2464d55
2 changed files with 52 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      src/engine/objects/Mob.java
  2. 16
      src/engine/objects/Resists.java

72
src/engine/objects/Mob.java
Unescape View File

@ -196,7 +196,7 @@ public class Mob extends AbstractIntelligenceAgent {
case "Thollok Marsh": case "Thollok Marsh":
case "The Black Bog": case "The Black Bog":
case "Sevaath Mere": case "Sevaath Mere":
mob.resists = Resists.getResists(10); mob.resists = Resists.getResists(8);
break; break;
//Oblivion Generics //Oblivion Generics
case "Plain of Ashes": case "Plain of Ashes":
@ -216,109 +216,109 @@ public class Mob extends AbstractIntelligenceAgent {
} }
switch(mob.mobBase.raceType){ switch(mob.mobBase.raceType){
case "Aelfborn": case "Aelfborn":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "All": case "All":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Animal": case "Animal":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Aracoix": case "Aracoix":
mob.resists.addResists(Resists.getResists(22));
break; break;
case "Celestial": case "Celestial":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Centaur": case "Centaur":
mob.resists.addResists(Resists.getResists(24));
break; break;
case "Construct": case "Construct":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "CSR": case "CSR":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Dragon": case "Dragon":
mob.resists.addResists(Resists.getResists(10));
break; break;
case "Dwarf": case "Dwarf":
mob.resists.addResists(Resists.getResists(25));
break; break;
case "Elf": case "Elf":
mob.resists.addResists(Resists.getResists(5));
break; break;
case "Giant": case "Giant":
mob.resists.addResists(Resists.getResists(34));
break; break;
case "Goblin": case "Goblin":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Grave": case "Grave":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "HalfGiant": case "HalfGiant":
mob.resists.addResists(Resists.getResists(6));
break; break;
case "Human": case "Human":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Infernal": case "Infernal":
mob.resists.addResists(Resists.getResists(18));
break; break;
case "Insect": case "Insect":
mob.resists.addResists(Resists.getResists(19));
break; break;
case "Irekei": case "Irekei":
mob.resists.addResists(Resists.getResists(12));
break; break;
case "Minotaur": case "Minotaur":
mob.resists.addResists(Resists.getResists(13));
break; break;
case "Monster": case "Monster":
mob.resists.addResists(Resists.getResists(35));
break; break;
case "NecroPet": case "NecroPet":
mob.resists.addResists(Resists.getResists(23));
break; break;
case "NPC": case "NPC":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Pet": case "Pet":
mob.resists.addResists(Resists.getResists(19));
break; break;
case "Plant": case "Plant":
mob.resists.addResists(Resists.getResists(36));
break; break;
case "Rat": case "Rat":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Reptile": case "Reptile":
mob.resists.addResists(Resists.getResists(0));
break; break;
case "Shade": case "Shade":
mob.resists.addResists(Resists.getResists(26));
break; break;
case "Siege": case "Siege":
mob.resists.addResists(Resists.getResists(38));
break; break;
case "Summoned": case "Summoned":
mob.resists.addResists(Resists.getResists(19));
break; break;
case "Troll": case "Troll":
mob.resists.addResists(Resists.getResists(33));
break; break;
case "Undead": case "Undead":
mob.resists.addResists(Resists.getResists(27));
break; break;
case "Nephilim": case "Nephilim":
mob.resists.addResists(Resists.getResists(7));
break; break;
case "Vampire": case "Vampire":
mob.resists.addResists(Resists.getResists(11));
break; break;
case "SiegeEngineer": case "SiegeEngineer":
mob.resists.addResists(Resists.getResists(0));
break; break;
} }
} }

16
src/engine/objects/Resists.java
Unescape View File

@ -618,4 +618,20 @@ public class Resists {
return out; 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));
}
} }

Write Preview
Loading…
Cancel
Save