place holder

src/engine/db/handlers/dbLootTableHandler.java

@@ -9,10 +9,7 @@
 
 package engine.db.handlers;
 
-import engine.loot.LootGroup;
 import engine.loot.LootManager;
-import engine.loot.ModifierGroup;
-import engine.loot.ModifierTable;
 import engine.objects.Item;
 import engine.objects.LootTable;
 import org.pmw.tinylog.Logger;
@@ -30,7 +27,7 @@ public class dbLootTableHandler extends dbHandlerBase {
     public void populateLootGroups() {
         int recordsRead = 0;
         prepareCallable("SELECT `groupID`, `minRoll`, `maxRoll`, `lootTableID`, `pModTableID`, `sModTableID` FROM `static_lootgroups`");
-        
+
         try {
             ResultSet rs = executeQuery();
             if (rs != null)
@@ -39,7 +36,7 @@ public class dbLootTableHandler extends dbHandlerBase {
                     LootTable lootTable = LootTable.getLootGroup(rs.getInt("groupID"));
                     lootTable.addRow(rs.getFloat("minRoll"), rs.getFloat("maxRoll"), rs.getInt("lootTableID"), rs.getInt("pModTableID"), rs.getInt("sModTableID"), "");
                 }
-            
+
             Logger.info("read: " + recordsRead + " cached: " + LootTable.getLootGroups().size());
         } catch (SQLException e) {
         } finally {
@@ -49,9 +46,9 @@ public class dbLootTableHandler extends dbHandlerBase {
 
     public void populateLootTables() {
         int recordsRead = 0;
-        
+
         prepareCallable("SELECT `lootTable`, `minRoll`, `maxRoll`, `itemBaseUUID`, `minSpawn`, `maxSpawn` FROM `static_loottables`");
-        
+
         try {
             ResultSet rs = executeQuery();
             if (rs != null)
@@ -60,8 +57,8 @@ public class dbLootTableHandler extends dbHandlerBase {
                     LootTable lootTable = LootTable.getLootTable(rs.getInt("lootTable"));
                     lootTable.addRow(rs.getFloat("minRoll"), rs.getFloat("maxRoll"), rs.getInt("itemBaseUUID"), rs.getInt("minSpawn"), rs.getInt("maxSpawn"), "");
                 }
-            
-             Logger.info("read: " + recordsRead + " cached: " + LootTable.getLootTables().size());
+
+            Logger.info("read: " + recordsRead + " cached: " + LootTable.getLootTables().size());
         } catch (SQLException e) {
         } finally {
             closeCallable();
@@ -69,11 +66,11 @@ public class dbLootTableHandler extends dbHandlerBase {
     }
 
     public void populateModTables() {
-        
+
         int recordsRead = 0;
-                
+
         prepareCallable("SELECT `modTable`,`minRoll`,`maxRoll`,`value`,`action` FROM `static_modtables`");
-        
+
         try {
             ResultSet rs = executeQuery();
             if (rs != null)
@@ -90,11 +87,11 @@ public class dbLootTableHandler extends dbHandlerBase {
     }
 
     public void populateModGroups() {
-        
+
         int recordsRead = 0;
-        
+
         prepareCallable("SELECT `modGroup`,`minRoll`,`maxRoll`,`subTableID` FROM `static_modgroups`");
-        
+
         try {
             ResultSet rs = executeQuery();
             if (rs != null)
@@ -111,10 +108,10 @@ public class dbLootTableHandler extends dbHandlerBase {
     }
 
     public void LOAD_ENCHANT_VALUES() {
-        
+
         prepareCallable("SELECT `IDString`, `minMod` FROM `static_power_effectmod` WHERE `modType` = ?");
         setString(1,"Value");
-        
+
         try {
             ResultSet rs = executeQuery();
             while (rs.next()) {
@@ -126,108 +123,99 @@ public class dbLootTableHandler extends dbHandlerBase {
             closeCallable();
         }
     }
-    
+
     public void LOAD_ALL_LOOTGROUPS() {
-        
-            LootGroup lootGroup;
-            int recordsRead = 0;
-            
-		prepareCallable("SELECT * FROM static_lootgroups");
-
-		try {
-			ResultSet rs = executeQuery();
-                        
-			while (rs.next()) {
-                            
-                          recordsRead++;
-                          lootGroup = new LootGroup(rs);
-                          LootManager.addLootGroup(lootGroup);
-			}
-                        
-                        Logger.info( "read: " + recordsRead);
-                                
-		} catch (SQLException e) {
-			Logger.error( e.getErrorCode() + ' ' + e.getMessage(), e);
-		} finally {
-			closeCallable();
-		}
-	}
-    
-        public void LOAD_ALL_LOOTTABLES() {
-        
-            engine.loot.LootTable lootTable;
-            int recordsRead = 0;
-            
-		prepareCallable("SELECT * FROM static_loottables");
-
-		try {
-			ResultSet rs = executeQuery();
-                        
-			while (rs.next()) {
-                            
-                          recordsRead++;
-                          lootTable = new engine.loot.LootTable(rs);
-                          LootManager.addLootTable(lootTable);
-			}
-                        
-                        Logger.info("read: " + recordsRead);
-                                
-		} catch (SQLException e) {
-			Logger.error( e.getErrorCode() + ' ' + e.getMessage(), e);
-		} finally {
-			closeCallable();
-		}
-	}
-        
-        public void LOAD_ALL_MODGROUPS() {
-        
-            ModifierGroup modGroup;
-            int recordsRead = 0;
-            
-		prepareCallable("SELECT * FROM static_modgroups");
-
-		try {
-			ResultSet rs = executeQuery();
-                        
-			while (rs.next()) {
-                            
-                          recordsRead++;
-                          modGroup = new ModifierGroup(rs);
-                          LootManager.addModifierGroup(modGroup);
-			}
-                        
-                        Logger.info( "read: " + recordsRead);
-                                
-		} catch (SQLException e) {
-			Logger.error(e.getErrorCode() + ' ' + e.getMessage(), e);
-		} finally {
-			closeCallable();
-		}
-	}
-        
-        public void LOAD_ALL_MODTABLES() {
-        
-            ModifierTable modTable;
-            int recordsRead = 0;
-            
-		prepareCallable("SELECT * FROM static_modtables");
-
-		try {
-			ResultSet rs = executeQuery();
-                        
-			while (rs.next()) {
-                            
-                          recordsRead++;
-                          modTable = new ModifierTable(rs);
-                          LootManager.addModifierTable(modTable);
-			}
-                        
-                        Logger.info( "read: " + recordsRead);
-                                
-		} catch (SQLException e) {
-			Logger.error( e.getErrorCode() + ' ' + e.getMessage(), e);
-		} finally {
-			closeCallable();
-		}
-	}
+        int recordsRead = 0;
+
+        prepareCallable("SELECT * FROM static_lootgroups");
+
+        try {
+            ResultSet rs = executeQuery();
+
+            while (rs.next()) {
+                LootManager.GenTable gt = new LootManager.GenTable();
+                LootManager.AddGenTableRow(rs.getInt("groupID"),gt,new LootManager.GenTableRow(rs));
+            }
+
+            Logger.info( "read: " + recordsRead);
+
+        } catch (SQLException e) {
+            Logger.error( e.getErrorCode() + ' ' + e.getMessage(), e);
+        } finally {
+            closeCallable();
+        }
+    }
+
+    public void LOAD_ALL_LOOTTABLES() {
+
+        int recordsRead = 0;
+
+        prepareCallable("SELECT * FROM static_loottables");
+
+        try {
+            ResultSet rs = executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+                LootManager.ItemTable it = new LootManager.ItemTable();
+                LootManager.AddItemTableRow(rs.getInt("lootTable"),it,new LootManager.ItemTableRow(rs));
+            }
+
+            Logger.info("read: " + recordsRead);
+
+        } catch (SQLException e) {
+            Logger.error( e.getErrorCode() + ' ' + e.getMessage(), e);
+        } finally {
+            closeCallable();
+        }
+    }
+
+    public void LOAD_ALL_MODGROUPS() {
+        int recordsRead = 0;
+
+        prepareCallable("SELECT * FROM static_modgroups");
+
+        try {
+            ResultSet rs = executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+                LootManager.ModTypeTable mtt = new LootManager.ModTypeTable();
+                LootManager.AddModTypeTableRow(rs.getInt("modGroup"),mtt,new LootManager.ModTypeTableRow(rs));
+            }
+
+            Logger.info( "read: " + recordsRead);
+
+        } catch (SQLException e) {
+            Logger.error(e.getErrorCode() + ' ' + e.getMessage(), e);
+        } finally {
+            closeCallable();
+        }
+    }
+
+    public void LOAD_ALL_MODTABLES() {
+        int recordsRead = 0;
+
+        prepareCallable("SELECT * FROM static_modtables");
+
+        try {
+            ResultSet rs = executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+                LootManager.ModTable mt = new LootManager.ModTable();
+                LootManager.AddModTableRow(rs.getInt("modTable"),mt,new LootManager.ModTableRow(rs));
+            }
+
+            Logger.info( "read: " + recordsRead);
+
+        } catch (SQLException e) {
+            Logger.error( e.getErrorCode() + ' ' + e.getMessage(), e);
+        } finally {
+            closeCallable();
+        }
+    }
 }

src/engine/loot/LootGroup.java

@@ -1,114 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-package engine.loot;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Data storage object for Loot System.
- * Holds row in the lootGroup database table
- */
-public class LootGroup {
-
-    private final int groupID;
-    private final String groupName;
-    private final int minRoll;
-    private final int maxRoll;
-    private final int lootTableID;
-    private final String lootTableName;
-    private final int pMod;
-    private final int pModTableID;
-    private final int sMod;
-    private final int sModTableID;
-
-    public LootGroup(ResultSet rs) throws SQLException {
-        
-        this.groupID = rs.getInt("groupID");
-        this.groupName = rs.getString("groupName");
-        this.minRoll = rs.getInt("minRoll");
-        this.maxRoll = rs.getInt("maxRoll");
-        this.lootTableID = rs.getInt("lootTableID");
-        this.lootTableName = rs.getString("lootTableName");
-        this.pMod = rs.getInt("pMod");
-        this.pModTableID = rs.getInt("pModTableID");
-        this.sMod = rs.getInt("sMod");
-        this.sModTableID = rs.getInt("sModTableID");
-    }
-    /**
-     * @return the groupID
-     */
-    public int getGroupID() {
-        return groupID;
-    }
-
-    /**
-     * @return the groupName
-     */
-    public String getGroupName() {
-        return groupName;
-    }
-
-    /**
-     * @return the minRoll
-     */
-    public int getMinRoll() {
-        return minRoll;
-    }
-
-    /**
-     * @return the maxRoll
-     */
-    public int getMaxRoll() {
-        return maxRoll;
-    }
-
-    /**
-     * @return the lootTableID
-     */
-    public int getLootTableID() {
-        return lootTableID;
-    }
-
-    /**
-     * @return the lootTableName
-     */
-    public String getLootTableName() {
-        return lootTableName;
-    }
-
-    /**
-     * @return the pMod
-     */
-    public int getpMod() {
-        return pMod;
-    }
-
-    /**
-     * @return the pModTableID
-     */
-    public int getpModTableID() {
-        return pModTableID;
-    }
-
-    /**
-     * @return the sMod
-     */
-    public int getsMod() {
-        return sMod;
-    }
-
-    /**
-     * @return the sModTableID
-     */
-    public int getsModTableID() {
-        return sModTableID;
-    }
-
-}

src/engine/loot/LootManager.java

@@ -8,11 +8,18 @@
 
 package engine.loot;
 
+import engine.Enum;
+import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
-import engine.objects.Item;
-
+import engine.gameManager.ZoneManager;
+import engine.net.DispatchMessage;
+import engine.net.client.msg.chat.ChatSystemMsg;
+import engine.objects.*;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.TreeMap;
+import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -20,212 +27,239 @@ import java.util.concurrent.ThreadLocalRandom;
  */
 public class LootManager {
 
-    private static final HashMap<Integer, TreeMap<Integer, LootGroup>> _lootGroups = new HashMap<>();
-    private static final HashMap<Integer, TreeMap<Integer, LootTable>> _lootTables = new HashMap<>();
-    private static final HashMap<Integer, TreeMap<Integer, ModifierGroup>> _modGroups = new HashMap<>();
-    private static final HashMap<Integer, TreeMap> _modTables = new HashMap<>();
-
-    private LootManager() {
+    //new tables
+    private static final HashMap<Integer,GenTable> generalItemTables = new HashMap<>();
+    private static final HashMap<Integer,ItemTable> itemTables = new HashMap<>();
+    private static final HashMap<Integer,ModTypeTable> modTypeTables = new HashMap<>();
+    private static final HashMap<Integer,ModTable> modTables = new HashMap<>();
 
+    private LootManager() {}
+    // Bootstrap routine to load loot data from database
+    public static void loadLootData() {
+        DbManager.LootQueries.LOAD_ALL_LOOTGROUPS();
+        DbManager.LootQueries.LOAD_ALL_LOOTTABLES();
+        DbManager.LootQueries.LOAD_ALL_MODGROUPS();
+        DbManager.LootQueries.LOAD_ALL_MODTABLES();
     }
-
-// Method adds a lootGroup to the class's internal collection
-// and configures the treemap accordingly
-    
-    public static void addLootGroup(LootGroup lootGroup) {
-
-    // If entry for this lootGroup does not currently exist
-    // we need to create one.
-        
-        if (_lootGroups.containsKey(lootGroup.getGroupID()) == false)
-            _lootGroups.put(lootGroup.getGroupID(), new TreeMap<>());
-
-    // Add this lootgroup to the appropriate treemap
-        
-        _lootGroups.get(lootGroup.getGroupID()).put(lootGroup.getMaxRoll(), lootGroup);
-
+    public static void GenerateMobLoot(Mob mob){
+        //determine if mob is in hotzone
+        boolean inHotzone = ZoneManager.inHotZone(mob.getLoc());
+        //get multiplier form config manager
+        float multiplier = Float.parseFloat(ConfigManager.MB_NORMAL_DROP_RATE.getValue());
+        if (inHotzone) {
+            //if mob is inside hotzone, use the hotzone gold multiplier form the config instead
+            multiplier = Float.parseFloat(ConfigManager.MB_HOTZONE_DROP_RATE.getValue());
+        }
+        //iterate the booty sets
+        for(BootySetEntry bse : mob.getMobBase().bootySets) {
+            //check if chance roll is good
+            if (ThreadLocalRandom.current().nextInt(100) <= (bse.dropChance * multiplier)) {
+                //early exit, failed to hit minimum chance roll
+                continue;
+            }
+            if (bse.bootyType.equals("GOLD")) {
+                //determine and add gold to mob inventory
+                int gold = new Random().nextInt(bse.highGold - bse.lowGold) + bse.lowGold;
+                if (gold > 0) {
+                    MobLoot goldAmount = new MobLoot(mob, (int) (gold * multiplier));
+                    mob.getCharItemManager().addItemToInventory(goldAmount);
+                }
+            } else if (bse.bootyType.equals("BOOTYTABLE")) {
+                //iterate the booty tables and add items to mob inventory
+                Item toAdd = getGenTableItem(bse.lootTable, mob);
+                if(toAdd != null) {
+                    mob.getCharItemManager().addItemToInventory(toAdd);
+                }
+                if (inHotzone) {
+                    Item toAddHZ = getGenTableItem(bse.lootTable + 1, mob);
+                    mob.getCharItemManager().addItemToInventory(toAddHZ);
+                }
+            }
+        }
+        //lastly, check mobs inventory for godly or disc runes to send a server announcement
+        for (Item it : mob.getInventory()) {
+            ItemBase ib = it.getItemBase();
+            if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
+                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + ib.getName() + ". Are you tough enough to take it?");
+                chatMsg.setMessageType(10);
+                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+                DispatchMessage.dispatchMsgToAll(chatMsg);
+            }
+        }
     }
-
-    public static void addLootTable(engine.loot.LootTable lootTable) {
-
-    // If entry for this lootTabe does not currently exist
-    // we need to create one.
-        
-        if (_lootTables.containsKey(lootTable.getLootTable()) == false)
-            _lootTables.put(lootTable.getLootTable(),
-                    new TreeMap<>());
-
-    // Add this lootTable to the appropriate treemap
-        
-        _lootTables.get(lootTable.getLootTable()).put(lootTable.getMaxRoll(), lootTable);
-
+    public static Item getGenTableItem(int genTableID, Mob mob){
+        Item outItem;
+        int minRollRange = mob.getParentZone().minLvl + mob.getLevel();
+        int maxRollRange = (mob.getParentZone().minLvl + mob.getLevel() + mob.getParentZone().maxLvl) * 2;
+        GenTableRow selectedRow = generalItemTables.get(genTableID).getRowForRange(new Random().nextInt(100));
+        int itemUUID = itemTables.get(selectedRow.itemTableID).getRowForRange(new Random().nextInt(maxRollRange) + minRollRange).cacheID;
+        if(itemUUID == 0){
+            return null;
+        }
+        ModTypeTable prefixTable = modTypeTables.get(selectedRow.pModTable);
+        ModTypeTable suffixTable = modTypeTables.get(selectedRow.sModTable);
+        ModTable prefixModTable = modTables.get(prefixTable.getRowForRange(100).modTableID);
+        ModTable suffixModTable = modTables.get(suffixTable.getRowForRange(100).modTableID);
+        ModTableRow prefixMod = prefixModTable.getRowForRange(new Random().nextInt(maxRollRange) + minRollRange);
+        ModTableRow suffixMod = suffixModTable.getRowForRange(new Random().nextInt(maxRollRange) + minRollRange);
+        outItem = Item.getItem(itemUUID);
+        if(prefixMod.action.length() > 0){
+            outItem.addPermanentEnchantment(prefixMod.action, prefixMod.level);
+        }
+        if(suffixMod.action.length() > 0){
+            outItem.addPermanentEnchantment(suffixMod.action, suffixMod.level);
+        }
+        return outItem;
     }
-
-    public static void addModifierGroup(ModifierGroup modGroup) {
-
-    // If entry for this lootTabe does not currently exist
-    // we need to create one.
-        
-        if (_modGroups.containsKey(modGroup.getModGroup()) == false)
-            _modGroups.put(modGroup.getModGroup(),
-                    new TreeMap<>());
-
-    // Add this lootTable to the appropriate treemap
-        
-        _modGroups.get(modGroup.getModGroup()).put(modGroup.getMaxRoll(), modGroup);
-
+    public static void AddGenTableRow(int tableID, GenTable genTable, GenTableRow row){
+        if(!generalItemTables.containsKey(tableID)){
+            //create the new table
+            generalItemTables.put(tableID,genTable);
+            //add row to new table
+            generalItemTables.get(tableID).rows.add(row);
+        } else{
+            //add row to existing table
+            GenTable toAdd = generalItemTables.get(tableID);
+            toAdd.rows.add(row);
+        }
     }
-
-    public static void addModifierTable(ModifierTable modTable) {
-
-    // If entry for this lootTabe does not currently exist
-    // we need to create one.
-        
-        if (_modTables.containsKey(modTable.getModTable()) == false)
-            _modTables.put(modTable.getModTable(),
-                    new TreeMap<Float, ModifierGroup>());
-
-    // Add this lootTable to the appropriate treemap
-        
-        _modTables.get(modTable.getModTable()).put(modTable.getMaxRoll(), modTable);
-
+    public static void AddItemTableRow(int tableID,ItemTable itemTable, ItemTableRow row){
+        if(!itemTables.containsKey(tableID)){
+            //create the new table
+            itemTables.put(tableID,itemTable);
+            //add new row to table
+            itemTables.get(tableID).rows.add(row);
+        } else{
+            //add row to existing table
+            ItemTable toAdd = itemTables.get(tableID);
+            toAdd.rows.add(row);
+        }
     }
-
-    /* Mainline interfaces for this class.  Methods below retrieve
-     * entries from the loottable by random number and range.
-    */
-    
-    public static LootGroup getRandomLootGroup(int lootGroupID, int randomRoll) {
-
-        if ((randomRoll < 1) || (randomRoll > 100))
-            return null;
-
-    // Get random lootGroup for this roll
-        
-        return _lootGroups.get(lootGroupID).floorEntry(randomRoll).getValue();
-
+    public static void AddModTypeTableRow(int tableID,ModTypeTable modtypeTable, ModTypeTableRow row){
+        if(!modTypeTables.containsKey(tableID)){
+            //create the new table
+            modTypeTables.put(tableID,modtypeTable);
+            //add row to new table
+            modTypeTables.get(tableID).rows.add(row);
+        } else{
+            //add row to existing table
+            ModTypeTable toAdd = modTypeTables.get(tableID);
+            toAdd.rows.add(row);
+        }
     }
-
-    public static engine.loot.LootTable getRandomLootTable(int lootTableID, int randomRoll) {
-
-        if ((randomRoll < 1) || (randomRoll > 100))
-            return null;
-
-    // Get random lootTable for this roll
-        
-        return _lootTables.get(lootTableID).floorEntry(randomRoll).getValue();
-
+    public static void AddModTableRow(int tableID, ModTable modTable, ModTableRow row){
+        if(!itemTables.containsKey(tableID)){
+            //create the new table
+            modTables.put(tableID,modTable);
+            //add row to new table
+            modTables.get(tableID).rows.add(row);
+        } else{
+            //add row to existing table
+            ModTable toAdd = modTables.get(tableID);
+            toAdd.rows.add(row);
+        }
     }
-
-    public static ModifierGroup getRandomModifierGroup(int modGroupID, int randomRoll) {
-
-        if ((randomRoll < 1) || (randomRoll > 100))
-            return null;
-
-    // Get random modGroup for this roll
-        
-        return _modGroups.get(modGroupID).floorEntry(randomRoll).getValue();
-
+    public static class GenTable{
+        public ArrayList<GenTableRow> rows = new ArrayList<GenTableRow>();
+        public GenTableRow getRowForRange(int roll){
+            GenTableRow outRow = null;
+            for(GenTableRow iteration : this.rows){
+                if(iteration.minRoll >= roll && iteration.maxRoll <= roll){
+                    outRow = iteration;
+                }
+            }
+            return outRow;
+        }
     }
-
-    public static ModifierTable getRandomModifierTable(int modTableID, float randomRoll) {
-
-        if ((randomRoll < 1.0f))
-            return null;
-
-        // Roll is outside of range
-        
-        if (randomRoll > getMaxRangeForModifierTable(modTableID))
-            return null;
-
-    // Get random lootGroup for this roll
-        
-        return (ModifierTable) _modTables.get(modTableID).floorEntry(randomRoll).getValue();
-
+    public static class ItemTable{
+        public ArrayList<ItemTableRow> rows = new ArrayList<ItemTableRow>();
+        public ItemTableRow getRowForRange(int roll){
+            if(roll > 320){
+                roll = 320;
+            }
+            ItemTableRow outRow = null;
+            for(ItemTableRow iteration : this.rows){
+                if(iteration.minRoll >= roll && iteration.maxRoll <= roll){
+                    outRow = iteration;
+                }
+            }
+            return outRow;
+        }
     }
-    
-    // Returns minmum rolling range for a particular modifier table entry
-    
-    public static float getMinRangeForModifierTable(int modTableID) {
-
-        ModifierTable outTable;
-
-        outTable = (ModifierTable) _modTables.get(modTableID).firstEntry();
-
-        return outTable.getMinRoll();
-
+    public static class ModTypeTable{
+        public ArrayList<ModTypeTableRow> rows = new ArrayList<ModTypeTableRow>();
+        public ModTypeTableRow getRowForRange(int roll){
+            ModTypeTableRow outRow = null;
+            for(ModTypeTableRow iteration : this.rows){
+                if(iteration.minRoll >= roll && iteration.maxRoll <= roll){
+                    outRow = iteration;
+                }
+            }
+            return outRow;
+        }
     }
-
-    // Returns maximum rolling range for a particular modifier table entry
-    
-    public static float getMaxRangeForModifierTable(int modTableID) {
-
-        ModifierTable outTable;
-
-        outTable = (ModifierTable) _modTables.get(modTableID).lastEntry();
-
-        return outTable.getMaxRoll();
+    public static class ModTable{
+        public ArrayList<ModTableRow> rows = new ArrayList<ModTableRow>();
+        public ModTableRow getRowForRange(int roll){
+            if(roll > 320){
+                roll = 320;
+            }
+            ModTableRow outRow = null;
+            for(ModTableRow iteration : this.rows){
+                if(iteration.minRoll >= roll && iteration.maxRoll <= roll){
+                    outRow = iteration;
+                }
+            }
+            return outRow;
+        }
     }
-
-    public static Item getRandomItemFromLootGroup(int lootGroupID, int randomRoll) {
-    
-        Item outItem = null;
-        LootGroup lootGroup;
-        LootTable lootTable;
-        ModifierGroup modGroup;
-        ModifierTable prefixTable;
-        ModifierTable suffixTable;
-        
-        // Retrieve a random loot group
-        
-        lootGroup = getRandomLootGroup(lootGroupID, randomRoll);
-        
-        if (lootGroup == null)
-            return null;
-        
-        // Retrieve a random loot table
-        
-        lootTable = getRandomLootTable(lootGroup.getLootTableID(), ThreadLocalRandom.current().nextInt(100));
-        
-        if (lootTable == null)
-            return null;
-        
-        // Retrieve a random prefix
-        
-        modGroup = getRandomModifierGroup(lootGroup.getpModTableID(), ThreadLocalRandom.current().nextInt(100));
-        
-        if (modGroup == null)
-            return null;
-        
-        prefixTable = getRandomModifierTable(modGroup.getSubTableID(), ThreadLocalRandom.current().nextFloat() * getMaxRangeForModifierTable(lootGroup.getpModTableID()));
-        
-        if (prefixTable == null)
-            return null;
-        
-        // Retrieve a random suffix
-        
-        modGroup = getRandomModifierGroup(lootGroup.getsModTableID(), ThreadLocalRandom.current().nextInt(100));
-        
-        if (modGroup == null)
-            return null;
-        
-        suffixTable = getRandomModifierTable(modGroup.getSubTableID(), ThreadLocalRandom.current().nextFloat() * getMaxRangeForModifierTable(lootGroup.getsModTableID()));
-        
-        if (suffixTable == null)
-            return null;
-        
-        // Create the item!
-        
-        return outItem;
+    public static class GenTableRow{
+        public int minRoll;
+        public int maxRoll;
+        public int itemTableID;
+        public int pModTable;
+        public int sModTable;
+        public GenTableRow(ResultSet rs) throws SQLException {
+            this.minRoll = rs.getInt("minRoll");
+            this.maxRoll = rs.getInt("maxRoll");
+            this.itemTableID = rs.getInt("lootTableID");
+            this.pModTable = rs.getInt("pModTableID");
+            this.sModTable = rs.getInt("sModTableID");
+        }
     }
-    
-    // Bootstrap routine to load loot data from database
-    
-    public static void loadLootData() {
-        DbManager.LootQueries.LOAD_ALL_LOOTGROUPS();
-        DbManager.LootQueries.LOAD_ALL_LOOTTABLES();
-        DbManager.LootQueries.LOAD_ALL_MODGROUPS();
-        DbManager.LootQueries.LOAD_ALL_MODTABLES();
+    public static class ItemTableRow{
+        public int minRoll;
+        public int maxRoll;
+        public int cacheID;
+        public ItemTableRow(ResultSet rs) throws SQLException {
+            this.minRoll = rs.getInt("minRoll");
+            this.maxRoll = rs.getInt("maxRoll");
+            this.cacheID = rs.getInt("itemBaseUUID");
+
+        }
+    }
+    public static class ModTypeTableRow{
+        public int minRoll;
+        public int maxRoll;
+        public int modTableID;
+        public ModTypeTableRow(ResultSet rs) throws SQLException {
+            this.minRoll = rs.getInt("minRoll");
+            this.maxRoll = rs.getInt("maxRoll");
+            this.modTableID = rs.getInt("subTableID");
+
+        }
+    }
+    public static class ModTableRow{
+        public int minRoll;
+        public int maxRoll;
+        public String action;
+        public int level;
+        public ModTableRow(ResultSet rs) throws SQLException {
+            this.minRoll = rs.getInt("minRoll");
+            this.maxRoll = rs.getInt("maxRoll");
+            this.action = rs.getString("action");
+            this.level = rs.getInt("level");
+
+        }
     }
-
 }

src/engine/loot/LootTable.java

@@ -1,98 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-package engine.loot;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Data storage object for Loot System.
- * Holds row in the lootTable database table
- */
-public class LootTable {
-
-    private final int lootTale;
-    private final String tableName;
-    private final String itemName;
-    private final int minRoll;
-    private final int maxRoll;
-    private final int itemBaseUUID;
-    private final int minSpawn;
-    private final int maxSpawn;
-
-    public LootTable(ResultSet rs) throws SQLException {
-        
-        this.lootTale = rs.getInt("lootTable");
-        this.tableName = rs.getString("tableName");
-        this.itemName = rs.getString("itemName");
-        this.minRoll = rs.getInt("minRoll");
-        this.maxRoll = rs.getInt("maxRoll");
-        this.itemBaseUUID = rs.getInt("itemBaseUUID");
-        this.minSpawn = rs.getInt("minSpawn");
-        this.maxSpawn = rs.getInt("maxSpawn");
-                        
-    }
-
-    /**
-     * @return the lootTale
-     */
-    public int getLootTable() {
-        return lootTale;
-    }
-
-    /**
-     * @return the tableName
-     */
-    public String getTableName() {
-        return tableName;
-    }
-
-    /**
-     * @return the itemName
-     */
-    public String getItemName() {
-        return itemName;
-    }
-
-    /**
-     * @return the minRoll
-     */
-    public int getMinRoll() {
-        return minRoll;
-    }
-
-    /**
-     * @return the maxRoll
-     */
-    public int getMaxRoll() {
-        return maxRoll;
-    }
-
-    /**
-     * @return the itemBaseUUID
-     */
-    public int getItemBaseUUID() {
-        return itemBaseUUID;
-    }
-
-    /**
-     * @return the minSpawn
-     */
-    public int getMinSpawn() {
-        return minSpawn;
-    }
-
-    /**
-     * @return the maxSpawn
-     */
-    public int getMaxSpawn() {
-        return maxSpawn;
-    }
-    
-}

src/engine/loot/ModifierGroup.java

@@ -1,78 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-package engine.loot;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Data storage object for Loot System.
- * Holds row in the modGroup database table
- */
-public class ModifierGroup {
-
-    private final int modGroup;
-    private final String groupName;
-    private final int minRoll;
-    private final int maxRoll;
-    private final int subTableID;
-    private final String subTableName;
-
-    public ModifierGroup(ResultSet rs) throws SQLException {
-        
-        this.modGroup = rs.getInt("modGroup");
-        this.groupName = rs.getString("groupName");
-        this.minRoll = rs.getInt("minRoll");
-        this.maxRoll = rs.getInt("maxRoll");
-        this.subTableID = rs.getInt("subTableID");
-        this.subTableName = rs.getString("subTableName");                
-    }
-
-    /**
-     * @return the modGroup
-     */
-    public int getModGroup() {
-        return modGroup;
-    }
-
-    /**
-     * @return the groupName
-     */
-    public String getGroupName() {
-        return groupName;
-    }
-
-    /**
-     * @return the minRoll
-     */
-    public int getMinRoll() {
-        return minRoll;
-    }
-
-    /**
-     * @return the maxRoll
-     */
-    public int getMaxRoll() {
-        return maxRoll;
-    }
-
-    /**
-     * @return the subTableID
-     */
-    public int getSubTableID() {
-        return subTableID;
-    }
-
-    /**
-     * @return the subTableName
-     */
-    public String getSubTableName() {
-        return subTableName;
-    }
-}

src/engine/loot/ModifierTable.java

@@ -1,88 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-package engine.loot;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * Data storage object for Loot System.
- * Holds row in the modTables database table
- */
-public class ModifierTable{
-
-    private final int modTable;
-    private final String tableName;
-    private final float minRoll;
-    private final float maxRoll;
-    private final String action;
-    private final int level;
-    private final int value;
-    
-    public ModifierTable(ResultSet rs) throws SQLException {
-        
-        this.modTable = rs.getInt("modTable");
-        this.tableName = rs.getString("tableName");
-        this.minRoll = rs.getInt("minRoll");
-        this.maxRoll = rs.getInt("maxRoll");
-        this.action = rs.getString("action"); 
-        this.level = rs.getInt("level");
-        this.value = rs.getInt("value");            
-    }
-
-    /**
-     * @return the modTable
-     */
-    public int getModTable() {
-        return modTable;
-    }
-
-    /**
-     * @return the tableName
-     */
-    public String getTableName() {
-        return tableName;
-    }
-
-    /**
-     * @return the minRoll
-     */
-    public float getMinRoll() {
-        return minRoll;
-    }
-
-    /**
-     * @return the maxRoll
-     */
-    public float getMaxRoll() {
-        return maxRoll;
-    }
-
-    /**
-     * @return the action
-     */
-    public String getAction() {
-        return action;
-    }
-
-    /**
-     * @return the level
-     */
-    public int getLevel() {
-        return level;
-    }
-
-    /**
-     * @return the value
-     */
-    public int getValue() {
-        return value;
-    }
-
-}

src/engine/objects/MobBase.java

@@ -60,7 +60,7 @@ public class MobBase extends AbstractGameObject {
 	private float run = 0;
 	private float walkCombat = 0;
 	private float runCombat = 0;
-
+	public ArrayList<BootySetEntry> bootySets;
 	/**
 	 * ResultSet Constructor
 	 */