Begin constructor refactor

This commit is contained in:
2024-03-01 21:32:51 -05:00
parent 9ea44d7e1c
commit fa440e2885
20 changed files with 72 additions and 76 deletions
+2 -2
View File
@@ -506,14 +506,14 @@ public class InfoCmd extends AbstractDevCmd {
case MobLoot:
Item item = (Item) target;
ItemBase itemBase = item.getItemBase();
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getTemplsteID());
output += StringUtils.addWS("ItemBase: " + itemBase.getUUID(), 20);
output += "Weight: " + itemBase.getWeight();
output += newline;
DecimalFormat df = new DecimalFormat("###,###,###,###,##0");
output += StringUtils.addWS("Qty: "
+ df.format(item.getNumOfItems()), 20);
output += "Charges: " + item.getChargesRemaining()
output += "Charges: " + (byte) item.chargesRemaining
+ '/' + item.getChargesMax();
output += newline;
output += "Name: " + template.item_base_name;
+7 -6
View File
@@ -37,9 +37,10 @@ public class MakeItemCmd extends AbstractDevCmd {
if (ibID == 7)
continue;
ItemBase ib = ItemBase.getItemBase(ibID);
ItemTemplate template = ItemTemplate.itemTemplates.get(ibID);
int weight = template.item_wt;
short weight = ib.getWeight();
if (!pc.getCharItemManager().hasRoomInventory(weight)) {
throwbackError(pc, "Not enough room in inventory for any more of this item");
@@ -48,10 +49,10 @@ public class MakeItemCmd extends AbstractDevCmd {
}
boolean worked = false;
Item item = new Item(ib, pc.getObjectUUID(),
OwnerType.PlayerCharacter, (byte) 0, (byte) 0, (short) ib.getDurability(), (short) ib.getDurability(),
true, false, ItemContainerType.INVENTORY, (byte) 0,
new ArrayList<>(), "");
Item item = new Item(template.template_id);
item.ownerID = pc.getObjectUUID();
item.ownerType = OwnerType.PlayerCharacter;
item.containerType = ItemContainerType.INVENTORY;
item.setNumOfItems(Warehouse.getMaxResources().get(ibID));
+1 -1
View File
@@ -52,7 +52,7 @@ public class PrintBankCmd extends AbstractDevCmd {
throwbackInfo(pc, "Bank for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (Item item : list) {
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getTemplsteID());
throwbackInfo(pc, " " + template.item_base_name + ", count: " + item.getNumOfItems());
}
+1 -1
View File
@@ -33,7 +33,7 @@ public class PrintBonusesCmd extends AbstractDevCmd {
if (target instanceof Item) {
type = "Item";
tar = (Item) target;
ItemTemplate template = ItemTemplate.itemTemplates.get(((Item) tar).getItemBaseID());
ItemTemplate template = ItemTemplate.itemTemplates.get(((Item) tar).getTemplsteID());
name = template.item_base_name;
} else if (target instanceof AbstractCharacter) {
tar = (AbstractCharacter) target;
+1 -1
View File
@@ -87,7 +87,7 @@ public class PrintEquipCmd extends AbstractDevCmd {
throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (Integer slot : list.keySet()) {
Item item = list.get(slot);
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getTemplsteID());
throwbackInfo(pc, " " + template.item_base_name + ", slot: " + slot);
}
}
@@ -79,10 +79,10 @@ public class PrintInventoryCmd extends AbstractDevCmd {
String chargeInfo = "";
byte chargeMax = item.getChargesMax();
if (chargeMax > 0) {
byte charges = item.getChargesRemaining();
byte charges = (byte) item.chargesRemaining;
chargeInfo = " charges: " + charges + '/' + chargeMax;
}
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getTemplsteID());
throwbackInfo(pc, " " + template.item_base_name + ", count: " + item.getNumOfItems() + chargeInfo);
} else
goldCount += item.getNumOfItems();
+1 -1
View File
@@ -50,7 +50,7 @@ public class PrintVaultCmd extends AbstractDevCmd {
ArrayList<Item> list = cim.getVault();
throwbackInfo(pc, "Vault for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
for (Item item : list) {
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getItemBaseID());
ItemTemplate template = ItemTemplate.itemTemplates.get(item.getTemplsteID());
throwbackInfo(pc, " " + template.item_base_name + ", count: " + item.getNumOfItems());
}
Item gold = cim.getGoldVault();