Ai players

src/engine/Enum.java

@@ -150,7 +150,8 @@ public class Enum {
         NEPHFEMALE(2026, MonsterType.Nephilim, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
         HALFGIANTFEMALE(2027, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.15f),
         VAMPMALE(2028, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.MALE, 1),
-        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1);
+        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
+        SAETOR(1999,MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE,1);
 
         @SuppressWarnings("unchecked")
         private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
@@ -170,8 +171,6 @@ public class Enum {
         }
 
         public static RaceType getRaceTypebyRuneID(int runeID) {
-            if(runeID == 1999)
-                return _raceTypeByID.get(2017);
             return _raceTypeByID.get(runeID);
         }
 

src/engine/PlayerAi.java

@@ -0,0 +1,139 @@
+package engine;
+
+import engine.InterestManagement.WorldGrid;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.ChatManager;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import engine.server.MBServerStatics;
+
+import java.util.ArrayList;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class PlayerAi {
+    public static ArrayList<PlayerCharacter> ai_players = new ArrayList<>();
+
+    public static void addPlayer(PlayerCharacter pc){
+        ai_players.add(pc);
+        int index = ai_players.indexOf(pc);
+        pc.setObjectUUID(MBServerStatics.NO_DB_ROW_ASSIGNED_YET - (1 + index));
+    }
+
+    public static void populate_world(){
+        for(Mine mine : Mine.getMines()){
+            Building tower = BuildingManager.getBuildingFromCache(mine.getBuildingID());
+            if(tower != null){
+                for(int i = 0; i < mine.capSize; i++){
+                    addPlayer(createPlayer(tower));
+                }
+            }
+        }
+    }
+
+    public static PlayerCharacter createPlayer(Building tower){
+
+        Vector3fImmutable loc = Vector3fImmutable.getRandomPointOnCircle(tower.loc,40f);
+
+        //get random race
+        Race race = null;
+        while(race == null) {
+            int raceId = ThreadLocalRandom.current().nextInt(1999, 2030);
+            while (raceId == 2021 || raceId == 2020 || raceId == 2019 || raceId == 2018) {
+                raceId = ThreadLocalRandom.current().nextInt(1999, 2030);
+            }
+            race = Race.getRace(raceId);
+        }
+
+
+        //get random baseClass
+        BaseClass baseClass = null;
+        while(baseClass == null) {
+            int baseId = ThreadLocalRandom.current().nextInt(2499, 2505);
+            BaseClass temp = BaseClass.getBaseClass(baseId);
+            if (temp == null || !race.getValidBaseClasses().contains(temp)) {
+                continue;
+            }
+            baseClass = BaseClass.getBaseClass(baseId);
+        }
+
+        PlayerCharacter newPLayer = new PlayerCharacter("", "AI POWERED", (short) 5, (short) 5, (short) 5, (short) 5,
+                (short) 5, Guild.getGuild(5), (byte) 0, (Account) null, race, baseClass
+                , (byte) 1, (byte) 1,
+                (byte) 1, (byte) 1, (byte) 1);
+
+        newPLayer.runAfterLoad();
+
+        if(newPLayer.isMale()) {
+            newPLayer.setFirstName(getMaleName());
+        }else {
+            newPLayer.setFirstName(getFemaleName());
+        }
+
+        newPLayer.setLevel((short)10);
+
+        PromotionClass promo = null;
+        while(promo == null){
+            int promoId = ThreadLocalRandom.current().nextInt(2508,2526);
+            PromotionClass temp = PromotionClass.GetPromtionClassFromCache(promoId);
+            if(temp == null)
+                continue;
+            if(!temp.isAllowedRune(race.getToken()))
+                continue;
+            if(!temp.isAllowedRune(baseClass.getToken()))
+                continue;
+            promo = PromotionClass.GetPromtionClassFromCache(promoId);
+        }
+        newPLayer.setPromotionClass(promo.getObjectUUID());
+        newPLayer.setLevel((short)75);
+
+        newPLayer.setLoc(loc);
+
+        newPLayer.setObjectTypeMask(MBServerStatics.MASK_PLAYER);
+        WorldGrid.addObject(newPLayer,loc.x,loc.z);
+
+        return newPLayer;
+    }
+
+    public static void run_ai_players() {
+        for (PlayerCharacter pc : ai_players) {
+
+        }
+    }
+
+    public static String getMaleName(){
+        String[] maleNames = {
+                "James", "John", "Robert", "Michael", "William", "David", "Richard", "Joseph", "Thomas", "Charles",
+                "Christopher", "Daniel", "Matthew", "Anthony", "Mark", "Donald", "Steven", "Paul", "Andrew", "Joshua",
+                "Kenneth", "Kevin", "Brian", "George", "Edward", "Ronald", "Timothy", "Jason", "Jeffrey", "Ryan",
+                "Jacob", "Gary", "Nicholas", "Eric", "Jonathan", "Stephen", "Larry", "Justin", "Scott", "Brandon",
+                "Benjamin", "Samuel", "Gregory", "Alexander", "Patrick", "Frank", "Raymond", "Jack", "Dennis", "Jerry",
+                "Tyler", "Aaron", "Jose", "Adam", "Nathan", "Henry", "Douglas", "Zachary", "Peter", "Kyle",
+                "Walter", "Ethan", "Jeremy", "Harold", "Keith", "Christian", "Roger", "Noah", "Gerald", "Carl",
+                "Terry", "Sean", "Austin", "Arthur", "Lawrence", "Jesse", "Dylan", "Bryan", "Joe", "Jordan",
+                "Billy", "Bruce", "Albert", "Willie", "Gabriel", "Logan", "Alan", "Juan", "Wayne", "Roy",
+                "Ralph", "Randy", "Eugene", "Vincent", "Russell", "Louis", "Philip", "Bobby", "Johnny", "Bradley"
+        };
+
+        Random random = new Random();
+        return maleNames[random.nextInt(maleNames.length)];
+    }
+
+    public static String getFemaleName(){
+        String[] femaleNames = {
+                "Mary", "Patricia", "Jennifer", "Linda", "Elizabeth", "Barbara", "Susan", "Jessica", "Sarah", "Karen",
+                "Nancy", "Lisa", "Betty", "Margaret", "Sandra", "Ashley", "Kimberly", "Emily", "Donna", "Michelle",
+                "Carol", "Amanda", "Melissa", "Deborah", "Stephanie", "Rebecca", "Laura", "Sharon", "Cynthia", "Kathleen",
+                "Amy", "Shirley", "Angela", "Helen", "Anna", "Brenda", "Pamela", "Nicole", "Samantha", "Katherine",
+                "Christine", "Debra", "Rachel", "Catherine", "Carolyn", "Janet", "Ruth", "Maria", "Heather", "Diane",
+                "Virginia", "Julie", "Joyce", "Victoria", "Kelly", "Christina", "Lauren", "Joan", "Evelyn", "Judith",
+                "Olivia", "Frances", "Martha", "Cheryl", "Megan", "Andrea", "Hannah", "Jacqueline", "Ann", "Gloria",
+                "Jean", "Kathryn", "Alice", "Teresa", "Sara", "Janice", "Doris", "Madison", "Julia", "Grace",
+                "Judy", "Abigail", "Marie", "Denise", "Beverly", "Amber", "Theresa", "Marilyn", "Danielle", "Diana",
+                "Brittany", "Natalie", "Sophia", "Rose", "Isabella", "Alexis", "Kayla", "Charlotte", "Faith", "Alyssa"
+        };
+
+        Random random = new Random();
+        return femaleNames[random.nextInt(femaleNames.length)];
+    }
+}

src/engine/ZergMehcanics/MineAntiZerg.java

@@ -0,0 +1,116 @@
+package engine.ZergMehcanics;
+
+import engine.InterestManagement.WorldGrid;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.ZergManager;
+import engine.objects.*;
+import engine.server.MBServerStatics;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class MineAntiZerg {
+
+    public static HashMap<Mine,HashMap<PlayerCharacter,Long>> leaveTimers = new HashMap<>();
+    public static HashMap<Mine,ArrayList<PlayerCharacter>> currentPlayers = new HashMap<>();
+
+    public static void runMines(){
+        for(Mine mine : Mine.getMines()){
+
+            Building tower = BuildingManager.getBuildingFromCache(mine.getBuildingID());
+
+            if(tower == null)
+                continue;
+
+            if(!mine.isActive)
+                continue;
+
+            logPlayersPresent(tower,mine);
+
+            auditPlayersPresent(tower,mine);
+
+            auditPlayers(mine);
+        }
+    }
+
+    public static void logPlayersPresent(Building tower, Mine mine){
+        HashSet<AbstractWorldObject> loadedPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, MBServerStatics.CHARACTER_LOAD_RANGE * 3,MBServerStatics.MASK_PLAYER);
+
+        ArrayList<PlayerCharacter> playersPresent = new ArrayList<>();
+        for(AbstractWorldObject player : loadedPlayers){
+            playersPresent.add((PlayerCharacter)player);
+        }
+
+        currentPlayers.put(mine,playersPresent);
+    }
+
+    public static void auditPlayersPresent(Building tower, Mine mine){
+        HashSet<AbstractWorldObject> loadedPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, MBServerStatics.CHARACTER_LOAD_RANGE * 3,MBServerStatics.MASK_PLAYER);
+
+        ArrayList<PlayerCharacter> toRemove = new ArrayList<>();
+
+        for(PlayerCharacter player : currentPlayers.get(mine)){
+            if(!loadedPlayers.contains(player)){
+                toRemove.add(player);
+            }
+        }
+
+        currentPlayers.get(mine).removeAll(toRemove);
+
+        for(PlayerCharacter player : toRemove){
+            if(leaveTimers.containsKey(mine)){
+                leaveTimers.get(mine).put(player,System.currentTimeMillis());
+            }else{
+                HashMap<PlayerCharacter,Long> leaveTime = new HashMap<>();
+                leaveTime.put(player,System.currentTimeMillis());
+                leaveTimers.put(mine,leaveTime);
+            }
+        }
+
+        toRemove.clear();
+
+        for(PlayerCharacter player : leaveTimers.get(mine).keySet()){
+            long timeGone = System.currentTimeMillis() - leaveTimers.get(mine).get(player);
+            if(timeGone > 180000L) {//3 minutes
+                toRemove.add(player);
+                player.ZergMultiplier = 1.0f;
+            }
+        }
+
+        for(PlayerCharacter player : toRemove) {
+            leaveTimers.get(mine).remove(player);
+        }
+    }
+
+    public static void auditPlayers(Mine mine){
+
+        HashMap<Guild,ArrayList<PlayerCharacter>> playersByNation = new HashMap<>();
+
+        for(PlayerCharacter player : currentPlayers.get(mine)){
+            if(playersByNation.containsKey(player.guild.getNation())){
+                playersByNation.get(player.guild.getNation()).add(player);
+            }else{
+                ArrayList<PlayerCharacter> players = new ArrayList<>();
+                players.add(player);
+                playersByNation.put(player.guild.getNation(),players);
+            }
+        }
+
+        for(PlayerCharacter player : leaveTimers.get(mine).keySet()){
+            if(playersByNation.containsKey(player.guild.getNation())){
+                playersByNation.get(player.guild.getNation()).add(player);
+            }else{
+                ArrayList<PlayerCharacter> players = new ArrayList<>();
+                players.add(player);
+                playersByNation.put(player.guild.getNation(),players);
+            }
+        }
+
+        for(Guild nation : playersByNation.keySet()){
+            for(PlayerCharacter player : playersByNation.get(nation)){
+                player.ZergMultiplier = ZergManager.getCurrentMultiplier(playersByNation.get(nation).size(), mine.capSize);
+            }
+        }
+    }
+}

