From e323c80fba5ff60d44683c3be4968303d8b0b95a Mon Sep 17 00:00:00 2001 From: MagicBot Date: Fri, 15 Mar 2024 10:55:49 -0400 Subject: [PATCH] More refactor out itembase --- src/engine/devcmd/cmds/SimulateBootyCmd.java | 4 ++-- src/engine/gameManager/LootManager.java | 2 +- src/engine/loot/BootySetEntry.java | 4 ++-- src/engine/objects/MobBase.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/engine/devcmd/cmds/SimulateBootyCmd.java b/src/engine/devcmd/cmds/SimulateBootyCmd.java index 46cbf4e1..dbe41e59 100644 --- a/src/engine/devcmd/cmds/SimulateBootyCmd.java +++ b/src/engine/devcmd/cmds/SimulateBootyCmd.java @@ -34,7 +34,7 @@ public class SimulateBootyCmd extends AbstractDevCmd { if (mob.bootySet != 0) { for (BootySetEntry entry : LootManager._bootySetMap.get(mob.bootySet)) { - ItemTemplate template = ItemTemplate.itemTemplates.get(entry.itemBase); + ItemTemplate template = ItemTemplate.itemTemplates.get(entry.templateID); if (template != null) output += "[" + entry.bootyType + "] " + template.item_base_name + " [Chance] " + entry.dropChance + newline; @@ -71,7 +71,7 @@ public class SimulateBootyCmd extends AbstractDevCmd { Runes.add(lootItem); break; case WEAPON: //WEAPON - if (lootItem.getItemBase().isGlass()) + if (lootItem.getName().toUpperCase().contains("GLASS")) GlassItems.add(lootItem); else OtherDrops.add(lootItem); diff --git a/src/engine/gameManager/LootManager.java b/src/engine/gameManager/LootManager.java index 1ce69704..0a93a014 100644 --- a/src/engine/gameManager/LootManager.java +++ b/src/engine/gameManager/LootManager.java @@ -369,7 +369,7 @@ public enum LootManager { if (chanceRoll > bse.dropChance) return; - MobLoot lootItem = new MobLoot(mob, ItemTemplate.itemTemplates.get(bse.itemBase), true); + MobLoot lootItem = new MobLoot(mob, ItemTemplate.itemTemplates.get(bse.templateID), true); if (lootItem != null) mob.getCharItemManager().addItemToInventory(lootItem); diff --git a/src/engine/loot/BootySetEntry.java b/src/engine/loot/BootySetEntry.java index d909a413..a12e8715 100644 --- a/src/engine/loot/BootySetEntry.java +++ b/src/engine/loot/BootySetEntry.java @@ -17,7 +17,7 @@ public class BootySetEntry { public String bootyType; public int lowGold; public int highGold; - public int itemBase; + public int templateID; public int genTable; public float dropChance; @@ -29,7 +29,7 @@ public class BootySetEntry { this.bootyType = (rs.getString("bootyType")); this.lowGold = (rs.getInt("lowGold")); this.highGold = (rs.getInt("highGold")); - this.itemBase = (rs.getInt("itemBase")); + this.templateID = (rs.getInt("itemBase")); this.genTable = (rs.getInt("genTable")); this.dropChance = (rs.getFloat("dropChance")); } diff --git a/src/engine/objects/MobBase.java b/src/engine/objects/MobBase.java index 32ec8149..93d255e3 100644 --- a/src/engine/objects/MobBase.java +++ b/src/engine/objects/MobBase.java @@ -125,7 +125,7 @@ public class MobBase extends AbstractGameObject { for (BootySetEntry equipmentSetEntry : equipList) { - MobEquipment mobEquipment = new MobEquipment(equipmentSetEntry.itemBase, equipmentSetEntry.dropChance); + MobEquipment mobEquipment = new MobEquipment(equipmentSetEntry.templateID, equipmentSetEntry.dropChance); ItemBase itemBase = mobEquipment.getItemBase(); // if (itemBase.getType().equals(Enum.ItemType.WEAPON))