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

Contract power handling now additive.

combat-2
MagicBot 1 year ago
parent
58b427b977
commit
80d0948e24
1 changed files with 20 additions and 8 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. 28
      src/engine/mobileAI/MobAI.java

28
src/engine/mobileAI/MobAI.java
Unescape View File

@ -364,15 +364,21 @@ public class MobAI {
powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID())); powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID()));
purgeEntries = new ArrayList<>(); purgeEntries = new ArrayList<>();
// Fallback to contract is nothing in mobbase. This is to support player guards. // Additional powers may come from the contract ID. This is to support
// powers for player guards irrespective of the mobbase used.
if (powerEntries.isEmpty()) { if (mob.isPlayerGuard()) {
ArrayList<RunePowerEntry> contractEntries = new ArrayList<>();
if (mob.contract != null) if (mob.contract != null)
powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.contractUUID)); contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.contractUUID));
if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.guardCaptain.contractUUID)); contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.guardCaptain.contractUUID));
powerEntries.addAll(contractEntries);
} }
// If player has this effect on them currently then remove // If player has this effect on them currently then remove
@ -459,15 +465,21 @@ public class MobAI {
powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID())); powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID()));
purgeEntries = new ArrayList<>(); purgeEntries = new ArrayList<>();
// Fallback to contract is nothing in mobbase. This is to support player guards. // Additional powers may come from the contract ID. This is to support
// powers for player guards irrespective of the mobbase used.
if (powerEntries.isEmpty()) { if (mob.isPlayerGuard()) {
ArrayList<RunePowerEntry> contractEntries = new ArrayList<>();
if (mob.contract != null) if (mob.contract != null)
powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.contractUUID)); contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.contractUUID));
if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.guardCaptain.contractUUID)); contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.guardCaptain.contractUUID));
powerEntries.addAll(contractEntries);
} }
// If player has this effect on them currently then remove // If player has this effect on them currently then remove

Write Preview
Loading…
Cancel
Save