diff --git a/src/engine/db/handlers/dbLootTableHandler.java b/src/engine/db/handlers/dbLootTableHandler.java index e05df915..55d81177 100644 --- a/src/engine/db/handlers/dbLootTableHandler.java +++ b/src/engine/db/handlers/dbLootTableHandler.java @@ -41,7 +41,7 @@ public class dbLootTableHandler extends dbHandlerBase { while (rs.next()) { recordsRead++; - LootTable lootTable = LootTable.getLootGroup(rs.getInt("genTable")); + LootTable lootTable = LootTable.getGenTable(rs.getInt("genTable")); lootTable.addRow(rs.getFloat("minRoll"), rs.getFloat("maxRoll"), rs.getInt("itemTableID"), rs.getInt("pModTableID"), rs.getInt("sModTableID"), ""); } diff --git a/src/engine/devcmd/cmds/GetMobBaseLoot.java b/src/engine/devcmd/cmds/GetMobBaseLoot.java deleted file mode 100644 index edd450a6..00000000 --- a/src/engine/devcmd/cmds/GetMobBaseLoot.java +++ /dev/null @@ -1,58 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - - -package engine.devcmd.cmds; - -import engine.Enum.GameObjectType; -import engine.devcmd.AbstractDevCmd; -import engine.objects.AbstractGameObject; -import engine.objects.Mob; -import engine.objects.MobLootBase; -import engine.objects.PlayerCharacter; - -/** - * @author Eighty - */ -public class GetMobBaseLoot extends AbstractDevCmd { - - public GetMobBaseLoot() { - super("mobbaseloot"); - } - - @Override - protected void _doCmd(PlayerCharacter pc, String[] words, - AbstractGameObject target) { - if (target.getObjectType() != GameObjectType.Mob) { - this.throwbackError(pc, "Must be targeting a Valid Mob For this Command."); - return; - } - - - Mob mob = (Mob) target; - for (MobLootBase mlb : MobLootBase.MobLootSet.get(mob.getMobBase().getLoadID())) { - - this.throwbackInfo(pc, "LootTable11 = " + mlb.getLootTableID() + "\rn "); - this.throwbackInfo(pc, "Chance = " + mlb.getChance() + "\rn "); - - } - - - } - - @Override - protected String _getHelpString() { - return "Copies a Mob of type 'mobID' with optional new name"; - } - - @Override - protected String _getUsageString() { - return "' /mob mobID [name]'"; - } - -} diff --git a/src/engine/gameManager/DevCmdManager.java b/src/engine/gameManager/DevCmdManager.java index d7d5cb49..e1163ccf 100644 --- a/src/engine/gameManager/DevCmdManager.java +++ b/src/engine/gameManager/DevCmdManager.java @@ -128,7 +128,6 @@ public enum DevCmdManager { DevCmdManager.registerDevCmd(new SetForceRenameCityCmd()); DevCmdManager.registerDevCmd(new GotoObj()); DevCmdManager.registerDevCmd(new convertLoc()); - DevCmdManager.registerDevCmd(new GetMobBaseLoot()); DevCmdManager.registerDevCmd(new MBDropCmd()); DevCmdManager.registerDevCmd(new AuditHeightMapCmd()); DevCmdManager.registerDevCmd(new UnloadFurnitureCmd()); diff --git a/src/engine/objects/LootTable.java b/src/engine/objects/LootTable.java index 2ab7a4e4..3c66db39 100644 --- a/src/engine/objects/LootTable.java +++ b/src/engine/objects/LootTable.java @@ -53,7 +53,7 @@ public class LootTable { this.lootTableID = lootTableID; } - public static LootTable getLootGroup(int UUID) { + public static LootTable getGenTable(int UUID) { if (lootGroups.containsKey(UUID)) return lootGroups.get(UUID); diff --git a/src/engine/objects/MobLootBase.java b/src/engine/objects/MobLootBase.java deleted file mode 100644 index e7a64b28..00000000 --- a/src/engine/objects/MobLootBase.java +++ /dev/null @@ -1,59 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - - -package engine.objects; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; - -public class MobLootBase { - - public static HashMap> MobLootSet = new HashMap<>(); - private int mobBaseID; - private int lootTableID; - private float chance; - - - /** - * ResultSet Constructor - */ - - public MobLootBase(ResultSet rs) throws SQLException { - this.mobBaseID = rs.getInt("mobBaseID"); - this.lootTableID = rs.getInt("lootTable"); - this.chance = rs.getFloat("chance"); - } - - public MobLootBase(int mobBaseID, int lootTableID, int chance) { - super(); - this.mobBaseID = mobBaseID; - this.lootTableID = lootTableID; - this.chance = chance; - - } - - public int getMobBaseID() { - return mobBaseID; - } - - public float getChance() { - return chance; - } - - public int getLootTableID() { - return lootTableID; - } - - public void setLootTableID(int lootTableID) { - this.lootTableID = lootTableID; - } - -}