src/engine/db/handlers/dbAccountHandler.java

@@ -13,6 +13,8 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
+import engine.net.DispatchMessage;
+import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.Account;
 import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
@@ -77,18 +79,24 @@ public class dbAccountHandler extends dbHandlerBase {
         }
     }
 
-    public void SET_TRASH(String machineID) {
-
+    public void SET_TRASH(String machineID, String type) {
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO dyn_trash(`machineID`, `count`)"
-                     + " VALUES (?, 1) ON DUPLICATE KEY UPDATE `count` = `count` + 1;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement(
+                     "INSERT INTO dyn_trash(`machineID`, `count`, `type`)"
+                             + " VALUES (?, 1, ?) ON DUPLICATE KEY UPDATE `count` = `count` + 1;")) {
 
             preparedStatement.setString(1, machineID);
+            preparedStatement.setString(2, type);
             preparedStatement.execute();
 
         } catch (SQLException e) {
             Logger.error(e);
         }
+
+        ChatSystemMsg chatMsg = new ChatSystemMsg(null, "Account: " + machineID + " has been kicked from game for cheating");
+        chatMsg.setMessageType(10);
+        chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+        DispatchMessage.dispatchMsgToAll(chatMsg);
     }
 
     public ArrayList<String> GET_TRASH_LIST() {

src/engine/devcmd/cmds/InfoCmd.java

@@ -335,15 +335,18 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "Movement State: " + targetPC.getMovementState().name();
                 output += newline;
                 output += "Movement Speed: " + targetPC.getSpeed();
-
+                output += newline;
                 output += "Altitude : " + targetPC.getLoc().y;
-
+                output += newline;
                 output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
                 output += newline;
-                output += "Zerg Multiplier : " + targetPC.ZergMultiplier+ newline;
-                output += "Hidden : " + targetPC.getHidden();
+                output += "Zerg Multiplier : " + targetPC.ZergMultiplier + newline;
+                output += "Hidden : " + targetPC.getHidden() + newline;
+                output += "Target Loc: " + targetPC.loc + newline;
+                output += "Player Loc: " + pc.loc + newline;
+                output += "Distance Squared: " + pc.loc.distanceSquared(targetPC.loc);
                 break;
 
             case NPC:

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
 
 import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PowersManager;
 import engine.objects.*;
 
 import java.util.HashMap;
@@ -86,6 +87,12 @@ public class PrintStatsCmd extends AbstractDevCmd {
         newOut += "MAX: " + tar.combatStats.maxDamageHandTwo + newline;
         newOut += "RANGE: " + tar.combatStats.rangeHandTwo + newline;
         newOut += "ATTACK SPEED: " + tar.combatStats.attackSpeedHandTwo + newline;
+        newOut += "=== POWERS ===" + newline;
+        for(CharacterPower power : pc.getPowers().values()){
+            if(power.getPower().requiresHitRoll) {
+                newOut += power.getPower().name + " ATR: " + Math.round(PlayerCombatStats.getSpellAtr(pc,power.getPower())) + newline;
+            }
+        }
         throwbackInfo(pc, newOut);
     }
 

src/engine/devcmd/cmds/RebootCmd.java

@@ -1,8 +1,12 @@
 package engine.devcmd.cmds;
 
+import engine.Enum;
+import engine.InterestManagement.WorldGrid;
+import engine.PlayerAi;
 import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 /**
@@ -24,12 +28,25 @@ public class RebootCmd extends AbstractDevCmd {
     protected void _doCmd(PlayerCharacter pc, String[] args,
                           AbstractGameObject target) {
 
-        try {
-            Runtime rt = Runtime.getRuntime();
-            rt.exec("./mbrestart.sh");
-        } catch (java.io.IOException err) {
-            Logger.info(err.getMessage());
-        }
+        //try {
+        //    Runtime rt = Runtime.getRuntime();
+        //    rt.exec("./mbrestart.sh");
+        //} catch (java.io.IOException err) {
+        //    Logger.info(err.getMessage());
+        //}
+
+        PlayerCharacter newPLayer = new PlayerCharacter("AiPlayer", "AI POWERED", (short) 5, (short) 5, (short) 5, (short) 5,
+                (short) 5, Guild.getErrantGuild(), (byte) 0, (Account) null, Race.getRace(1999), BaseClass.getBaseClass(2500)
+                , (byte) 1, (byte) 1,
+                (byte) 1, (byte) 1, (byte) 1);
+
+        newPLayer.runAfterLoad();
+        newPLayer.setLoc(pc.loc);
+
+        newPLayer.setObjectTypeMask(MBServerStatics.MASK_PLAYER);
+        WorldGrid.addObject(newPLayer,pc.loc.x,pc.loc.z);
+        //WorldGrid.updateObject(newPLayer);
+        PlayerAi.addPlayer(newPLayer);
 
     }
 

src/engine/gameManager/CombatManager.java

@@ -26,7 +26,6 @@ import engine.powers.effectmodifiers.WeaponProcEffectModifier;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
-import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -463,6 +462,17 @@ public enum CombatManager {
 
             //Range check.
 
+            if(abstractCharacter.isMoving()){
+                range += (abstractCharacter.getSpeed() * 0.1f);
+            }
+
+            if(AbstractWorldObject.IsAbstractCharacter(target)) {
+                AbstractCharacter tarAc = (AbstractCharacter) target;
+                if(tarAc != null && tarAc.isMoving()){
+                    range += (tarAc.getSpeed() * 0.1f);
+                }
+            }
+
             if (NotInRange(abstractCharacter, target, range)) {
 
                 //target is in stealth and can't be seen by source
@@ -555,8 +565,12 @@ public enum CombatManager {
 
             if (target == null)
                 return;
+
             if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
                 PlayerCharacter pc = (PlayerCharacter) ac;
+                if( pc.combatStats == null){
+                    pc.combatStats = new PlayerCombatStats(pc);
+                }
                 pc.combatStats.calculateATR(true);
                 pc.combatStats.calculateATR(false);
                 if (mainHand) {
@@ -730,6 +744,18 @@ public enum CombatManager {
 
                         PlayerBonuses bonus = ac.getBonuses();
                         float attackRange = getWeaponRange(wb, bonus);
+
+                        if(ac.isMoving()){
+                            attackRange += (ac.getSpeed() * 0.1f);
+                        }
+
+                        if(AbstractWorldObject.IsAbstractCharacter(target)) {
+                            //AbstractCharacter tarAc = (AbstractCharacter) target;
+                            if(tarAc != null && tarAc.isMoving()){
+                                attackRange += (tarAc.getSpeed() * 0.1f);
+                            }
+                        }
+
                         if(specialCaseHitRoll(dpj.getPowerToken())) {
                             if(hitLanded) {
                                 dpj.attack(target, attackRange);
@@ -751,6 +777,18 @@ public enum CombatManager {
 
                     if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
                         float attackRange = getWeaponRange(wb, bonuses);
+
+                        if(ac.isMoving()){
+                            attackRange += (ac.getSpeed() * 0.1f);
+                        }
+
+                        if(AbstractWorldObject.IsAbstractCharacter(target)) {
+                            //AbstractCharacter tarAc = (AbstractCharacter) target;
+                            if(tarAc != null && tarAc.isMoving()){
+                                attackRange += (tarAc.getSpeed() * 0.1f);
+                            }
+                        }
+
                         if(specialCaseHitRoll(dpj.getPowerToken())) {
                             if(hitLanded) {
                                 dpj.attack(target, attackRange);
@@ -869,12 +907,12 @@ public enum CombatManager {
                     for(Effect eff : weapon.effects.values()){
                         for(AbstractEffectModifier mod : eff.getEffectModifiers()){
                             if(mod.modType.equals(ModType.ArmorPiercing)){
-                                armorPierce += mod.minMod * (mod.getRamp() * eff.getTrains());
+                                armorPierce += mod.getPercentMod() + (mod.getRamp() * eff.getTrains());
                             }
                         }
                     }
                     if(armorPierce > 0){
-                        damage *= 1 - armorPierce;
+                        damage *= 1 + (armorPierce * 0.01f);
                     }
                 }
 
@@ -899,6 +937,8 @@ public enum CombatManager {
                     if (tarAc.getHealth() > 0)
                         d = tarAc.modifyHealth(-damage, ac, false);
 
+                    tarAc.cancelOnTakeDamage();
+
                 } else if (target.getObjectType().equals(GameObjectType.Building)) {
 
                     if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
@@ -972,6 +1012,19 @@ public enum CombatManager {
                         if (wp.requiresHitRoll() == false) {
                             PlayerBonuses bonus = ac.getBonuses();
                             float attackRange = getWeaponRange(wb, bonus);
+
+                            if(ac.isMoving()){
+                                attackRange += (ac.getSpeed() * 0.1f);
+                            }
+
+                            if(AbstractWorldObject.IsAbstractCharacter(target)) {
+                                AbstractCharacter tarAc = (AbstractCharacter) target;
+                                if(tarAc != null && tarAc.isMoving()){
+                                    attackRange += (tarAc.getSpeed() * 0.1f);
+                                }
+                            }
+
+
                             if(specialCaseHitRoll(dpj.getPowerToken())) {
                                 if(hitLanded) {
                                     dpj.attack(target, attackRange);
@@ -1016,6 +1069,12 @@ public enum CombatManager {
 
         AbstractCharacter tar = (AbstractCharacter) target;
 
+        if(target.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            PlayerCharacter pc = (PlayerCharacter) target;
+            if(pc.getRaceID() == 1999)
+                return true;
+        }
+
         CharacterItemManager acItem = ac.getCharItemManager();
         CharacterItemManager tarItem = tar.getCharItemManager();
 

src/engine/gameManager/LootManager.java

@@ -14,6 +14,7 @@ import engine.net.DispatchMessage;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.*;
+import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -42,6 +43,15 @@ public enum LootManager {
     public static final ArrayList<Integer> vorg_cloth_uuids = new ArrayList<>(Arrays.asList(27600,188700,188720,189550,189560));
     public static final ArrayList<Integer> racial_guard_uuids = new ArrayList<>(Arrays.asList(841,951,952,1050,1052,1180,1182,1250,1252,1350,1352,1450,1452,1500,1502,1525,1527,1550,1552,1575,1577,1600,1602,1650,1652,1700,980100,980102));
 
+    public static final ArrayList<Integer> static_rune_ids = new ArrayList<>(Arrays.asList(
+            250001, 250002, 250003, 250004, 250005, 250006, 250007, 250008, 250010, 250011,
+            250012, 250013, 250014, 250015, 250016, 250017, 250019, 250020, 250021, 250022,
+            250023, 250024, 250025, 250026, 250028, 250029, 250030, 250031, 250032, 250033,
+            250034, 250035, 250037, 250038, 250039, 250040, 250041, 250042, 250043, 250044,
+            250115, 250118, 250119, 250120, 250121, 250122, 252123, 252124, 252125, 252126,
+            252127
+    ));
+
     // Drop Rates
 
     public static float NORMAL_DROP_RATE;
@@ -258,33 +268,40 @@ public enum LootManager {
     }
 
     public static void SpecialCaseRuneDrop(Mob mob,ArrayList<BootySetEntry> entries){
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
-        }
+        //int lootTableID = 0;
+        //for(BootySetEntry entry : entries){
+        //    if(entry.bootyType.equals("LOOT")){
+        //        lootTableID = entry.genTable;
+        //        break;
+        //    }
+        //}
 
-        if(lootTableID == 0)
-            return;
+       // if(lootTableID == 0)
+       //     return;
 
-        int RuneTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
+        //int RuneTableID = 0;
+        //for(GenTableEntry entry : _genTables.get(lootTableID)){
+        //    try {
+        //        if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RUNE)) {
+        //            RuneTableID = entry.itemTableID;
+        //            break;
+        //        }
+        //    }catch(Exception e){
+
+        //    }
+        //}
+
+        //if(RuneTableID == 0)
+        //    return;
+
+        int roll = ThreadLocalRandom.current().nextInt(static_rune_ids.size() + 1);
+        int itemId = static_rune_ids.get(0);
         try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RUNE)) {
-                    RuneTableID = entry.itemTableID;
-                    break;
-                }
+            itemId = static_rune_ids.get(roll);
         }catch(Exception e){
 
         }
-        }
-
-        if(RuneTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(RuneTableID));
+        ItemBase ib = ItemBase.getItemBase(itemId);
         if(ib != null){
             MobLoot toAdd = new MobLoot(mob,ib,false);
             mob.getCharItemManager().addItemToInventory(toAdd);
@@ -460,7 +477,27 @@ public enum LootManager {
         if (suffixMod == null)
             return inItem;
 
-        if (suffixMod.action.length() > 0) {
+        int moveSpeedRoll = ThreadLocalRandom.current().nextInt(100);
+        if(inItem.getItemBase().getValidSlot() == MBServerStatics.SLOT_FEET && moveSpeedRoll < 10){
+            int rankRoll = ThreadLocalRandom.current().nextInt(10);
+            String suffixSpeed = "SUF-148";
+            switch(rankRoll) {
+                case 1:
+                case 2:
+                case 3:
+                    suffixSpeed = "SUF-149";
+                    break;
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                    suffixSpeed = "SUF-150";
+                    break;
+
+            }
+            inItem.setSuffix(suffixSpeed);
+            inItem.addPermanentEnchantment(suffixSpeed, 0, suffixMod.level, false);
+        }else if (suffixMod.action.length() > 0) {
             inItem.setSuffix(suffixMod.action);
             inItem.addPermanentEnchantment(suffixMod.action, 0, suffixMod.level, false);
         }
@@ -572,7 +609,7 @@ public enum LootManager {
                 ItemBase itemBase = me.getItemBase();
                 if(isVorg) {
                     mob.spawnTime = ThreadLocalRandom.current().nextInt(300, 2700);
-                    dropChance = 10;
+                    dropChance = 7.5f;
                     itemBase = getRandomVorg(itemBase);
                 }
                 if (equipmentRoll > dropChance)
@@ -605,6 +642,82 @@ public enum LootManager {
         }
     }
 
+    public static void newFatePeddler(PlayerCharacter playerCharacter, Item gift) {
+
+        CharacterItemManager itemMan = playerCharacter.getCharItemManager();
+
+        if (itemMan == null)
+            return;
+
+        //check if player owns the gift he is trying to open
+
+        if (!itemMan.doesCharOwnThisItem(gift.getObjectUUID()))
+            return;
+
+        ItemBase ib = gift.getItemBase();
+
+        MobLoot winnings = null;
+
+        if (ib == null)
+            return;
+        switch (ib.getUUID()) {
+            case 971070: //wrapped rune
+                ItemBase runeBase = null;
+                int roll = ThreadLocalRandom.current().nextInt(static_rune_ids.size() + 1);
+                int itemId = static_rune_ids.get(0);
+                try {
+                    itemId = static_rune_ids.get(roll);
+                }catch(Exception e){
+
+                }
+                runeBase = ItemBase.getItemBase(itemId);
+                if(runeBase != null) {
+                    winnings = new MobLoot(playerCharacter, runeBase, 1, false);
+                }
+                break;
+            case 971012: //wrapped glass
+                int chance = ThreadLocalRandom.current().nextInt(100);
+                if(chance == 50){
+                    int ID = 7000000;
+                    int additional = ThreadLocalRandom.current().nextInt(0,28);
+                    ID += (additional * 10);
+                    ItemBase glassBase = ItemBase.getItemBase(ID);
+                    if(glassBase != null) {
+                        winnings = new MobLoot(playerCharacter, glassBase, 1, false);
+                        ChatManager.chatSystemInfo(playerCharacter, "You've Won A " + glassBase.getName());
+                    }
+                }else{
+                    ChatManager.chatSystemInfo(playerCharacter, "Please Try Again!");
+                }
+                break;
+        }
+
+        if (winnings == null) {
+            itemMan.consume(gift);
+            itemMan.updateInventory();
+            return;
+        }
+
+        //early exit if the inventory of the player will not hold the item
+
+        if (!itemMan.hasRoomInventory(winnings.getItemBase().getWeight())) {
+            ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
+            return;
+        }
+
+        winnings.setIsID(true);
+
+        //remove gift from inventory
+
+        itemMan.consume(gift);
+
+        //add winnings to player inventory
+
+        Item playerWinnings = winnings.promoteToItem(playerCharacter);
+        itemMan.addItemToInventory(playerWinnings);
+        itemMan.updateInventory();
+
+    }
     public static void peddleFate(PlayerCharacter playerCharacter, Item gift) {
 
         //get table ID for the itembase ID
@@ -708,7 +821,7 @@ public enum LootManager {
     public static ItemBase getRandomVorg(ItemBase itemBase){
         int roll = 0;
         if(vorg_ha_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            roll = ThreadLocalRandom.current().nextInt(0, 9);
             switch (roll) {
                 case 1:
                     return ItemBase.getItemBase(vorg_ha_uuids.get(0));
@@ -732,7 +845,7 @@ public enum LootManager {
         }
 
         if(vorg_ma_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            roll = ThreadLocalRandom.current().nextInt(0, 8);
             switch (roll) {
                 case 1:
                     return ItemBase.getItemBase(vorg_ma_uuids.get(0));
@@ -754,7 +867,7 @@ public enum LootManager {
         }
 
         if(vorg_la_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            roll = ThreadLocalRandom.current().nextInt(0, 8);
             switch (roll) {
                 case 1:
                     return ItemBase.getItemBase(vorg_la_uuids.get(0));
@@ -776,7 +889,7 @@ public enum LootManager {
         }
 
         if(vorg_cloth_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            roll = ThreadLocalRandom.current().nextInt(0, 5);
             switch (roll) {
                 case 1:
                     return ItemBase.getItemBase(vorg_cloth_uuids.get(0));

src/engine/gameManager/PowersManager.java

@@ -177,6 +177,12 @@ public enum PowersManager {
 
         if(msg.getPowerUsedID() == 429429978){
             applyPower(origin.getPlayerCharacter(),origin.getPlayerCharacter(),origin.getPlayerCharacter().getLoc(),429429978,msg.getNumTrains(),false);
+            origin.getPlayerCharacter().getRecycleTimers().remove(429429978);
+            return;
+        }
+
+        if(!origin.getPlayerCharacter().getPowers().containsKey(msg.getPowerUsedID())){
+            Logger.error(origin.getPlayerCharacter().getFirstName() + " attempted to cast a power they do not have");
             return;
         }
 
@@ -825,7 +831,6 @@ public enum PowersManager {
         if (playerCharacter == null || msg == null)
             return;
 
-
         //handle sprint for bard sprint
         if(msg.getPowerUsedID() == 429005674){
             msg.setPowerUsedID(429611355);
@@ -851,7 +856,7 @@ public enum PowersManager {
         if(msg.getTargetType() == GameObjectType.PlayerCharacter.ordinal()) {
             PlayerCharacter target = PlayerCharacter.getPlayerCharacter(msg.getTargetID());
             if (msg.getPowerUsedID() == 429601664)
-                if(target.getPromotionClassID() != 2516)
+                if(target.getPromotionClassID() != 2516)//templar
                     PlayerCharacter.getPlayerCharacter(msg.getTargetID()).removeEffectBySource(EffectSourceType.Transform, msg.getNumTrains(), true);
         }
 
@@ -896,6 +901,9 @@ public enum PowersManager {
             return;
         }
 
+        if(pb.targetSelf)
+            msg.setTargetID(playerCharacter.getObjectUUID());
+
         int trains = msg.getNumTrains();
 
         // verify player is not stunned or power type is blocked
@@ -1623,18 +1631,28 @@ public enum PowersManager {
 
         // create list of characters
         HashSet<AbstractCharacter> trackChars;
-        switch(msg.getPowerToken()){
-            case 431511776:
-            case 429578587:
-            case 429503360:
-            case 44106356:
+
+        PowersBase trackPower = PowersManager.getPowerByToken(msg.getPowerToken());
+        if(trackPower != null && trackPower.category.equals("TRACK")){
             trackChars = getTrackList(playerCharacter);
-                break;
-            default:
+        }else{
             trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
-                break;
         }
 
+
+
+        //switch(msg.getPowerToken()){
+        //    case 431511776: // Hunt Foe Huntress
+        //    case 429578587: // Hunt Foe Scout
+        //    case 429503360: // Track Huntsman
+        //    case 44106356: //
+        //        trackChars = getTrackList(playerCharacter);
+        //        break;
+        //    default:
+        //        trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
+        //        break;
+        //}
+
         TrackWindowMsg trackWindowMsg = new TrackWindowMsg(msg);
 
         // send track window
@@ -2425,7 +2443,8 @@ public enum PowersManager {
     public static boolean testAttack(PlayerCharacter pc, AbstractWorldObject awo,
                                      PowersBase pb, PerformActionMsg msg) {
         // Get defense for target
-        float atr = CharacterSkill.getATR(pc, pb.getSkillName());
+        //float atr = CharacterSkill.getATR(pc, pb.getSkillName());
+        float atr = PlayerCombatStats.getSpellAtr(pc, pb);
         float defense;
 
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {
@@ -3030,6 +3049,7 @@ public enum PowersManager {
             case 429502507:
             case 428398816:
             case 429446315:
+            case 429441979:
                 return false;
         }
         return true;

src/engine/mobileAI/MobAI.java

@@ -620,9 +620,6 @@ public class MobAI {
 
             if (mob == null)
                 return;
-            if(mob.isAlive())
-                if(!mob.getMovementLoc().equals(Vector3fImmutable.ZERO))
-                    mob.setLoc(mob.getMovementLoc());
 
             if (mob.getTimestamps().containsKey("lastExecution") == false)
                 mob.getTimestamps().put("lastExecution", System.currentTimeMillis());
@@ -678,6 +675,10 @@ public class MobAI {
                 return;
             }
 
+            if(mob.isAlive())
+                if(!mob.getMovementLoc().equals(Vector3fImmutable.ZERO))
+                    mob.setLoc(mob.getMovementLoc());
+
             if(mob.isPet() == false && mob.isPlayerGuard == false)
                 CheckToSendMobHome(mob);
 

src/engine/mobileAI/MobBehaviours/Pet.java

@@ -0,0 +1,33 @@
+package engine.mobileAI.MobBehaviours;
+
+import engine.gameManager.ZoneManager;
+import engine.mobileAI.utilities.MovementUtilities;
+import engine.objects.Mob;
+import org.pmw.tinylog.Logger;
+
+public class Pet {
+
+    public static void run(Mob pet){
+
+        try {
+
+            if(StaticBehaviours.EarlyExit(pet))
+                return;
+
+            if (pet.getOwner() == null && pet.isNecroPet() == false && pet.isSiege() == false)
+                if (ZoneManager.getSeaFloor().zoneMobSet.contains(pet))
+                    pet.killCharacter("no owner");
+
+            if(!pet.isSiege())
+                pet.BehaviourType.canRoam = true;
+
+
+            if (MovementUtilities.canMove(pet) && pet.BehaviourType.canRoam)
+                StaticBehaviours.CheckMobMovement(pet);
+
+            StaticBehaviours.CheckForAttack(pet);
+        } catch (Exception e) {
+            Logger.info(pet.getObjectUUID() + " " + pet.getName() + " Failed At: PetLogic" + " " + e.getMessage());
+        }
+    }
+}

src/engine/mobileAI/MobBehaviours/PlayerGuard.java

@@ -0,0 +1,146 @@
+package engine.mobileAI.MobBehaviours;
+
+import engine.Enum;
+import engine.objects.AbstractWorldObject;
+import engine.objects.Mob;
+import engine.objects.PlayerCharacter;
+import org.pmw.tinylog.Logger;
+
+public class PlayerGuard {
+
+    public static void run(Mob guard) {
+
+        if(StaticBehaviours.EarlyExit(guard))
+            return;
+
+        if (guard.mobPowers.isEmpty()) {
+            //mele
+            if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardWallArcher)) {
+                GuardWallArcherLogic(guard);
+            } else {
+                if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain)) {
+                    GuardCaptainLogic(guard);
+                } else if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion)) {
+                    GuardMinionLogic(guard);
+                }
+            }
+        } else {
+            //caster
+            if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain)) {
+                MagisterCaptainLogic(guard);
+            } else if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion)) {
+                MagisterMinionLogic(guard);
+            }
+        }
+    }
+
+    public static void GuardCaptainLogic(Mob mob) {
+
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+            if (mob.getCombatTarget() == null)
+                StaticBehaviours.CheckForPlayerGuardAggro(mob);
+
+            AbstractWorldObject newTarget = StaticBehaviours.ChangeTargetFromHateValue(mob);
+
+            if (newTarget != null) {
+
+                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
+                    if (StaticBehaviours.GuardCanAggro(mob, (PlayerCharacter) newTarget))
+                        mob.setCombatTarget(newTarget);
+                } else
+                    mob.setCombatTarget(newTarget);
+
+            }
+            StaticBehaviours.CheckMobMovement(mob);
+            StaticBehaviours.CheckForAttack(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void GuardMinionLogic(Mob mob) {
+
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+
+            boolean isComanded = mob.npcOwner.isAlive();
+            if (!isComanded) {
+                GuardCaptainLogic(mob);
+            }else {
+                if (mob.npcOwner.getCombatTarget() != null)
+                    mob.setCombatTarget(mob.npcOwner.getCombatTarget());
+                else
+                if (mob.getCombatTarget() != null)
+                    mob.setCombatTarget(null);
+            }
+            StaticBehaviours.CheckMobMovement(mob);
+            StaticBehaviours.CheckForAttack(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void GuardWallArcherLogic(Mob mob) {
+
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+
+            if (mob.getCombatTarget() == null)
+                StaticBehaviours.CheckForPlayerGuardAggro(mob);
+            else
+                StaticBehaviours.CheckForAttack(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void MagisterCaptainLogic(Mob mob){
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+            if (mob.getCombatTarget() == null)
+                StaticBehaviours.CheckForPlayerGuardAggro(mob);
+
+            AbstractWorldObject newTarget = StaticBehaviours.ChangeTargetFromHateValue(mob);
+
+            if (newTarget != null) {
+
+                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
+                    if (StaticBehaviours.GuardCanAggro(mob, (PlayerCharacter) newTarget))
+                        mob.setCombatTarget(newTarget);
+                } else
+                    mob.setCombatTarget(newTarget);
+
+            }
+            StaticBehaviours.CheckMobMovement(mob);
+            CheckForCast(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void MagisterMinionLogic(Mob mob){
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+
+            boolean isComanded = mob.npcOwner.isAlive();
+            if (!isComanded) {
+                MagisterCaptainLogic(mob);
+            }else {
+                if (mob.npcOwner.getCombatTarget() != null)
+                    mob.setCombatTarget(mob.npcOwner.getCombatTarget());
+                else
+                if (mob.getCombatTarget() != null)
+                    mob.setCombatTarget(null);
+            }
+            StaticBehaviours.CheckMobMovement(mob);
+            CheckForCast(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void CheckForCast(Mob mob){
+
+    }
+}

src/engine/mobileAI/MobBehaviours/SiegeEngine.java

@@ -0,0 +1,27 @@
+package engine.mobileAI.MobBehaviours;
+
+import engine.Enum;
+import engine.objects.Mob;
+
+public class SiegeEngine {
+
+    public static void run(Mob engine){
+
+        if(StaticBehaviours.EarlyExit(engine))
+            return;
+
+        if(engine.getOwner() == null)
+            return;
+
+        if(engine.combatTarget == null)
+            return;
+
+        if(engine.combatTarget.loc.distanceSquared(engine.loc) > engine.getRange() * engine.getRange())
+            return;
+
+        if(!engine.combatTarget.getObjectType().equals(Enum.GameObjectType.Building))
+            return;
+
+        StaticBehaviours.CheckForAttack(engine);
+    }
+}

src/engine/mobileAI/MobBehaviours/Standard.java

@@ -0,0 +1,53 @@
+package engine.mobileAI.MobBehaviours;
+
+import engine.Enum;
+import engine.objects.AbstractWorldObject;
+import engine.objects.Mob;
+import org.pmw.tinylog.Logger;
+
+public class Standard {
+
+    public static void run(Mob mob){
+
+        try {
+
+            if(StaticBehaviours.EarlyExit(mob))
+                return;
+
+            //check for players that can be aggroed if mob is agressive and has no target
+
+            if (mob.getCombatTarget() != null && !mob.playerAgroMap.containsKey(mob.getCombatTarget().getObjectUUID()))
+                mob.setCombatTarget(null);
+
+            if (mob.BehaviourType.isAgressive) {
+
+                AbstractWorldObject newTarget = StaticBehaviours.ChangeTargetFromHateValue(mob);
+
+                if (newTarget != null)
+                    mob.setCombatTarget(newTarget);
+                else {
+                    if (mob.getCombatTarget() == null) {
+                        if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard)
+                            StaticBehaviours.SafeGuardAggro(mob);  //safehold guard
+                        else
+                            StaticBehaviours.CheckForAggro(mob);   //normal aggro
+                    }
+                }
+            }
+
+            //check if mob can move for patrol or moving to target
+
+            if (mob.BehaviourType.canRoam)
+                StaticBehaviours.CheckMobMovement(mob);
+
+            //check if mob can attack if it isn't wimpy
+
+            if (!mob.BehaviourType.isWimpy && mob.getCombatTarget() != null)
+                StaticBehaviours.CheckForAttack(mob);
+
+
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DefaultLogic" + " " + e.getMessage());
+        }
+    }
+}

src/engine/mobileAI/Threads/MobAIThread.java

@@ -3,6 +3,7 @@ package engine.mobileAI.Threads;
 import engine.gameManager.ConfigManager;
 import engine.mobileAI.MobAI;
 import engine.gameManager.ZoneManager;
+import engine.mobileAI.MobBehaviours.StaticBehaviours;
 import engine.objects.Mob;
 import engine.objects.Zone;
 import engine.server.MBServerStatics;
@@ -33,7 +34,8 @@ public class MobAIThread implements Runnable{
                         for (Mob mob : zone.zoneMobSet) {
                             try {
                                 if (mob != null) {
-                                    MobAI.DetermineAction(mob);
+                                    //MobAI.DetermineAction(mob);
+                                    StaticBehaviours.runBehaviour(mob);
                                 }
                             } catch (Exception e) {
                                 Logger.error("Error processing Mob [Name: {}, UUID: {}]", mob.getName(), mob.getObjectUUID(), e);

src/engine/mobileAI/utilities/CombatUtilities.java

@@ -22,7 +22,6 @@ import org.pmw.tinylog.Logger;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static engine.math.FastMath.sqr;
-import static java.lang.Math.pow;
 
 public class CombatUtilities {
 
@@ -101,6 +100,14 @@ public class CombatUtilities {
         if (!target.isAlive())
             return;
 
+        if(agent.isPet()){
+            try{
+                damage *= agent.getOwner().ZergMultiplier;
+            }catch(Exception ignored){
+
+            }
+        }
+
         if (AbstractWorldObject.IsAbstractCharacter(target)) {
             //damage = Resists.handleFortitude((AbstractCharacter) target,DamageType.Crush,damage);
             trueDamage = ((AbstractCharacter) target).modifyHealth(-damage, agent, false);

src/engine/net/client/handlers/ObjectActionMsgHandler.java

@@ -424,9 +424,9 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             }
                             break;
                         case 31:
-                            LootManager.peddleFate(player,item);
+                            //LootManager.peddleFate(player,item);
+                            LootManager.newFatePeddler(player,item);
                             break;
-
                         case 30: //water bucket
                         case 8: //potions, tears of saedron
                         case 5: //runes, petition, warrant, scrolls

src/engine/net/client/msg/ApplyRuneMsg.java

@@ -78,6 +78,27 @@ public class ApplyRuneMsg extends ClientNetMsg {
         }
         int raceID = playerCharacter.getRaceID();
         //Check race is met
+
+        //confirm sub-race runes are applicable only by proper races
+        switch(runeID){
+            case 252134: //elf
+            case 252135: // elf
+            case 252136:  // elf
+                if(playerCharacter.getRaceID() != 2008 && playerCharacter.getRaceID() != 2009)
+                    return false;
+                break;
+            case 252129: // human
+            case 252130: // human
+            case 252131: // human
+            case 252132: // human
+            case 252133: // human
+                if(playerCharacter.getRaceID() != 2011 && playerCharacter.getRaceID() != 2012)
+                    return false;
+                break;
+
+        }
+
+
         ConcurrentHashMap<Integer, Boolean> races = rb.getRace();
         if(runeID != 3007 && runeID != 3014) {//bounty hunter and huntsman
             if (races.size() > 0) {

src/engine/objects/AbstractCharacter.java

@@ -1187,13 +1187,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
     public final float modifyHealth(float value, final AbstractCharacter attacker, final boolean fromCost) {
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        } // Health modifications are modified by the ZergMechanic
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        //} // Health modifications are modified by the ZergMechanic
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-            value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        }// Health modifications from pets are modified by the owner's ZergMechanic
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+        //    value *= ((Mob)attacker).getOwner().ZergMultiplier;
+        //}// Health modifications from pets are modified by the owner's ZergMechanic
 
         try {
 
@@ -1262,13 +1262,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             final boolean fromCost
     ) {
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        } // Health modifications are modified by the ZergMechanic
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        //} // Health modifications are modified by the ZergMechanic
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-            value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        }// Health modifications from pets are modified by the owner's ZergMechanic
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+        //    value *= ((Mob)attacker).getOwner().ZergMultiplier;
+        //}// Health modifications from pets are modified by the owner's ZergMechanic
 
         if (!this.isAlive()) {
             return 0f;
@@ -1309,13 +1309,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             final boolean fromCost
     ) {
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        } // Health modifications are modified by the ZergMechanic
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        //} // Health modifications are modified by the ZergMechanic
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-            value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        }// Health modifications from pets are modified by the owner's ZergMechanic
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+       //     value *= ((Mob)attacker).getOwner().ZergMultiplier;
+        //}// Health modifications from pets are modified by the owner's ZergMechanic
 
         if (!this.isAlive()) {
             return 0f;

src/engine/objects/AbstractGameObject.java

@@ -169,7 +169,7 @@ public abstract class AbstractGameObject {
         return this.objectUUID;
     }
 
-    protected void setObjectUUID(int objectUUID) {
+    public void setObjectUUID(int objectUUID) {
         this.objectUUID = objectUUID;
     }
 

src/engine/objects/AbstractWorldObject.java

@@ -15,6 +15,7 @@ import engine.Enum.GameObjectType;
 import engine.Enum.GridObjectType;
 import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.WorldGrid;
+import engine.gameManager.ZoneManager;
 import engine.job.AbstractScheduleJob;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
@@ -175,11 +176,11 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
         }
 
         //set players new altitude to region lerp altitude.
-        if (region != null)
-            if (region.center.y == region.highLerp.y)
-                worldObject.loc = worldObject.loc.setY(region.center.y + worldObject.getAltitude());
-            else
-                worldObject.loc = worldObject.loc.setY(region.lerpY(worldObject) + worldObject.getAltitude());
+        //if (region != null)
+        //    if (region.center.y == region.highLerp.y)
+        //        worldObject.loc = worldObject.loc.setY(region.center.y + worldObject.getAltitude());
+        //    else
+        //        worldObject.loc = worldObject.loc.setY(region.lerpY(worldObject) + worldObject.getAltitude());
 
         return region;
     }
@@ -500,8 +501,28 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             if (loc.x > MBServerStatics.MAX_WORLD_WIDTH || loc.z < MBServerStatics.MAX_WORLD_HEIGHT)
                 return;
             this.lastLoc = new Vector3fImmutable(this.loc);
+            if(AbstractCharacter.IsAbstractCharacter(this)){
+                float y;
+                float worldHeight = HeightMap.getWorldHeight(loc);
+                Zone zone = ZoneManager.findSmallestZone(loc);
+                if(zone != null && zone.isPlayerCity()){
+                    worldHeight = zone.getWorldAltitude();
+                }
+                if(this.region != null){
+                    float regionAlt = this.region.lerpY(this);
+                    float altitude = this.getAltitude();
+                    y = regionAlt + altitude + worldHeight;
+                }else{
+                    y = HeightMap.getWorldHeight(loc) + this.getAltitude();
+                }
+                Vector3fImmutable newLoc = new Vector3fImmutable(loc.x,y,loc.z);
+                this.loc = newLoc;
+                WorldGrid.addObject(this, newLoc.x, newLoc.z);
+                return;
+            }else{
                 this.loc = loc;
-            this.loc = this.loc.setY(HeightMap.getWorldHeight(this) + this.getAltitude());
+            }
+            //this.loc = this.loc.setY(HeightMap.getWorldHeight(this) + this.getAltitude());
 
             //lets not add mob to world grid if he is currently despawned.
             if (this.getObjectType().equals(GameObjectType.Mob) && ((Mob) this).despawned)
@@ -597,6 +618,8 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
     }
 
     public GridObjectType getGridObjectType() {
+        if(gridObjectType == null)
+            gridObjectType = GridObjectType.DYNAMIC;
         return gridObjectType;
     }
 

src/engine/objects/City.java

@@ -455,7 +455,7 @@ public class City extends AbstractWorldObject {
 
                         if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc))
                             cities.add(city); //verify nation or guild is same
-                    } else if (Guild.sameNationExcludeErrant(city.getGuild(), pcG))
+                    } else if (city.open && Guild.sameNationExcludeErrant(city.getGuild(), pcG))
                         cities.add(city);
 
                 } else if (city.isNpc == 1) {

src/engine/objects/Contract.java

@@ -16,6 +16,7 @@ import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.msg.CityDataMsg;
 import engine.net.client.msg.ErrorPopupMsg;
+import engine.net.client.msg.VendorDialogMsg;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -323,6 +324,12 @@ public class Contract extends AbstractGameObject {
         pc.charItemManager.updateInventory();
 
     }
+
+    public static boolean isClassTrainer(int id){
+        if(id >= 5 && id <= 30)
+            return true;
+        return false;
+    }
     public static VendorDialog HandleBaneCommanderOptions(int optionId, NPC npc, PlayerCharacter pc){
         pc.setLastNPCDialog(npc);
         VendorDialog vd = new VendorDialog(VendorDialog.getHostileVendorDialog().getDialogType(),VendorDialog.getHostileVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();
@@ -580,6 +587,19 @@ public class Contract extends AbstractGameObject {
             }
         }
 
+        if(this.getObjectUUID() == 1502050){
+            for(MobEquipment me : this.sellInventory){
+                switch(me.getItemBase().getUUID()) {
+                    case 971070:
+                        me.magicValue = 3000000;
+                        break;
+                    case 971012:
+                        me.magicValue = 1000000;
+                        break;
+                }
+            }
+        }
+
         if(this.getObjectUUID() == 1202){ //rune merchant
             for(MobEquipment me : this.sellInventory){
                 switch(me.getItemBase().getUUID()){

src/engine/objects/Experience.java

@@ -23,7 +23,7 @@ import static engine.gameManager.LootManager.LOOTMANAGER;
 public class Experience {
 
     private static final TreeMap<Integer, Integer> ExpToLevel;
-    private static final int[] LevelToExp = {Integer.MIN_VALUE, // Pad
+    public static final int[] LevelToExp = {Integer.MIN_VALUE, // Pad
             // everything
             // over 1
 
@@ -121,6 +121,8 @@ public class Experience {
             190585732,  // Level 77
             201714185,  // Level 78
             213319687,  // Level 79
+
+            // R8
             225415457,   // Level 80
             238014819   // Level 81
 
@@ -302,7 +304,7 @@ public class Experience {
             case Cyan:
                 return 0.9;
             case Green:
-                return 0.7;
+                return 0.8;
             default:
                 return 0;
         }
@@ -352,6 +354,14 @@ public class Experience {
         if(killer.pvpKills.contains(mob.getObjectUUID()))
             return;
 
+        if(true){
+            if(killer.combatStats == null)
+                killer.combatStats = new PlayerCombatStats(killer);
+
+            killer.combatStats.grantExperience(mob,g);
+            return;
+        }
+
         double grantedExperience = 0.0;
 
         if (g != null) { // Do group EXP stuff

src/engine/objects/ItemFactory.java

@@ -705,9 +705,11 @@ public class ItemFactory {
 
         int rollPrefix = ThreadLocalRandom.current().nextInt(1, 100 + 1);
 
-        if (rollPrefix < 80) {
+        if (rollPrefix < vendor.getLevel() + 30) {
 
             int randomPrefix = TableRoll(vendor.getLevel());
+            if(vendor.contract.getName().contains("Heavy") || vendor.contract.getName().contains("Medium") || vendor.contract.getName().contains("Leather"))
+                randomPrefix += vendor.level * 0.5f;
             prefixEntry = ModTableEntry.rollTable(prefixTypeTable.modTableID, randomPrefix);
 
             if (prefixEntry != null)
@@ -720,9 +722,11 @@ public class ItemFactory {
         // Always have at least one mod on a magic rolled item.
         // Suffix will be our backup plan.
 
-        if (rollSuffix < 80 || prefixEntry == null) {
+        if (rollSuffix < vendor.getLevel() + 30) {
 
             int randomSuffix = TableRoll(vendor.getLevel());
+            if(vendor.contract.getName().contains("Heavy") || vendor.contract.getName().contains("Medium") || vendor.contract.getName().contains("Leather"))
+                randomSuffix += vendor.level * 0.25f;
             suffixEntry = ModTableEntry.rollTable(suffixTypeTable.modTableID, randomSuffix);
 
             if (suffixEntry != null)
@@ -776,31 +780,31 @@ public class ItemFactory {
 
     public static int TableRoll(int vendorLevel) {
         // Calculate min and max based on mobLevel
-        int min = 60;
-        int max = 120;
+        int min = 100;
+        int max = 160;
         switch(vendorLevel){
             case 20:
-                min = 70;
-                max = 140;
-                break;
-            case 30:
-                min = 80;
-                max = 160;
-                break;
-            case 40:
-                min = 90;
+                min = 120;
                 max = 180;
                 break;
-            case 50:
-                min = 100;
+            case 30:
+                min = 140;
                 max = 200;
                 break;
+            case 40:
+                min = 160;
+                max = 220;
+                break;
+            case 50:
+                min = 180;
+                max = 240;
+                break;
             case 60:
-                min = 175;
+                min = 200;
                 max = 260;
                 break;
             case 70:
-                min = 220;
+                min = 240;
                 max = 320;
                 break;
         }

src/engine/objects/Mine.java

@@ -65,6 +65,7 @@ public class Mine extends AbstractGameObject {
     public boolean isStronghold = false;
     public ArrayList<Mob> strongholdMobs;
     public HashMap<Integer,Integer> oldBuildings;
+    public HashMap<Integer, Long> mineAttendees = new HashMap<>();
 
     /**
      * ResultSet Constructor
@@ -622,7 +623,7 @@ public class Mine extends AbstractGameObject {
 
         // Gather current list of players within the zone bounds
 
-        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, Enum.CityBoundsType.GRID.extents, MBServerStatics.MASK_PLAYER);
+        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, MBServerStatics.CHARACTER_LOAD_RANGE * 3, MBServerStatics.MASK_PLAYER);
         HashMap<Guild,ArrayList<PlayerCharacter>> charactersByNation = new HashMap<>();
         ArrayList<Guild> updatedNations = new ArrayList<>();
         for (AbstractWorldObject playerObject : currentPlayers) {
@@ -637,6 +638,7 @@ public class Mine extends AbstractGameObject {
 
             if(!this._playerMemory.contains(player.getObjectUUID())){
                 this._playerMemory.add(player.getObjectUUID());
+                ChatManager.chatSystemInfo(player,"You Have Entered an Active Mine Area");
             }
             Guild nation = player.guild.getNation();
             if(charactersByNation.containsKey(nation)){
@@ -655,6 +657,19 @@ public class Mine extends AbstractGameObject {
                 }
             }
         }
+
+        for(Integer id : this.mineAttendees.keySet()){
+            PlayerCharacter attendee = PlayerCharacter.getPlayerCharacter(id);
+            if(attendee == null)
+                continue;
+
+            if(charactersByNation.containsKey(attendee.guild.getNation())){
+                if(!charactersByNation.get(attendee.guild.getNation()).contains(attendee)){
+                    charactersByNation.get(attendee.guild.getNation()).add(attendee);
+                }
+            }
+
+        }
         for(Guild nation : updatedNations){
             float multiplier = ZergManager.getCurrentMultiplier(charactersByNation.get(nation).size(),this.capSize);
             for(PlayerCharacter player : charactersByNation.get(nation)){
@@ -676,18 +691,28 @@ public class Mine extends AbstractGameObject {
         if(tower == null)
             return;
         ArrayList<Integer>toRemove = new ArrayList<>();
-        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, Enum.CityBoundsType.GRID.extents, MBServerStatics.MASK_PLAYER);
+        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, MBServerStatics.CHARACTER_LOAD_RANGE * 3, MBServerStatics.MASK_PLAYER);
         for(Integer id : currentMemory){
             PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(id);
-            if(currentPlayers.contains(pc) == false){
-                toRemove.add(id);
+            if(!currentPlayers.contains(pc)){
+                if(this.mineAttendees.containsKey(id)){
+                    long timeGone = System.currentTimeMillis() - this.mineAttendees.get(id).longValue();
+                    if (timeGone > 180000L) { // 3 minutes
+                        toRemove.add(id); // Mark for removal
+                    }
+                }
                 pc.ZergMultiplier = 1.0f;
+            } else {
+                this.mineAttendees.put(id,System.currentTimeMillis());
             }
         }
 
         // Remove players from city memory
 
         _playerMemory.removeAll(toRemove);
+        for(int id : toRemove){
+            this.mineAttendees.remove(id);
+        }
     }
     public static Building getTower(Mine mine){
         Building tower = BuildingManager.getBuildingFromCache(mine.buildingID);

src/engine/objects/MobEquipment.java

@@ -274,14 +274,14 @@ public class MobEquipment extends AbstractGameObject {
                 EffectsBase effect = PowersManager.getEffectByToken(token);
 
                 AbstractPowerAction apa = PowersManager.getPowerActionByIDString(effect.getIDString());
-                if (apa.getEffectsBase() != null)
+                if (apa != null && apa.getEffectsBase() != null)
                     if (apa.getEffectsBase().getValue() > 0) {
                         //System.out.println(apa.getEffectsBase().getValue());
                         value += apa.getEffectsBase().getValue();
                     }
 
 
-                if (apa.getEffectsBase2() != null)
+                if (apa != null && apa.getEffectsBase2() != null)
                     value += apa.getEffectsBase2().getValue();
             }
 

src/engine/objects/NPC.java

@@ -876,6 +876,11 @@ public class NPC extends AbstractCharacter {
         // zone collection
 
         this.parentZone = ZoneManager.getZoneByUUID(this.parentZoneUUID);
+        if(this.parentZone == null) {
+            Logger.error("PARENT ZONE NOT IDENTIFIED FOR NPC : " + this.getObjectUUID());
+            return;
+        }
+
         this.parentZone.zoneNPCSet.remove(this);
         this.parentZone.zoneNPCSet.add(this);
 

src/engine/objects/PlayerCharacter.java

@@ -45,7 +45,6 @@ import engine.util.MiscUtils;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
-import javax.swing.*;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
@@ -183,6 +182,8 @@ public class PlayerCharacter extends AbstractCharacter {
 
     public PlayerCombatStats combatStats;
 
+    public Integer selectedUUID = 0;
+
     /**
      * No Id Constructor
      */
@@ -1534,27 +1535,50 @@ public class PlayerCharacter extends AbstractCharacter {
                 return true;
             Zone zone = ZoneManager.findSmallestZone(breather.getLoc());
 
+            if(zone == null)
+                return true;
+
+            if(zone.isPlayerCity())
+                return true;
+
+            float seaLevel = zone.getSeaLevel();
+
             if (zone.getSeaLevel() != 0) {
+                Zone parent = zone.getParent();
+                if(parent != null && parent.isMacroZone()){
+                    float parentLevel = parent.getSeaLevel();
+                    seaLevel -= parentLevel;
+                }
+
+                if(seaLevel == 0)
+                    return true;
 
                 float localAltitude = breather.getLoc().y;
+                float characterHeight = breather.characterHeight;
 
-
-                if (localAltitude + breather.characterHeight < zone.getSeaLevel() - 2)
-                    return false;
-
-                if (breather.isMoving()) {
-                    if (localAltitude + breather.characterHeight < zone.getSeaLevel())
+                if (localAltitude + characterHeight < seaLevel - 2) {
+                    //ChatManager.chatSystemInfo(breather, "YOU CANNOT BREATHE!");
                     return false;
                 }
-            } else {
-                if (breather.getLoc().y + breather.characterHeight < -2)
+                if (breather.isMoving()) {
+                    if (localAltitude + breather.characterHeight < zone.getSeaLevel()) {
+                        //ChatManager.chatSystemInfo(breather, "YOU CANNOT BREATHE!");
                         return false;
+                    }
+                }
+            } else {
+                if (breather.getLoc().y + breather.characterHeight < -2) {
+                    //ChatManager.chatSystemInfo(breather, "YOU CANNOT BREATHE!");
+                    return false;
+                }
 
                 if (breather.isMoving()) {
-                    if (breather.getLoc().y + breather.characterHeight < 0)
+                    if (breather.getLoc().y + breather.characterHeight < 0) {
+                        //ChatManager.chatSystemInfo(breather, "YOU CANNOT BREATHE!");
                         return false;
                     }
                 }
+            }
 
 
         } catch (Exception e) {
@@ -1845,6 +1869,11 @@ public class PlayerCharacter extends AbstractCharacter {
         message += " was killed by " + att.getFirstName();
         if (att.guild != null && (!(att.guild.getName().equals("Errant"))))
             message += " of " + att.guild.getName();
+
+        Zone killZone = ZoneManager.findSmallestZone(this.loc);
+        if(killZone != null){
+            message += " in " + killZone.getName();
+        }
         message += "!";
 
 
@@ -1964,8 +1993,7 @@ public class PlayerCharacter extends AbstractCharacter {
         this.altitude = (float) 0;
 
         // Release Mine Claims
-
-        Mine.releaseMineClaims(this);
+        //Mine.releaseMineClaims(this);
 
         this.getCharItemManager().closeTradeWindow();
 
@@ -4705,7 +4733,7 @@ public class PlayerCharacter extends AbstractCharacter {
         ModType modType = ModType.GetModType(type);
 
         // must be allowed to use this passive
-        if (!this.bonuses.getBool(modType, SourceType.None))
+        if (!this.bonuses.getBool(modType, SourceType.None) && this.getRaceID() != 1999)
             return 0f;
 
         // must not be stunned
@@ -4754,13 +4782,13 @@ public class PlayerCharacter extends AbstractCharacter {
                 if(this.bonuses != null)
                     blockChance *= 1 + this.bonuses.getFloatPercentAll(ModType.Block, SourceType.None);
                 return blockChance;
-
             case "Parry":
                 if(!fromCombat)
                     return 0;
 
                 if(mainHand == null && this.getRaceID() != 1999) // saetors can always parry using their horns
                     return 0;
+
                 int parryBonus = 0;
 
                 if(mainHand != null && offHand != null && !offHand.getItemBase().isShield())
@@ -5078,6 +5106,12 @@ public class PlayerCharacter extends AbstractCharacter {
 
             Zone zone = ZoneManager.findSmallestZone(this.getLoc());
 
+            if(zone == null)
+                return false;
+
+            if(zone.isPlayerCity())
+                return false;
+
             if (zone.getSeaLevel() != 0) {
 
                 float localAltitude = this.getLoc().y + this.centerHeight;
@@ -5115,43 +5149,13 @@ public class PlayerCharacter extends AbstractCharacter {
         if(!newSystem)
             return;
 
-        this.updateLocation();
-        this.updateMovementState();
-
         try {
 
             if (this.updateLock.writeLock().tryLock()) {
                 try {
-                    //if (!this.timestamps.contains("STAMHEALTICK")) {
-                     //   this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
-                    //}
-                    //if (this.containsEffect(441156455)) {
-                    //    long length = System.currentTimeMillis() - this.timestamps.get("STAMHEALTICK").longValue();
-                     //   if (length > 10000 ) {
-                     //       float stamIncrease = 6.5f;
-                     //       if (this.stamina.get() + stamIncrease > this.staminaMax)
-                     //           this.stamina.compareAndSet(this.stamina.get(), this.staminaMax);
-                     //       else
-                     //           this.stamina.compareAndSet(this.stamina.get(), this.stamina.get() + stamIncrease);
-                     //       this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
-                    //        ChatManager.chatSystemInfo(this, "Healed 7 Stamina");
-                    //    }
-                    //} else {
-                    //    this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
-                    //}
-
-                    if (!this.isAlive() && this.isEnteredWorld()) {
-                        if (!this.timestamps.containsKey("DeathTime")) {
-                            this.timestamps.put("DeathTime", System.currentTimeMillis());
-                        } else if ((System.currentTimeMillis() - this.timestamps.get("DeathTime")) > 600000)
-                            forceRespawn(this);
-                        return;
-                    }
 
                     if (this.isAlive() && this.isActive && this.enteredWorld) {
 
-                        this.updateMovementState();
-
                         if (this.combatStats == null) {
                             this.combatStats = new PlayerCombatStats(this);
                         } else {
@@ -5355,9 +5359,11 @@ public class PlayerCharacter extends AbstractCharacter {
             return;
         }
 
-        setLoc(newLoc);
+
         this.region = AbstractWorldObject.GetRegionByWorldObject(this);
 
+        setLoc(newLoc);
+
         if (this.getDebug(1))
             ChatManager.chatSystemInfo(this,
                     "Distance to target " + this.getEndLoc().distance2D(this.getLoc()) + " speed " + this.getSpeed());
@@ -5759,11 +5765,16 @@ public class PlayerCharacter extends AbstractCharacter {
                     } else {
                         healthRegen = 0;
                         manaRegen = 0;
+
+                        if(this.containsEffect(441156479) || this.containsEffect(441156455)) {
+                            stamRegen = MBServerStatics.STAMINA_REGEN_WALK;
+                        }else {
                             if (this.combat == true)
                                 stamRegen = MBServerStatics.STAMINA_REGEN_RUN_COMBAT;
                             else
                                 stamRegen = MBServerStatics.STAMINA_REGEN_RUN_NONCOMBAT;
                         }
+                    }
                     break;
                 case FLYING:
                     float seventyFive = this.staminaMax * .75f;

src/engine/objects/PlayerCombatStats.java

@@ -1,21 +1,16 @@
 package engine.objects;
 
 import engine.Enum;
-import engine.gameManager.ChatManager;
-import engine.math.Vector2f;
-import engine.math.Vector3fImmutable;
 import engine.powers.EffectsBase;
+import engine.powers.PowersBase;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
 import engine.server.MBServerStatics;
-import org.pmw.tinylog.Logger;
 
-import javax.swing.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class PlayerCombatStats {
 
@@ -26,7 +21,7 @@ public class PlayerCombatStats {
     public float attackSpeedHandOne;
     public float rangeHandOne;
     public float atrHandOne;
-    //off hand data
+    //offhand data
     public int minDamageHandTwo;
     public int maxDamageHandTwo;
     public float attackSpeedHandTwo;
@@ -254,18 +249,6 @@ public class PlayerCombatStats {
         HIT_VALUE_MAP.put(2.50f, 100f);
     }
 
-    //Values for health and mana are in terms of the number of seconds it takes to recover 1%
-    //Values for stamina are in terms of the number of seconds it takes to recover 1 point
-    //HEALTH//MANA//STAMINA
-    private static Vector3fImmutable resting = new Vector3fImmutable(3.0f,1.2f,0.5f);
-    private static Vector3fImmutable idling = new Vector3fImmutable(15.0f,6.0f,5.0f);
-    private static Vector3fImmutable walking = new Vector3fImmutable(20.0f,8.0f,0.0f);
-    private static Vector3fImmutable running = new Vector3fImmutable(0.0f,0.0f,0.0f);
-
-    //#Values for how fast mana is consumed.  The first is how fast when player is not in combat
-    //#mode, the second is when he IS in combat mode.  This is in Stamina reduction per second.
-    private static Vector2f consumption = new Vector2f(0.4f,0.65f);
-
     public PlayerCombatStats(PlayerCharacter pc) {
         this.owner = pc;
         this.update();
@@ -368,10 +351,10 @@ public class PlayerCombatStats {
         float masteryLevel = 0;
 
         if(this.owner.skills.containsKey(skill)) {
-            skillLevel = this.owner.skills.get(skill).getModifiedAmount();//calculateBuffedSkillLevel(skill,this.owner);//this.owner.skills.get(skill).getTotalSkillPercet();
+            skillLevel = this.owner.skills.get(skill).getModifiedAmount();
         }
         if(this.owner.skills.containsKey(mastery))
-            masteryLevel = this.owner.skills.get(mastery).getModifiedAmount();//calculateBuffedSkillLevel(mastery,this.owner);//this.owner.skills.get(mastery).getTotalSkillPercet();
+            masteryLevel = this.owner.skills.get(mastery).getModifiedAmount();
 
         float stanceValue = 0.0f;
         float atrEnchants = 0;
@@ -432,7 +415,7 @@ public class PlayerCombatStats {
                 preciseRune += 0.05f;
         }
 
-            atr = primaryStat / 2;
+            atr = primaryStat / 2.0f;
             atr += skillLevel * 4;
             atr += masteryLevel * 3;
             atr += prefixValues;
@@ -446,13 +429,16 @@ public class PlayerCombatStats {
             float modifier = 1 + (positivePercentBonuses + negativePercentBonuses);
             if(preciseRune > 1.0f)
                 modifier -= 0.05f;
-            if(stanceValue > 1.0f){
-                modifier -= (stanceValue - 1.0f);
+            if(stanceValue > 0.0f){
+                modifier -= (stanceValue);
             }
             atr *= modifier;
         }
             atr = (float) Math.round(atr);
 
+        if(atr < 0)
+            atr = 0;
+
         if(mainHand){
             this.atrHandOne = atr;
         }else{
@@ -490,7 +476,6 @@ public class PlayerCombatStats {
             skill = weapon.getItemBase().getSkillRequired();
             mastery = weapon.getItemBase().getMastery();
             if (weapon.getItemBase().isStrBased()) {
-                //primaryStat = this.owner.statStrCurrent;
                 //secondaryStat = specialDex;//getDexAfterPenalty(this.owner);
                 primaryStat = this.owner.statStrCurrent;
                 secondaryStat = this.owner.statDexCurrent;
@@ -536,14 +521,16 @@ public class PlayerCombatStats {
             this.minDamageHandOne = roundedMin;
         } else {
             this.minDamageHandTwo = roundedMin;
-            if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
-                if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
+            if(this.owner.charItemManager != null) {
+                if (this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null) {
+                    if (!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
                         this.minDamageHandOne = 0;
-            }else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
+                } else if (this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null) {
                     this.minDamageHandTwo = 0;
                 }
             }
         }
+    }
 
     public void calculateMax(boolean mainHand) {
         Item weapon;
@@ -612,16 +599,18 @@ public class PlayerCombatStats {
 
         if(mainHand){
             this.maxDamageHandOne = roundedMax;
-        }else{
+        }else {
+            if (this.owner.charItemManager != null) {
                 this.maxDamageHandTwo = roundedMax;
-            if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
-                if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
+                if (this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null) {
+                    if (!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
                         this.maxDamageHandOne = 0;
-            }else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
+                } else if (this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null) {
                     this.maxDamageHandTwo = 0;
                 }
             }
         }
+    }
 
     public void calculateAttackSpeed(boolean mainHand){
         Item weapon;
@@ -689,9 +678,9 @@ public class PlayerCombatStats {
         }
 
         float bonusValues = 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.AttackDelay,Enum.SourceType.None);//1.0f;
-        bonusValues -= stanceValue + delayExtra; // take away stance modifier from alac bonus values
+        bonusValues -= stanceValue + delayExtra; // take away stance modifier from alacrity bonus values
         speed *= 1 + stanceValue; // apply stance bonus
-        speed *= bonusValues; // apply alac bonuses without stance mod
+        speed *= bonusValues; // apply alacrity bonuses without stance mod
 
         if(speed < 10.0f)
             speed = 10.0f;
@@ -745,23 +734,23 @@ public class PlayerCombatStats {
         float armorSkill = 0.0f;
         float armorDefense = 0.0f;
         ArrayList<String> armorsUsed = new ArrayList<>();
-        int itemdef = 0;
+        int itemDef;
         for(Item equipped : this.owner.charItemManager.getEquipped().values()){
             ItemBase ib = equipped.getItemBase();
             if(ib.isHeavyArmor() || ib.isMediumArmor() || ib.isLightArmor() || ib.isClothArmor()){
-                itemdef = ib.getDefense();
+                itemDef = ib.getDefense();
 
                 for(Effect eff : equipped.effects.values()){
                     for(AbstractEffectModifier mod : eff.getEffectModifiers()){
                         if(mod.modType.equals(Enum.ModType.DR)){
-                            itemdef += mod.minMod + (mod.getRamp() * eff.getTrains());
+                            itemDef += mod.minMod + (mod.getRamp() * eff.getTrains());
                         }
                     }
                 }
                 if(!ib.isClothArmor() && !armorsUsed.contains(ib.getSkillRequired())) {
                     armorsUsed.add(ib.getSkillRequired());
                 }
-                armorDefense += itemdef;
+                armorDefense += itemDef;
             }
         }
         for(String armorUsed : armorsUsed){
@@ -846,6 +835,57 @@ public class PlayerCombatStats {
                 }
             }
         }
+
+        //right ring
+        if(this.owner.charItemManager != null){
+            if(this.owner.charItemManager.getEquipped(7) != null){
+                for(String effID : this.owner.charItemManager.getEquipped(7).effects.keySet()) {
+                    for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
+                        if (mod.modType.equals(Enum.ModType.DCV)) {
+                            if (mod.getPercentMod() == 0) {
+                                float value = mod.getMinMod();
+                                int trains = this.owner.effects.get(effID).getTrains();
+                                float modValue = value + (trains * mod.getRamp());
+                                flatBonuses += modValue;
+                            }
+                        }
+                    }
+                }
+            }
+
+            //left ring
+            if(this.owner.charItemManager.getEquipped(8) != null){
+                for(String effID : this.owner.charItemManager.getEquipped(8).effects.keySet()) {
+                    for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
+                        if (mod.modType.equals(Enum.ModType.DCV)) {
+                            if (mod.getPercentMod() == 0) {
+                                float value = mod.getMinMod();
+                                int trains = this.owner.effects.get(effID).getTrains();
+                                float modValue = value + (trains * mod.getRamp());
+                                flatBonuses += modValue;
+                            }
+                        }
+                    }
+                }
+            }
+
+            //necklace
+            if(this.owner.charItemManager.getEquipped(9) != null){
+                for(String effID : this.owner.charItemManager.getEquipped(9).effects.keySet()) {
+                    for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
+                        if (mod.modType.equals(Enum.ModType.DCV)) {
+                            if (mod.getPercentMod() == 0) {
+                                float value = mod.getMinMod();
+                                int trains = this.owner.effects.get(effID).getTrains();
+                                float modValue = value + (trains * mod.getRamp());
+                                flatBonuses += modValue;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         if(this.owner.charItemManager.getEquipped(2) == null)
             blockSkill = 0;
         else if(this.owner.charItemManager != null && this.owner.charItemManager.getEquipped(2) != null && !this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
@@ -868,6 +908,9 @@ public class PlayerCombatStats {
         }
         defense = Math.round(defense);
 
+        if(defense < 0)
+            defense = 0;
+
         this.defense = (int) defense;
     } // PERFECT DO NOT TOUCH
 
@@ -877,7 +920,7 @@ public class PlayerCombatStats {
         if(def == 0)
             return 100.0f;
 
-        float key = (float)((float)atr / def);
+        float key = ((float)atr / def);
         BigDecimal bd = new BigDecimal(key).setScale(2, RoundingMode.HALF_UP);
         key = bd.floatValue(); // handles rounding for mandatory 2 decimal places
         if(key < 0.40f)
@@ -887,4 +930,196 @@ public class PlayerCombatStats {
         return HIT_VALUE_MAP.get(key);
     }
 
+    public static float getSpellAtr(PlayerCharacter pc, PowersBase pb) {
+
+        if (pc == null)
+            return 0f;
+
+        if(pb == null)
+            return 0.0f;
+
+        float modifiedFocusLine = 0.0f;
+        if(pc.skills.containsKey(pb.skillName)){
+            modifiedFocusLine = pc.skills.get(pb.skillName).getModifiedAmount();
+        }
+
+        float modifiedDexterity = pc.statDexCurrent;
+
+        float weaponATR1 = 0.0f;
+        if(pc.charItemManager != null && pc.charItemManager.getEquipped(1) != null){
+            for(Effect eff : pc.charItemManager.getEquipped(1).effects.values()){
+                for (AbstractEffectModifier mod : eff.getEffectModifiers()){
+                    if(mod.modType.equals(Enum.ModType.OCV)){
+                        float base = mod.minMod;
+                        float ramp = mod.getRamp();
+                        int trains = eff.getTrains();
+                        weaponATR1 = base + (ramp * trains);
+                    }
+                }
+            }
+        }
+
+        float weaponATR2 = 0.0f;
+        if(pc.charItemManager != null && pc.charItemManager.getEquipped(2) != null){
+            for(Effect eff : pc.charItemManager.getEquipped(2).effects.values()){
+                for (AbstractEffectModifier mod : eff.getEffectModifiers()){
+                    if(mod.modType.equals(Enum.ModType.OCV)){
+                        float base = mod.minMod;
+                        float ramp = mod.getRamp();
+                        int trains = eff.getTrains();
+                        weaponATR2 = base + (ramp * trains);
+                    }
+                }
+            }
+        }
+
+        float precise = 1.0f;
+        for(CharacterRune rune : pc.runes){
+            if(rune.getRuneBase().getName().equals("Precise"))
+                precise += 0.05f;
+        }
+
+        float stanceMod = 1.0f;
+        float atrBuffs = 0.0f;
+
+        for(String effID : pc.effects.keySet()) {
+            if (effID.contains("Stance")) {
+                Effect effect = pc.effects.get(effID);
+                EffectsBase eb = effect.getEffectsBase();
+                if(eb.getIDString().equals("STC-H-DA"))
+                    continue;
+                for (AbstractEffectModifier mod : pc.effects.get(effID).getEffectModifiers()) {
+                    if (mod.modType.equals(Enum.ModType.OCV)) {
+                        float percent = mod.getPercentMod();
+                        int trains = pc.effects.get(effID).getTrains();
+                        float modValue = percent + (trains * mod.getRamp());
+                        stanceMod += modValue * 0.01f;
+                    }
+                }
+            } else {
+                for (AbstractEffectModifier mod : pc.effects.get(effID).getEffectModifiers()) {
+                    if (mod.modType.equals(Enum.ModType.OCV)) {
+                        if(mod.getPercentMod() == 0) {
+                            float value = mod.getMinMod();
+                            int trains = pc.effects.get(effID).getTrains();
+                            float modValue = value + (trains * mod.getRamp());
+                            atrBuffs += modValue;
+                        }
+                    }
+                }
+            }
+        }
+
+        float atr = 7 * modifiedFocusLine;
+        atr += (modifiedDexterity * 0.5f) + weaponATR1 + weaponATR2;
+        atr *= precise;
+        atr += atrBuffs;
+        if(pc.bonuses != null)
+            atr *= 1 + (pc.bonuses.getFloatPercentAll(Enum.ModType.OCV, Enum.SourceType.None) - (stanceMod - 1) - (precise - 1));
+        atr *= stanceMod;
+        return atr;
+    }
+
+    public void grantExperience(AbstractCharacter killed, Group group){
+
+        if(killed == null)
+            return;
+        double grantedXP;
+
+        if(group != null){
+
+            for(PlayerCharacter member : group.members){
+                //white mob, early exit
+                if(Experience.getConMod(member,killed) <= 0)
+                    continue;
+
+                //can only get XP over level 75 for player kills
+                if(member.level >= 75 && !killed.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+                    continue;
+
+                //cannot gain xp while dead
+                if(!member.isAlive())
+                    continue;
+
+                //out of XP range
+                if(member.loc.distanceSquared(killed.loc) > MBServerStatics.CHARACTER_LOAD_RANGE * MBServerStatics.CHARACTER_LOAD_RANGE)
+                    continue;
+
+                float mod;
+                switch(group.members.size()){
+                    default:
+                        mod = 1.0f;
+                        break;
+                    case 2:
+                        mod = 0.8f;
+                        break;
+                    case 3:
+                        mod = 0.73f;
+                        break;
+                    case 4:
+                        mod = 0.69f;
+                        break;
+                    case 5:
+                        mod = 0.65f;
+                        break;
+                    case 6:
+                        mod = 0.58f;
+                        break;
+                    case 7:
+                        mod = 0.54f;
+                        break;
+                    case 8:
+                        mod = 0.50f;
+                        break;
+                    case 9:
+                        mod = 0.47f;
+                        break;
+                    case 10:
+                        mod = 0.45f;
+                        break;
+                }
+                double xp = getXP(member) * mod;
+
+                member.grantXP((int) xp);
+            }
+
+        }else{
+            //Solo XP
+
+            //white mob, early exit
+            if(Experience.getConMod(this.owner,killed) <= 0)
+                return;
+
+            //can only get XP over level 75 for player kills
+            if(this.owner.level >= 75 && !killed.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+                return;
+
+            //cannot gain xp while dead
+            if(!this.owner.isAlive())
+                return;
+
+            this.owner.grantXP(getXP(this.owner));
+        }
+    }
+
+    public static int getXP(PlayerCharacter pc){
+        double xp = 0;
+        float mod = 0.10f;
+
+        if (pc.level >= 26 && pc.level <= 75)
+        {
+            mod = 0.10f - (0.001f * (pc.level - 24));
+        }
+        else if (pc.level > 75)
+        {
+            mod = 0.05f;
+        }
+
+        float levelFull = Experience.LevelToExp[pc.level + 1] - Experience.LevelToExp[pc.level];
+
+        xp = levelFull * mod;
+
+        return (int) xp;
+    }
+
 }

src/engine/objects/VendorDialog.java

@@ -21,7 +21,7 @@ public class VendorDialog extends AbstractGameObject {
     private static VendorDialog vd;
     private final String dialogType;
     private final String intro;
-    private ArrayList<MenuOption> options = new ArrayList<>();
+    ArrayList<MenuOption> options = new ArrayList<>();
 
     public VendorDialog(String dialogType, String intro, int UUID) {
         super(UUID);

src/engine/powers/effectmodifiers/HealthEffectModifier.java

@@ -9,6 +9,7 @@
 
 package engine.powers.effectmodifiers;
 
+import engine.Enum;
 import engine.Enum.DamageType;
 import engine.Enum.GameObjectType;
 import engine.Enum.ModType;
@@ -122,9 +123,13 @@ public class HealthEffectModifier extends AbstractEffectModifier {
                 float spi = (pc.getStatSpiCurrent() >= 1) ? (float) pc.getStatSpiCurrent() : 1f;
                 //				min *= (intt * 0.0045 + 0.055 * (float)Math.sqrt(intt - 0.5) + spi * 0.006 + 0.07 * (float)Math.sqrt(spi - 0.5) + 0.02 * (int)focus);
                 //				max *= (intt * 0.0117 + 0.13 * (float)Math.sqrt(intt - 0.5) + spi * 0.0024 + (float)Math.sqrt(spi - 0.5) * 0.021 + 0.015 * (int)focus);
+
                 min = HealthEffectModifier.getMinDamage(min, intt, spi, focus);
                 max = HealthEffectModifier.getMaxDamage(max, intt, spi, focus);
 
+                //min *= pc.ZergMultiplier;
+                //max *= pc.ZergMultiplier;
+
                 //debug for spell damage and atr
                 if (pc.getDebug(16)) {
                     String smsg = "Damage: " + (int) Math.abs(min) + " - " + (int) Math.abs(max);
@@ -165,9 +170,15 @@ public class HealthEffectModifier extends AbstractEffectModifier {
             PlayerBonuses bonus = source.getBonuses();
 
             // Apply any power effect modifiers (such as stances)
-            if (bonus != null)
-                modAmount *= (1 + (bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None)));
+            if (bonus != null){
+                modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
             }
+        }
+
+        if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+            modAmount *= ((PlayerCharacter)source).ZergMultiplier;
+        }
+
         if (modAmount == 0f)
             return;
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {

src/engine/powers/effectmodifiers/ManaEffectModifier.java

@@ -129,9 +129,16 @@ public class ManaEffectModifier extends AbstractEffectModifier {
             PlayerBonuses bonus = source.getBonuses();
 
             // Apply any power effect modifiers (such as stances)
-            if (bonus != null)
+            if (bonus != null){
                 modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
             }
+
+        }
+
+        if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+            modAmount *= ((PlayerCharacter)source).ZergMultiplier;
+        }
+
         if (modAmount == 0f)
             return;
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {

src/engine/powers/effectmodifiers/StaminaEffectModifier.java

@@ -125,9 +125,15 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
             PlayerBonuses bonus = source.getBonuses();
 
             // Apply any power effect modifiers (such as stances)
-            if (bonus != null)
-                modAmount *= (1 + (bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None)));
+            if (bonus != null){
+                modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
             }
+        }
+
+        if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+            modAmount *= ((PlayerCharacter)source).ZergMultiplier;
+        }
+
         if (modAmount == 0f)
             return;
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {

src/engine/powers/poweractions/TransferStatPowerAction.java

@@ -217,8 +217,13 @@ public class TransferStatPowerAction extends AbstractPowerAction {
 
             // Apply any power effect modifiers (such as stances)
             PlayerBonuses bonus = source.getBonuses();
-            if (bonus != null)
+            if (bonus != null){
                 damage *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
+            }
+
+            if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+                damage *= ((PlayerCharacter)source).ZergMultiplier;
+            }
 
             //get amount to transfer
             fromAmount = damage;

src/engine/server/world/WorldServer.java

@@ -17,6 +17,7 @@ import engine.Enum.SupportMsgType;
 import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.RealmMap;
 import engine.InterestManagement.WorldGrid;
+import engine.PlayerAi;
 import engine.db.archive.DataWarehouse;
 import engine.exception.MsgSendException;
 import engine.gameManager.*;
@@ -530,6 +531,8 @@ public class WorldServer {
 		Logger.info("Starting Player Update Thread");
 		UpdateThread.startUpdateThread();
 
+		Logger.info("Spawnign AI Players");
+		PlayerAi.populate_world();
 
 		printThreads();
 		Logger.info("Threads Running:");

src/engine/util/KeyCloneAudit.java

@@ -18,17 +18,35 @@ public enum KeyCloneAudit {
 
     public static boolean auditChatMsg(PlayerCharacter pc, String message) {
 
-        if(pc.combatTarget != null && message.contains(String.valueOf(pc.combatTarget.getObjectUUID()))) {
+        if(pc.selectedUUID == 0)
+            return false;
+
+        int id = pc.selectedUUID;
+        String value = String.valueOf(id);
+        if(message.contains(value)) {
             //targeting software detected
 
             Group g = GroupManager.getGroup(pc);
 
-            if (g == null)
+            if (g == null) {
+                try {
+                    Logger.error("TARGET SOFTWARE DETECTED ON ACCOUNT: " + pc.getAccount().getUname());
+                    DbManager.AccountQueries.SET_TRASH(pc.getAccount().getUname(), "TARGET");
                     pc.getClientConnection().forceDisconnect();
-             else
-                for (PlayerCharacter member : g.members)
-                    member.getClientConnection().forceDisconnect();
+                }catch(Exception e){
 
+                }
+            }else {
+                for (PlayerCharacter member : g.members) {
+                    try {
+                        Logger.error("TARGET SOFTWARE DETECTED ON ACCOUNT: " + member.getAccount().getUname());
+                        DbManager.AccountQueries.SET_TRASH(member.getAccount().getUname(), "TARGET");
+                        member.getClientConnection().forceDisconnect();
+                    } catch (Exception e) {
+
+                    }
+                }
+            }
             return true;
         }
 
@@ -49,7 +67,7 @@ public enum KeyCloneAudit {
         if (machineCount > Integer.parseInt(ConfigManager.MB_WORLD_KEYCLONE_MAX.getValue())) {
             Logger.error("Keyclone detected from: " + player.getAccount().getUname() +
                     " with machine count of: " + machineCount);
-            DbManager.AccountQueries.SET_TRASH(machineID);
+            DbManager.AccountQueries.SET_TRASH(machineID,"MEMBERLIMIT");
         }
 
     }
@@ -58,11 +76,18 @@ public enum KeyCloneAudit {
         try {
             TargetObjectMsg tarMsg = (TargetObjectMsg) msg;
             ClientConnection origin = (ClientConnection) msg.getOrigin();
+
             long now = System.currentTimeMillis();
 
-            if (tarMsg.getTargetType() != MBServerStatics.MASK_PLAYER)
+            if (PlayerCharacter.getPlayerCharacter(tarMsg.getTargetID()) == null)
                 return;
 
+            PlayerCharacter pc = origin.getPlayerCharacter();
+            pc.selectedUUID = tarMsg.getTargetID();
+
+            if(pc.getObjectUUID() == tarMsg.getTargetID())
+                return; //dont trigger for targeting yourself
+
             if (System.currentTimeMillis() > origin.finalStrikeRefresh) {
                 origin.lastStrike = System.currentTimeMillis();
                 origin.strikes = 0;
@@ -79,8 +104,10 @@ public enum KeyCloneAudit {
             if (origin.strikes > 20) {
                 origin.finalStrikes++;
             }
-            if (origin.finalStrikes > 3) {origin.forceDisconnect();
-                DbManager.AccountQueries.SET_TRASH(origin.machineID);
+            if (origin.finalStrikes > 3) {
+                origin.forceDisconnect();
+                DbManager.AccountQueries.SET_TRASH(pc.getAccount().getUname(), "TABSPEED");
+                Logger.error("TAB SPEED DETECTED ON ACCOUNT: " + pc.getAccount().getUname());
             }
         } catch (Exception e) {
 

src/engine/workthreads/HourlyJobThread.java

@@ -53,10 +53,8 @@ public class HourlyJobThread implements Runnable {
             Logger.error("missing city map");
         }
 
-        //run maintenance every day at 2 am
-        if(LocalDateTime.now().getHour() == 2) {
-            MaintenanceManager.dailyMaintenance();
-
+        //run mines every day at 1:00 am CST
+        if(LocalDateTime.now().getHour() == 1) {
             //produce mine resources once a day
             for (Mine mine : Mine.getMines()) {
                 try {
@@ -68,6 +66,11 @@ public class HourlyJobThread implements Runnable {
             }
         }
 
+        //run maintenance every day at 2 am
+        if(LocalDateTime.now().getHour() == 2) {
+            MaintenanceManager.dailyMaintenance();
+        }
+
         switch(LocalDateTime.now().getHour()){
             case 3:
             case 6: